diff --git a/.gitignore b/.gitignore index e0d2b2a9..794b2f63 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ocic conmon/conmon conmon/conmon.o +vendor/src/github.com/kubernetes-incubator/ocid diff --git a/.travis.yml b/.travis.yml index 7591c766..2c3c9a4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ go: sudo: required +services: + - docker + before_script: - export PATH=$HOME/gopath/bin:$PATH @@ -12,11 +15,10 @@ before_install: - make install.tools - go get -u github.com/alecthomas/gometalinter - gometalinter --install --update - - go get -t -d ./... install: true script: - make .gitvalidation - make lint - - make + - make integration diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..dd0bf27b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,51 @@ +FROM golang:1.7.1 + +# libseccomp in jessie is not _quite_ new enough -- need backports version +RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list + +RUN apt-get update && apt-get install -y \ + build-essential \ + curl \ + gawk \ + iptables \ + pkg-config \ + libaio-dev \ + libcap-dev \ + libprotobuf-dev \ + libprotobuf-c0-dev \ + libseccomp2/jessie-backports \ + libseccomp-dev/jessie-backports \ + protobuf-c-compiler \ + protobuf-compiler \ + python-minimal \ + libglib2.0-dev \ + --no-install-recommends + +# install bats +RUN cd /tmp \ + && git clone https://github.com/sstephenson/bats.git \ + && cd bats \ + && git reset --hard 03608115df2071fff4eaaff1605768c275e5f81f \ + && ./install.sh /usr/local + +# install criu +ENV CRIU_VERSION 1.7 +RUN mkdir -p /usr/src/criu \ + && curl -sSL https://github.com/xemul/criu/archive/v${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \ + && cd /usr/src/criu \ + && make install-criu + +# Install runc +ENV RUNC_COMMIT cc29e3dded8e27ba8f65738f40d251c885030a28 +RUN set -x \ + && export GOPATH="$(mktemp -d)" \ + && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ + && cd "$GOPATH/src/github.com/opencontainers/runc" \ + && git checkout -q "$RUNC_COMMIT" \ + && make static BUILDTAGS="seccomp selinux" \ + && cp runc /usr/local/bin/runc \ + && rm -rf "$GOPATH" + +WORKDIR /go/src/github.com/kubernetes-incubator/ocid + +ADD . /go/src/github.com/kubernetes-incubator/ocid diff --git a/Makefile b/Makefile index 2c6f0d37..f975fcce 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,13 @@ EPOCH_TEST_COMMIT ?= 7fc874e05e74faa81e7c423b6514fc5c474c6b34 +PROJECT := github.com/kubernetes-incubator/ocid +GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) +GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") +OCID_IMAGE := ocid_dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) +OCID_LINK := ${CURDIR}/vendor/src/github.com/kubernetes-incubator/ocid +OCID_LINK_DIR := ${CURDIR}/vendor/src/github.com/kubernetes-incubator +OCID_INSTANCE := ocid_dev +SYSTEM_GOPATH := ${GOPATH} +export GOPATH := ${CURDIR}/vendor default: help @@ -6,27 +15,49 @@ help: @echo "Usage: make " @echo @echo " * 'binaries' - Build ocid, conmon and ocic" + @echo " * 'integration' - Execute integration tests" @echo " * 'clean' - Clean artifacts" @echo " * 'lint' - Execute the source code linter" -lint: +lint: ${OCID_LINK} @echo "checking lint" @./.tool/lint +${OCID_LINK}: + mkdir -p ${OCID_LINK_DIR} + ln -sfn ${CURDIR} ${OCID_LINK} + conmon: make -C $@ -ocid: +ocid: ${OCID_LINK} go build -o ocid ./cmd/server/ -ocic: +ocic: ${OCID_LINK} go build -o ocic ./cmd/client/ clean: rm -f ocic ocid + rm -f ${OCID_LINK} rm -f conmon/conmon.o conmon/conmon -binaries: ocid ocic conmon +ocidimage: + docker build -t ${OCID_IMAGE} . + +dbuild: ocidimage + docker run --name=${OCID_INSTANCE} --privileged ${OCID_IMAGE} make binaries + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/ocid . + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/ocic . + docker cp ${OCID_INSTANCE}:/go/src/github.com/kubernetes-incubator/ocid/conmon/conmon ./conmon/conmon + docker rm ${OCID_INSTANCE} + +integration: ocidimage + docker run -t --privileged --rm -v ${CURDIR}:/go/src/${PROJECT} ${OCID_IMAGE} make localintegration + +localintegration: binaries + ./test/test_runner.sh + +binaries: ${OCID_LINK} ocid ocic conmon .PHONY: .gitvalidation # When this is running in travis, it will only check the travis commit range @@ -40,20 +71,14 @@ endif .PHONY: install.tools -install.tools: .install.gitvalidation .install.glide .install.glide-vc .install.gometalinter +install.tools: .install.gitvalidation .install.gometalinter .install.gitvalidation: - go get github.com/vbatts/git-validation - -.install.glide: - go get github.com/Masterminds/glide - -.install.glide-vc: - go get github.com/sgotti/glide-vc + GOPATH=${SYSTEM_GOPATH} go get github.com/vbatts/git-validation .install.gometalinter: - go get github.com/alecthomas/gometalinter - gometalinter --install + GOPATH=${SYSTEM_GOPATH} go get github.com/alecthomas/gometalinter + GOPATH=${SYSTEM_GOPATH} gometalinter --install .PHONY: \ binaries \ diff --git a/cmd/server/main.go b/cmd/server/main.go index d7391c5a..be9a9ea2 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "os" + "path/filepath" "github.com/Sirupsen/logrus" "github.com/kubernetes-incubator/ocid/server" @@ -12,6 +13,10 @@ import ( "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" ) +const ( + ocidRoot = "/var/lib/ocid" +) + func main() { app := cli.NewApp() app.Name = "ocid" @@ -19,14 +24,19 @@ func main() { app.Version = "0.0.1" app.Flags = []cli.Flag{ + cli.StringFlag{ + Name: "root", + Value: ocidRoot, + Usage: "ocid root dir", + }, cli.StringFlag{ Name: "sandboxdir", - Value: "/var/lib/ocid/sandboxes", + Value: filepath.Join(ocidRoot, "sandboxes"), Usage: "ocid pod sandbox dir", }, cli.StringFlag{ Name: "containerdir", - Value: "/var/lib/ocid/containers", + Value: filepath.Join(ocidRoot, "containers"), Usage: "ocid container dir", }, cli.StringFlag{ @@ -94,7 +104,7 @@ func main() { containerDir := c.String("containerdir") sandboxDir := c.String("sandboxdir") - service, err := server.New(c.String("runtime"), sandboxDir, containerDir) + service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir) if err != nil { logrus.Fatal(err) } diff --git a/conmon/conmon.c b/conmon/conmon.c index 0dcf864c..3ec1e178 100644 --- a/conmon/conmon.c +++ b/conmon/conmon.c @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) { int ret; int opt; - bool terminal = FALSE; + bool terminal = false; const char *cid = NULL; const char *runtime_path = NULL; char cmd[CMD_SIZE]; @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) while ((opt = getopt(argc, argv, "tc:r:")) != -1) { switch (opt) { case 't': - terminal = TRUE; + terminal = true; break; case 'c': cid = optarg; @@ -230,7 +230,8 @@ int main(int argc, char *argv[]) /* Copy data back and forth between STDIN and master fd */ while (true) { int ready = epoll_wait(epfd, evlist, MAX_EVENTS, -1); - for (int i = 0; i < ready; i++) { + int i = 0; + for (i = 0; i < ready; i++) { if (evlist[i].events & EPOLLIN) { if (evlist[i].data.fd == STDIN_FILENO) { num_read = diff --git a/hack/vendor.sh b/hack/vendor.sh index f39081b6..abd90e51 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -76,5 +76,3 @@ clone git github.com/gogo/protobuf 43a2e0b1c32252bfbbdf81f7faa7a88fb3fa4028 clone git github.com/gorilla/context v1.1 clean - -mv vendor/src/* vendor/ diff --git a/server/sandbox.go b/server/sandbox.go index e762b5d5..54d23f6a 100644 --- a/server/sandbox.go +++ b/server/sandbox.go @@ -89,6 +89,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR // creates a spec Generator with the default spec. g := generate.New() + podInfraRootfs := filepath.Join(s.root, "graph/vfs/pause") // setup defaults for the pod sandbox g.SetRootPath(filepath.Join(podInfraRootfs, "rootfs")) g.SetRootReadonly(true) diff --git a/server/server.go b/server/server.go index bc3f41c6..5991646a 100644 --- a/server/server.go +++ b/server/server.go @@ -24,6 +24,7 @@ const ( // Server implements the RuntimeService and ImageService type Server struct { + root string runtime *oci.Runtime sandboxDir string stateLock sync.Mutex @@ -102,7 +103,7 @@ func (s *Server) reservePodName(id, name string) (string, error) { } // New creates a new Server with options provided -func New(runtimePath, sandboxDir, containerDir string) (*Server, error) { +func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) { // TODO: This will go away later when we have wrapper process or systemd acting as // subreaper. if err := utils.SetSubreaper(1); err != nil { @@ -130,6 +131,7 @@ func New(runtimePath, sandboxDir, containerDir string) (*Server, error) { return nil, err } s := &Server{ + root: root, runtime: r, netPlugin: netPlugin, sandboxDir: sandboxDir, diff --git a/test/helpers.bash b/test/helpers.bash new file mode 100644 index 00000000..565c1da9 --- /dev/null +++ b/test/helpers.bash @@ -0,0 +1,85 @@ +#!/bin/bash + +# Root directory of integration tests. +INTEGRATION_ROOT=$(dirname "$(readlink -f "$BASH_SOURCE")") + +# Test data path. +TESTDATA="${INTEGRATION_ROOT}/../testdata" + +# Root directory of the repository. +OCID_ROOT=${OCID_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)} + +# Path of the ocid binary. +OCID_BINARY=${OCID_BINARY:-${OCID_ROOT}/ocid/ocid} +# Path of the ocic binary. +OCIC_BINARY=${OCIC_BINARY:-${OCID_ROOT}/ocid/ocic} +# Path of the conmon binary. +CONMON_BINARY=${CONMON_BINARY:-${OCID_ROOT}/ocid/conmon/conmon} +# Path of the runc binary. +RUNC_PATH=$(command -v runc || true) +RUNC_BINARY=${RUNC_PATH:-/usr/local/sbin/runc} + +TESTDIR=$(mktemp -d) +OCID_SOCKET="$TESTDIR/ocid.sock" + +cp "$CONMON_BINARY" "$TESTDIR/conmon" + +PATH=$PATH:$TESTDIR + +# Run ocid using the binary specified by $OCID_BINARY. +# This must ONLY be run on engines created with `start_ocid`. +function ocid() { + "$OCID_BINARY" "$@" +} + +# Run ocic using the binary specified by $OCID_BINARY. +function ocic() { + "$OCIC_BINARY" --socket "$OCID_SOCKET" "$@" +} + +# Communicate with Docker on the host machine. +# Should rarely use this. +function docker_host() { + command docker "$@" +} + +# Retry a command $1 times until it succeeds. Wait $2 seconds between retries. +function retry() { + local attempts=$1 + shift + local delay=$1 + shift + local i + + for ((i=0; i < attempts; i++)); do + run "$@" + if [[ "$status" -eq 0 ]] ; then + return 0 + fi + sleep $delay + done + + echo "Command \"$@\" failed $attempts times. Output: $output" + false +} + +# Waits until the given ocid becomes reachable. +function wait_until_reachable() { + retry 15 1 ocic runtimeversion +} + +# Start ocid. +function start_ocid() { + "$OCID_BINARY" --debug --socket "$TESTDIR/ocid.sock" --runtime "$RUNC_BINARY" --root "$TESTDIR/ocid" & OCID_PID=$! + wait_until_reachable +} + +# Stop ocid. +function stop_ocid() { + kill "$OCID_PID" +} + +function cleanup_test() { + rm -rf "$TESTDIR" + # TODO(runcom): runc list and kill/delete everything! +} diff --git a/test/runtimeversion.bats b/test/runtimeversion.bats new file mode 100644 index 00000000..8c83ae21 --- /dev/null +++ b/test/runtimeversion.bats @@ -0,0 +1,14 @@ +#!/usr/bin/env bats + +load helpers + +function teardown() { + stop_ocid + cleanup_test +} + +@test "ocic runtimeversion" { + start_ocid + ocic runtimeversion + [ "$status" -eq 0 ] +} diff --git a/test/test_runner.sh b/test/test_runner.sh new file mode 100755 index 00000000..868df60e --- /dev/null +++ b/test/test_runner.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -e + +cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" + +# Load the helpers. +. helpers.bash + +function execute() { + >&2 echo "++ $@" + eval "$@" +} + +# Tests to run. Defaults to all. +TESTS=${@:-.} + +# Run the tests. +execute time bats --tap $TESTS diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go b/vendor/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go deleted file mode 100644 index daa7a170..00000000 --- a/vendor/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build !experimental - -package graphdriver - -func lookupPlugin(name, home string, opts []string) (Driver, error) { - return nil, ErrNotSupported -} diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/golang.org/x/net/LICENSE b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/golang.org/x/net/LICENSE deleted file mode 100644 index 6a66aea5..00000000 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/golang.org/x/net/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/Sirupsen/logrus/.gitignore b/vendor/src/github.com/Sirupsen/logrus/.gitignore similarity index 100% rename from vendor/github.com/Sirupsen/logrus/.gitignore rename to vendor/src/github.com/Sirupsen/logrus/.gitignore diff --git a/vendor/github.com/Sirupsen/logrus/.travis.yml b/vendor/src/github.com/Sirupsen/logrus/.travis.yml similarity index 100% rename from vendor/github.com/Sirupsen/logrus/.travis.yml rename to vendor/src/github.com/Sirupsen/logrus/.travis.yml diff --git a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/src/github.com/Sirupsen/logrus/CHANGELOG.md similarity index 100% rename from vendor/github.com/Sirupsen/logrus/CHANGELOG.md rename to vendor/src/github.com/Sirupsen/logrus/CHANGELOG.md diff --git a/vendor/github.com/Sirupsen/logrus/LICENSE b/vendor/src/github.com/Sirupsen/logrus/LICENSE similarity index 100% rename from vendor/github.com/Sirupsen/logrus/LICENSE rename to vendor/src/github.com/Sirupsen/logrus/LICENSE diff --git a/vendor/github.com/Sirupsen/logrus/README.md b/vendor/src/github.com/Sirupsen/logrus/README.md similarity index 100% rename from vendor/github.com/Sirupsen/logrus/README.md rename to vendor/src/github.com/Sirupsen/logrus/README.md diff --git a/vendor/github.com/Sirupsen/logrus/doc.go b/vendor/src/github.com/Sirupsen/logrus/doc.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/doc.go rename to vendor/src/github.com/Sirupsen/logrus/doc.go diff --git a/vendor/github.com/Sirupsen/logrus/entry.go b/vendor/src/github.com/Sirupsen/logrus/entry.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/entry.go rename to vendor/src/github.com/Sirupsen/logrus/entry.go diff --git a/vendor/github.com/Sirupsen/logrus/exported.go b/vendor/src/github.com/Sirupsen/logrus/exported.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/exported.go rename to vendor/src/github.com/Sirupsen/logrus/exported.go diff --git a/vendor/github.com/Sirupsen/logrus/formatter.go b/vendor/src/github.com/Sirupsen/logrus/formatter.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/formatter.go rename to vendor/src/github.com/Sirupsen/logrus/formatter.go diff --git a/vendor/github.com/Sirupsen/logrus/hooks.go b/vendor/src/github.com/Sirupsen/logrus/hooks.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/hooks.go rename to vendor/src/github.com/Sirupsen/logrus/hooks.go diff --git a/vendor/github.com/Sirupsen/logrus/json_formatter.go b/vendor/src/github.com/Sirupsen/logrus/json_formatter.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/json_formatter.go rename to vendor/src/github.com/Sirupsen/logrus/json_formatter.go diff --git a/vendor/github.com/Sirupsen/logrus/logger.go b/vendor/src/github.com/Sirupsen/logrus/logger.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/logger.go rename to vendor/src/github.com/Sirupsen/logrus/logger.go diff --git a/vendor/github.com/Sirupsen/logrus/logrus.go b/vendor/src/github.com/Sirupsen/logrus/logrus.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/logrus.go rename to vendor/src/github.com/Sirupsen/logrus/logrus.go diff --git a/vendor/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/src/github.com/Sirupsen/logrus/terminal_bsd.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/terminal_bsd.go rename to vendor/src/github.com/Sirupsen/logrus/terminal_bsd.go diff --git a/vendor/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/src/github.com/Sirupsen/logrus/terminal_linux.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/terminal_linux.go rename to vendor/src/github.com/Sirupsen/logrus/terminal_linux.go diff --git a/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/src/github.com/Sirupsen/logrus/terminal_notwindows.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/terminal_notwindows.go rename to vendor/src/github.com/Sirupsen/logrus/terminal_notwindows.go diff --git a/vendor/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/src/github.com/Sirupsen/logrus/terminal_solaris.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/terminal_solaris.go rename to vendor/src/github.com/Sirupsen/logrus/terminal_solaris.go diff --git a/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/src/github.com/Sirupsen/logrus/terminal_windows.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/terminal_windows.go rename to vendor/src/github.com/Sirupsen/logrus/terminal_windows.go diff --git a/vendor/github.com/Sirupsen/logrus/text_formatter.go b/vendor/src/github.com/Sirupsen/logrus/text_formatter.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/text_formatter.go rename to vendor/src/github.com/Sirupsen/logrus/text_formatter.go diff --git a/vendor/github.com/Sirupsen/logrus/writer.go b/vendor/src/github.com/Sirupsen/logrus/writer.go similarity index 100% rename from vendor/github.com/Sirupsen/logrus/writer.go rename to vendor/src/github.com/Sirupsen/logrus/writer.go diff --git a/vendor/github.com/containernetworking/cni/LICENSE b/vendor/src/github.com/containernetworking/cni/LICENSE similarity index 99% rename from vendor/github.com/containernetworking/cni/LICENSE rename to vendor/src/github.com/containernetworking/cni/LICENSE index 8dada3ed..8f71f43f 100644 --- a/vendor/github.com/containernetworking/cni/LICENSE +++ b/vendor/src/github.com/containernetworking/cni/LICENSE @@ -199,3 +199,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/vendor/github.com/containernetworking/cni/libcni/api.go b/vendor/src/github.com/containernetworking/cni/libcni/api.go similarity index 100% rename from vendor/github.com/containernetworking/cni/libcni/api.go rename to vendor/src/github.com/containernetworking/cni/libcni/api.go diff --git a/vendor/github.com/containernetworking/cni/libcni/conf.go b/vendor/src/github.com/containernetworking/cni/libcni/conf.go similarity index 100% rename from vendor/github.com/containernetworking/cni/libcni/conf.go rename to vendor/src/github.com/containernetworking/cni/libcni/conf.go diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/args.go b/vendor/src/github.com/containernetworking/cni/pkg/invoke/args.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/invoke/args.go rename to vendor/src/github.com/containernetworking/cni/pkg/invoke/args.go diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go b/vendor/src/github.com/containernetworking/cni/pkg/invoke/delegate.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/invoke/delegate.go rename to vendor/src/github.com/containernetworking/cni/pkg/invoke/delegate.go diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/exec.go b/vendor/src/github.com/containernetworking/cni/pkg/invoke/exec.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/invoke/exec.go rename to vendor/src/github.com/containernetworking/cni/pkg/invoke/exec.go diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/find.go b/vendor/src/github.com/containernetworking/cni/pkg/invoke/find.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/invoke/find.go rename to vendor/src/github.com/containernetworking/cni/pkg/invoke/find.go diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go b/vendor/src/github.com/containernetworking/cni/pkg/invoke/raw_exec.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/invoke/raw_exec.go rename to vendor/src/github.com/containernetworking/cni/pkg/invoke/raw_exec.go diff --git a/vendor/github.com/containernetworking/cni/pkg/types/args.go b/vendor/src/github.com/containernetworking/cni/pkg/types/args.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/types/args.go rename to vendor/src/github.com/containernetworking/cni/pkg/types/args.go diff --git a/vendor/github.com/containernetworking/cni/pkg/types/types.go b/vendor/src/github.com/containernetworking/cni/pkg/types/types.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/types/types.go rename to vendor/src/github.com/containernetworking/cni/pkg/types/types.go diff --git a/vendor/github.com/containernetworking/cni/pkg/version/plugin.go b/vendor/src/github.com/containernetworking/cni/pkg/version/plugin.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/version/plugin.go rename to vendor/src/github.com/containernetworking/cni/pkg/version/plugin.go diff --git a/vendor/github.com/containernetworking/cni/pkg/version/version.go b/vendor/src/github.com/containernetworking/cni/pkg/version/version.go similarity index 100% rename from vendor/github.com/containernetworking/cni/pkg/version/version.go rename to vendor/src/github.com/containernetworking/cni/pkg/version/version.go diff --git a/vendor/github.com/containers/image/LICENSE b/vendor/src/github.com/containers/image/LICENSE similarity index 100% rename from vendor/github.com/containers/image/LICENSE rename to vendor/src/github.com/containers/image/LICENSE diff --git a/vendor/github.com/containers/image/directory/directory_dest.go b/vendor/src/github.com/containers/image/directory/directory_dest.go similarity index 100% rename from vendor/github.com/containers/image/directory/directory_dest.go rename to vendor/src/github.com/containers/image/directory/directory_dest.go diff --git a/vendor/github.com/containers/image/directory/directory_src.go b/vendor/src/github.com/containers/image/directory/directory_src.go similarity index 100% rename from vendor/github.com/containers/image/directory/directory_src.go rename to vendor/src/github.com/containers/image/directory/directory_src.go diff --git a/vendor/github.com/containers/image/directory/directory_transport.go b/vendor/src/github.com/containers/image/directory/directory_transport.go similarity index 100% rename from vendor/github.com/containers/image/directory/directory_transport.go rename to vendor/src/github.com/containers/image/directory/directory_transport.go diff --git a/vendor/github.com/containers/image/directory/explicitfilepath/path.go b/vendor/src/github.com/containers/image/directory/explicitfilepath/path.go similarity index 100% rename from vendor/github.com/containers/image/directory/explicitfilepath/path.go rename to vendor/src/github.com/containers/image/directory/explicitfilepath/path.go diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/src/github.com/containers/image/docker/docker_client.go similarity index 100% rename from vendor/github.com/containers/image/docker/docker_client.go rename to vendor/src/github.com/containers/image/docker/docker_client.go diff --git a/vendor/github.com/containers/image/docker/docker_image.go b/vendor/src/github.com/containers/image/docker/docker_image.go similarity index 100% rename from vendor/github.com/containers/image/docker/docker_image.go rename to vendor/src/github.com/containers/image/docker/docker_image.go diff --git a/vendor/github.com/containers/image/docker/docker_image_dest.go b/vendor/src/github.com/containers/image/docker/docker_image_dest.go similarity index 100% rename from vendor/github.com/containers/image/docker/docker_image_dest.go rename to vendor/src/github.com/containers/image/docker/docker_image_dest.go diff --git a/vendor/github.com/containers/image/docker/docker_image_src.go b/vendor/src/github.com/containers/image/docker/docker_image_src.go similarity index 100% rename from vendor/github.com/containers/image/docker/docker_image_src.go rename to vendor/src/github.com/containers/image/docker/docker_image_src.go diff --git a/vendor/github.com/containers/image/docker/docker_transport.go b/vendor/src/github.com/containers/image/docker/docker_transport.go similarity index 100% rename from vendor/github.com/containers/image/docker/docker_transport.go rename to vendor/src/github.com/containers/image/docker/docker_transport.go diff --git a/vendor/github.com/containers/image/docker/lookaside.go b/vendor/src/github.com/containers/image/docker/lookaside.go similarity index 100% rename from vendor/github.com/containers/image/docker/lookaside.go rename to vendor/src/github.com/containers/image/docker/lookaside.go diff --git a/vendor/github.com/containers/image/docker/policyconfiguration/naming.go b/vendor/src/github.com/containers/image/docker/policyconfiguration/naming.go similarity index 100% rename from vendor/github.com/containers/image/docker/policyconfiguration/naming.go rename to vendor/src/github.com/containers/image/docker/policyconfiguration/naming.go diff --git a/vendor/github.com/containers/image/docker/wwwauthenticate.go b/vendor/src/github.com/containers/image/docker/wwwauthenticate.go similarity index 100% rename from vendor/github.com/containers/image/docker/wwwauthenticate.go rename to vendor/src/github.com/containers/image/docker/wwwauthenticate.go diff --git a/vendor/github.com/containers/image/image/image.go b/vendor/src/github.com/containers/image/image/image.go similarity index 100% rename from vendor/github.com/containers/image/image/image.go rename to vendor/src/github.com/containers/image/image/image.go diff --git a/vendor/github.com/containers/image/manifest/manifest.go b/vendor/src/github.com/containers/image/manifest/manifest.go similarity index 100% rename from vendor/github.com/containers/image/manifest/manifest.go rename to vendor/src/github.com/containers/image/manifest/manifest.go diff --git a/vendor/github.com/containers/image/oci/layout/oci_dest.go b/vendor/src/github.com/containers/image/oci/layout/oci_dest.go similarity index 100% rename from vendor/github.com/containers/image/oci/layout/oci_dest.go rename to vendor/src/github.com/containers/image/oci/layout/oci_dest.go diff --git a/vendor/github.com/containers/image/oci/layout/oci_transport.go b/vendor/src/github.com/containers/image/oci/layout/oci_transport.go similarity index 100% rename from vendor/github.com/containers/image/oci/layout/oci_transport.go rename to vendor/src/github.com/containers/image/oci/layout/oci_transport.go diff --git a/vendor/github.com/containers/image/openshift/openshift-copies.go b/vendor/src/github.com/containers/image/openshift/openshift-copies.go similarity index 100% rename from vendor/github.com/containers/image/openshift/openshift-copies.go rename to vendor/src/github.com/containers/image/openshift/openshift-copies.go diff --git a/vendor/github.com/containers/image/openshift/openshift.go b/vendor/src/github.com/containers/image/openshift/openshift.go similarity index 100% rename from vendor/github.com/containers/image/openshift/openshift.go rename to vendor/src/github.com/containers/image/openshift/openshift.go diff --git a/vendor/github.com/containers/image/openshift/openshift_transport.go b/vendor/src/github.com/containers/image/openshift/openshift_transport.go similarity index 100% rename from vendor/github.com/containers/image/openshift/openshift_transport.go rename to vendor/src/github.com/containers/image/openshift/openshift_transport.go diff --git a/vendor/github.com/containers/image/transports/transports.go b/vendor/src/github.com/containers/image/transports/transports.go similarity index 100% rename from vendor/github.com/containers/image/transports/transports.go rename to vendor/src/github.com/containers/image/transports/transports.go diff --git a/vendor/github.com/containers/image/types/types.go b/vendor/src/github.com/containers/image/types/types.go similarity index 100% rename from vendor/github.com/containers/image/types/types.go rename to vendor/src/github.com/containers/image/types/types.go diff --git a/vendor/github.com/containers/image/version/version.go b/vendor/src/github.com/containers/image/version/version.go similarity index 100% rename from vendor/github.com/containers/image/version/version.go rename to vendor/src/github.com/containers/image/version/version.go diff --git a/vendor/github.com/docker/distribution/.gitignore b/vendor/src/github.com/docker/distribution/.gitignore similarity index 100% rename from vendor/github.com/docker/distribution/.gitignore rename to vendor/src/github.com/docker/distribution/.gitignore diff --git a/vendor/github.com/docker/distribution/.mailmap b/vendor/src/github.com/docker/distribution/.mailmap similarity index 100% rename from vendor/github.com/docker/distribution/.mailmap rename to vendor/src/github.com/docker/distribution/.mailmap diff --git a/vendor/github.com/docker/distribution/AUTHORS b/vendor/src/github.com/docker/distribution/AUTHORS similarity index 100% rename from vendor/github.com/docker/distribution/AUTHORS rename to vendor/src/github.com/docker/distribution/AUTHORS diff --git a/vendor/github.com/docker/distribution/BUILDING.md b/vendor/src/github.com/docker/distribution/BUILDING.md similarity index 100% rename from vendor/github.com/docker/distribution/BUILDING.md rename to vendor/src/github.com/docker/distribution/BUILDING.md diff --git a/vendor/github.com/docker/distribution/CHANGELOG.md b/vendor/src/github.com/docker/distribution/CHANGELOG.md similarity index 99% rename from vendor/github.com/docker/distribution/CHANGELOG.md rename to vendor/src/github.com/docker/distribution/CHANGELOG.md index ece5f3fe..3445c090 100644 --- a/vendor/github.com/docker/distribution/CHANGELOG.md +++ b/vendor/src/github.com/docker/distribution/CHANGELOG.md @@ -31,3 +31,5 @@ ### Docker Image - Use Alpine Linux as base image + + diff --git a/vendor/github.com/docker/distribution/CONTRIBUTING.md b/vendor/src/github.com/docker/distribution/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/docker/distribution/CONTRIBUTING.md rename to vendor/src/github.com/docker/distribution/CONTRIBUTING.md diff --git a/vendor/github.com/docker/distribution/Dockerfile b/vendor/src/github.com/docker/distribution/Dockerfile similarity index 100% rename from vendor/github.com/docker/distribution/Dockerfile rename to vendor/src/github.com/docker/distribution/Dockerfile diff --git a/vendor/github.com/docker/distribution/LICENSE b/vendor/src/github.com/docker/distribution/LICENSE similarity index 99% rename from vendor/github.com/docker/distribution/LICENSE rename to vendor/src/github.com/docker/distribution/LICENSE index 5c304d1a..e06d2081 100644 --- a/vendor/github.com/docker/distribution/LICENSE +++ b/vendor/src/github.com/docker/distribution/LICENSE @@ -199,3 +199,4 @@ Apache License WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/vendor/github.com/docker/distribution/MAINTAINERS b/vendor/src/github.com/docker/distribution/MAINTAINERS similarity index 100% rename from vendor/github.com/docker/distribution/MAINTAINERS rename to vendor/src/github.com/docker/distribution/MAINTAINERS diff --git a/vendor/github.com/docker/distribution/Makefile b/vendor/src/github.com/docker/distribution/Makefile similarity index 100% rename from vendor/github.com/docker/distribution/Makefile rename to vendor/src/github.com/docker/distribution/Makefile diff --git a/vendor/github.com/docker/distribution/README.md b/vendor/src/github.com/docker/distribution/README.md similarity index 98% rename from vendor/github.com/docker/distribution/README.md rename to vendor/src/github.com/docker/distribution/README.md index b892d50c..d35bcb68 100644 --- a/vendor/github.com/docker/distribution/README.md +++ b/vendor/src/github.com/docker/distribution/README.md @@ -60,10 +60,10 @@ For information on upcoming functionality, please see [ROADMAP.md](ROADMAP.md). By default, Docker users pull images from Docker's public registry instance. [Installing Docker](https://docs.docker.com/engine/installation/) gives users this ability. Users can also push images to a repository on Docker's public registry, -if they have a [Docker Hub](https://hub.docker.com/) account. +if they have a [Docker Hub](https://hub.docker.com/) account. For some users and even companies, this default behavior is sufficient. For -others, it is not. +others, it is not. For example, users with their own software products may want to maintain a registry for private, company images. Also, you may wish to deploy your own diff --git a/vendor/github.com/docker/distribution/ROADMAP.md b/vendor/src/github.com/docker/distribution/ROADMAP.md similarity index 98% rename from vendor/github.com/docker/distribution/ROADMAP.md rename to vendor/src/github.com/docker/distribution/ROADMAP.md index aa3bd3bf..701127af 100644 --- a/vendor/github.com/docker/distribution/ROADMAP.md +++ b/vendor/src/github.com/docker/distribution/ROADMAP.md @@ -27,7 +27,7 @@ considerations made in respect of the future of the project. Components of the Distribution Project are managed via github [milestones](https://github.com/docker/distribution/milestones). Upcoming features and bugfixes for a component will be added to the relevant milestone. If a feature or bugfix is not part of a milestone, it is currently unscheduled for -implementation. +implementation. * [Registry](#registry) * [Distribution Package](#distribution-package) @@ -40,7 +40,7 @@ The new Docker registry is the main portion of the distribution repository. Registry 2.0 is the first release of the next-generation registry. This was primarily focused on implementing the [new registry API](https://github.com/docker/distribution/blob/master/docs/spec/api.md), -with a focus on security and performance. +with a focus on security and performance. Following from the Distribution project goals above, we have a set of goals for registry v2 that we would like to follow in the design. New features @@ -105,9 +105,9 @@ landing in the registry. ##### Proxying to other Registries -A _pull-through caching_ mode exists for the registry, but is restricted from +A _pull-through caching_ mode exists for the registry, but is restricted from within the docker client to only mirror the official Docker Hub. This functionality -can be expanded when image provenance has been specified and implemented in the +can be expanded when image provenance has been specified and implemented in the distribution project. ##### Metadata storage @@ -247,13 +247,13 @@ Please see the following issues for more detail: - https://github.com/docker/distribution/issues/461 - https://github.com/docker/distribution/issues/462 -### Distribution Package +### Distribution Package At its core, the Distribution Project is a set of Go packages that make up Distribution Components. At this time, most of these packages make up the -Registry implementation. +Registry implementation. -The package itself is considered unstable. If you're using it, please take care to vendor the dependent version. +The package itself is considered unstable. If you're using it, please take care to vendor the dependent version. For feature additions, please see the Registry section. In the future, we may break out a separate Roadmap for distribution-specific features that apply to more than @@ -264,3 +264,4 @@ just the registry. ### Project Planning An [Open-Source Planning Process](https://github.com/docker/distribution/wiki/Open-Source-Planning-Process) is used to define the Roadmap. [Project Pages](https://github.com/docker/distribution/wiki) define the goals for each Milestone and identify current progress. + diff --git a/vendor/github.com/docker/distribution/blobs.go b/vendor/src/github.com/docker/distribution/blobs.go similarity index 100% rename from vendor/github.com/docker/distribution/blobs.go rename to vendor/src/github.com/docker/distribution/blobs.go diff --git a/vendor/github.com/docker/distribution/circle.yml b/vendor/src/github.com/docker/distribution/circle.yml similarity index 100% rename from vendor/github.com/docker/distribution/circle.yml rename to vendor/src/github.com/docker/distribution/circle.yml diff --git a/vendor/github.com/docker/distribution/context/context.go b/vendor/src/github.com/docker/distribution/context/context.go similarity index 100% rename from vendor/github.com/docker/distribution/context/context.go rename to vendor/src/github.com/docker/distribution/context/context.go diff --git a/vendor/github.com/docker/distribution/context/doc.go b/vendor/src/github.com/docker/distribution/context/doc.go similarity index 100% rename from vendor/github.com/docker/distribution/context/doc.go rename to vendor/src/github.com/docker/distribution/context/doc.go diff --git a/vendor/github.com/docker/distribution/context/http.go b/vendor/src/github.com/docker/distribution/context/http.go similarity index 100% rename from vendor/github.com/docker/distribution/context/http.go rename to vendor/src/github.com/docker/distribution/context/http.go diff --git a/vendor/github.com/docker/distribution/context/logger.go b/vendor/src/github.com/docker/distribution/context/logger.go similarity index 100% rename from vendor/github.com/docker/distribution/context/logger.go rename to vendor/src/github.com/docker/distribution/context/logger.go diff --git a/vendor/github.com/docker/distribution/context/trace.go b/vendor/src/github.com/docker/distribution/context/trace.go similarity index 100% rename from vendor/github.com/docker/distribution/context/trace.go rename to vendor/src/github.com/docker/distribution/context/trace.go diff --git a/vendor/github.com/docker/distribution/context/util.go b/vendor/src/github.com/docker/distribution/context/util.go similarity index 100% rename from vendor/github.com/docker/distribution/context/util.go rename to vendor/src/github.com/docker/distribution/context/util.go diff --git a/vendor/github.com/docker/distribution/context/version.go b/vendor/src/github.com/docker/distribution/context/version.go similarity index 100% rename from vendor/github.com/docker/distribution/context/version.go rename to vendor/src/github.com/docker/distribution/context/version.go diff --git a/vendor/github.com/docker/distribution/coverpkg.sh b/vendor/src/github.com/docker/distribution/coverpkg.sh similarity index 100% rename from vendor/github.com/docker/distribution/coverpkg.sh rename to vendor/src/github.com/docker/distribution/coverpkg.sh diff --git a/vendor/github.com/docker/distribution/digest/digest.go b/vendor/src/github.com/docker/distribution/digest/digest.go similarity index 100% rename from vendor/github.com/docker/distribution/digest/digest.go rename to vendor/src/github.com/docker/distribution/digest/digest.go diff --git a/vendor/github.com/docker/distribution/digest/digester.go b/vendor/src/github.com/docker/distribution/digest/digester.go similarity index 100% rename from vendor/github.com/docker/distribution/digest/digester.go rename to vendor/src/github.com/docker/distribution/digest/digester.go diff --git a/vendor/github.com/docker/distribution/digest/doc.go b/vendor/src/github.com/docker/distribution/digest/doc.go similarity index 100% rename from vendor/github.com/docker/distribution/digest/doc.go rename to vendor/src/github.com/docker/distribution/digest/doc.go diff --git a/vendor/github.com/docker/distribution/digest/set.go b/vendor/src/github.com/docker/distribution/digest/set.go similarity index 100% rename from vendor/github.com/docker/distribution/digest/set.go rename to vendor/src/github.com/docker/distribution/digest/set.go diff --git a/vendor/github.com/docker/distribution/digest/verifiers.go b/vendor/src/github.com/docker/distribution/digest/verifiers.go similarity index 100% rename from vendor/github.com/docker/distribution/digest/verifiers.go rename to vendor/src/github.com/docker/distribution/digest/verifiers.go diff --git a/vendor/github.com/docker/distribution/doc.go b/vendor/src/github.com/docker/distribution/doc.go similarity index 100% rename from vendor/github.com/docker/distribution/doc.go rename to vendor/src/github.com/docker/distribution/doc.go diff --git a/vendor/github.com/docker/distribution/errors.go b/vendor/src/github.com/docker/distribution/errors.go similarity index 100% rename from vendor/github.com/docker/distribution/errors.go rename to vendor/src/github.com/docker/distribution/errors.go diff --git a/vendor/github.com/docker/distribution/manifests.go b/vendor/src/github.com/docker/distribution/manifests.go similarity index 100% rename from vendor/github.com/docker/distribution/manifests.go rename to vendor/src/github.com/docker/distribution/manifests.go diff --git a/vendor/github.com/docker/distribution/reference/reference.go b/vendor/src/github.com/docker/distribution/reference/reference.go similarity index 100% rename from vendor/github.com/docker/distribution/reference/reference.go rename to vendor/src/github.com/docker/distribution/reference/reference.go diff --git a/vendor/github.com/docker/distribution/reference/regexp.go b/vendor/src/github.com/docker/distribution/reference/regexp.go similarity index 100% rename from vendor/github.com/docker/distribution/reference/regexp.go rename to vendor/src/github.com/docker/distribution/reference/regexp.go diff --git a/vendor/github.com/docker/distribution/registry.go b/vendor/src/github.com/docker/distribution/registry.go similarity index 100% rename from vendor/github.com/docker/distribution/registry.go rename to vendor/src/github.com/docker/distribution/registry.go diff --git a/vendor/github.com/docker/distribution/tags.go b/vendor/src/github.com/docker/distribution/tags.go similarity index 100% rename from vendor/github.com/docker/distribution/tags.go rename to vendor/src/github.com/docker/distribution/tags.go diff --git a/vendor/github.com/docker/distribution/uuid/uuid.go b/vendor/src/github.com/docker/distribution/uuid/uuid.go similarity index 100% rename from vendor/github.com/docker/distribution/uuid/uuid.go rename to vendor/src/github.com/docker/distribution/uuid/uuid.go diff --git a/vendor/github.com/docker/docker/LICENSE b/vendor/src/github.com/docker/docker/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/LICENSE rename to vendor/src/github.com/docker/docker/LICENSE diff --git a/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go b/vendor/src/github.com/docker/docker/api/types/blkiodev/blkio.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/blkiodev/blkio.go rename to vendor/src/github.com/docker/docker/api/types/blkiodev/blkio.go diff --git a/vendor/github.com/docker/docker/api/types/container/config.go b/vendor/src/github.com/docker/docker/api/types/container/config.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/container/config.go rename to vendor/src/github.com/docker/docker/api/types/container/config.go diff --git a/vendor/github.com/docker/docker/api/types/container/host_config.go b/vendor/src/github.com/docker/docker/api/types/container/host_config.go similarity index 98% rename from vendor/github.com/docker/docker/api/types/container/host_config.go rename to vendor/src/github.com/docker/docker/api/types/container/host_config.go index bb3e5981..9f4ada25 100644 --- a/vendor/github.com/docker/docker/api/types/container/host_config.go +++ b/vendor/src/github.com/docker/docker/api/types/container/host_config.go @@ -313,7 +313,7 @@ type HostConfig struct { Runtime string `json:",omitempty"` // Runtime to use with this container // Applicable to Windows - ConsoleSize Box // Initial console size + ConsoleSize [2]uint // Initial console size (height,width) Isolation Isolation // Isolation technology of the container (eg default, hyperv) // Contains container's resources (cgroups, ulimits) @@ -323,11 +323,5 @@ type HostConfig struct { Mounts []mount.Mount `json:",omitempty"` // Run a custom init inside the container, if null, use the daemon's configured settings - Init *bool `json:",om itempty"` -} - -// Box specifies height and width dimensions. Used for sizing of a console. -type Box struct { - Height uint - Width uint + Init *bool `json:",omitempty"` } diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go b/vendor/src/github.com/docker/docker/api/types/container/hostconfig_unix.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go rename to vendor/src/github.com/docker/docker/api/types/container/hostconfig_unix.go diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go b/vendor/src/github.com/docker/docker/api/types/container/hostconfig_windows.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go rename to vendor/src/github.com/docker/docker/api/types/container/hostconfig_windows.go diff --git a/vendor/github.com/docker/docker/api/types/mount/mount.go b/vendor/src/github.com/docker/docker/api/types/mount/mount.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/mount/mount.go rename to vendor/src/github.com/docker/docker/api/types/mount/mount.go diff --git a/vendor/github.com/docker/docker/api/types/strslice/strslice.go b/vendor/src/github.com/docker/docker/api/types/strslice/strslice.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/strslice/strslice.go rename to vendor/src/github.com/docker/docker/api/types/strslice/strslice.go diff --git a/vendor/github.com/docker/docker/api/types/versions/README.md b/vendor/src/github.com/docker/docker/api/types/versions/README.md similarity index 100% rename from vendor/github.com/docker/docker/api/types/versions/README.md rename to vendor/src/github.com/docker/docker/api/types/versions/README.md diff --git a/vendor/github.com/docker/docker/api/types/versions/compare.go b/vendor/src/github.com/docker/docker/api/types/versions/compare.go similarity index 100% rename from vendor/github.com/docker/docker/api/types/versions/compare.go rename to vendor/src/github.com/docker/docker/api/types/versions/compare.go diff --git a/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE b/vendor/src/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE rename to vendor/src/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/LICENSE diff --git a/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/LICENSE b/vendor/src/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/LICENSE rename to vendor/src/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/LICENSE diff --git a/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/LICENSE b/vendor/src/github.com/docker/docker/contrib/selinux/docker-engine-selinux/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/LICENSE rename to vendor/src/github.com/docker/docker/contrib/selinux/docker-engine-selinux/LICENSE diff --git a/vendor/github.com/docker/docker/contrib/syntax/vim/LICENSE b/vendor/src/github.com/docker/docker/contrib/syntax/vim/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/contrib/syntax/vim/LICENSE rename to vendor/src/github.com/docker/docker/contrib/syntax/vim/LICENSE diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/counter.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/counter.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/counter.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/counter.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver.go similarity index 96% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver.go index 434669da..19bd8afa 100644 --- a/vendor/github.com/docker/docker/daemon/graphdriver/driver.go +++ b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver.go @@ -12,6 +12,7 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" + "github.com/docker/docker/plugin/getter" ) // FsMagic unsigned id of the filesystem in use. @@ -134,11 +135,11 @@ func Register(name string, initFunc InitFunc) error { } // GetDriver initializes and returns the registered driver -func GetDriver(name, home string, options []string, uidMaps, gidMaps []idtools.IDMap) (Driver, error) { +func GetDriver(name, home string, options []string, uidMaps, gidMaps []idtools.IDMap, plugingetter getter.PluginGetter) (Driver, error) { if initFunc, exists := drivers[name]; exists { return initFunc(filepath.Join(home, name), options, uidMaps, gidMaps) } - if pluginDriver, err := lookupPlugin(name, home, options); err == nil { + if pluginDriver, err := lookupPlugin(name, home, options, plugingetter); err == nil { return pluginDriver, nil } logrus.Errorf("Failed to GetDriver graph %s %s", name, home) @@ -155,10 +156,10 @@ func getBuiltinDriver(name, home string, options []string, uidMaps, gidMaps []id } // New creates the driver and initializes it at the specified root. -func New(root string, name string, options []string, uidMaps, gidMaps []idtools.IDMap) (Driver, error) { +func New(root string, name string, options []string, uidMaps, gidMaps []idtools.IDMap, plugingetter getter.PluginGetter) (Driver, error) { if name != "" { logrus.Debugf("[graphdriver] trying provided driver: %s", name) // so the logs show specified driver - return GetDriver(name, root, options, uidMaps, gidMaps) + return GetDriver(name, root, options, uidMaps, gidMaps, plugingetter) } // Guess for prior driver diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver_linux.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver_linux.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver_linux.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver_linux.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver_solaris.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver_solaris.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver_solaris.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/driver_windows.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/driver_windows.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/driver_windows.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/driver_windows.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/fsdiff.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/fsdiff.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/fsdiff.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/fsdiff.go diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/plugin.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/plugin.go similarity index 80% rename from vendor/github.com/docker/docker/daemon/graphdriver/plugin.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/plugin.go index 9f172b72..9a044d2f 100644 --- a/vendor/github.com/docker/docker/daemon/graphdriver/plugin.go +++ b/vendor/src/github.com/docker/docker/daemon/graphdriver/plugin.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/docker/docker/pkg/plugins" + "github.com/docker/docker/plugin/getter" ) type pluginClient interface { @@ -18,8 +18,8 @@ type pluginClient interface { SendFile(string, io.Reader, interface{}) error } -func lookupPlugin(name, home string, opts []string) (Driver, error) { - pl, err := plugins.Get(name, "GraphDriver") +func lookupPlugin(name, home string, opts []string, pluginGetter getter.PluginGetter) (Driver, error) { + pl, err := pluginGetter.Get(name, "GraphDriver", getter.LOOKUP) if err != nil { return nil, fmt.Errorf("Error looking up graphdriver plugin %s: %v", name, err) } diff --git a/vendor/src/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go new file mode 100644 index 00000000..a16ef068 --- /dev/null +++ b/vendor/src/github.com/docker/docker/daemon/graphdriver/plugin_unsupported.go @@ -0,0 +1,9 @@ +// +build !experimental + +package graphdriver + +import "github.com/docker/docker/plugin/getter" + +func lookupPlugin(name, home string, opts []string, plugingetter getter.PluginGetter) (Driver, error) { + return nil, ErrNotSupported +} diff --git a/vendor/github.com/docker/docker/daemon/graphdriver/proxy.go b/vendor/src/github.com/docker/docker/daemon/graphdriver/proxy.go similarity index 100% rename from vendor/github.com/docker/docker/daemon/graphdriver/proxy.go rename to vendor/src/github.com/docker/docker/daemon/graphdriver/proxy.go diff --git a/vendor/github.com/docker/docker/image/fs.go b/vendor/src/github.com/docker/docker/image/fs.go similarity index 100% rename from vendor/github.com/docker/docker/image/fs.go rename to vendor/src/github.com/docker/docker/image/fs.go diff --git a/vendor/github.com/docker/docker/image/image.go b/vendor/src/github.com/docker/docker/image/image.go similarity index 100% rename from vendor/github.com/docker/docker/image/image.go rename to vendor/src/github.com/docker/docker/image/image.go diff --git a/vendor/github.com/docker/docker/image/rootfs.go b/vendor/src/github.com/docker/docker/image/rootfs.go similarity index 100% rename from vendor/github.com/docker/docker/image/rootfs.go rename to vendor/src/github.com/docker/docker/image/rootfs.go diff --git a/vendor/github.com/docker/docker/image/store.go b/vendor/src/github.com/docker/docker/image/store.go similarity index 100% rename from vendor/github.com/docker/docker/image/store.go rename to vendor/src/github.com/docker/docker/image/store.go diff --git a/vendor/github.com/docker/docker/image/v1/imagev1.go b/vendor/src/github.com/docker/docker/image/v1/imagev1.go similarity index 100% rename from vendor/github.com/docker/docker/image/v1/imagev1.go rename to vendor/src/github.com/docker/docker/image/v1/imagev1.go diff --git a/vendor/github.com/docker/docker/layer/empty.go b/vendor/src/github.com/docker/docker/layer/empty.go similarity index 100% rename from vendor/github.com/docker/docker/layer/empty.go rename to vendor/src/github.com/docker/docker/layer/empty.go diff --git a/vendor/github.com/docker/docker/layer/filestore.go b/vendor/src/github.com/docker/docker/layer/filestore.go similarity index 100% rename from vendor/github.com/docker/docker/layer/filestore.go rename to vendor/src/github.com/docker/docker/layer/filestore.go diff --git a/vendor/github.com/docker/docker/layer/layer.go b/vendor/src/github.com/docker/docker/layer/layer.go similarity index 100% rename from vendor/github.com/docker/docker/layer/layer.go rename to vendor/src/github.com/docker/docker/layer/layer.go diff --git a/vendor/github.com/docker/docker/layer/layer_store.go b/vendor/src/github.com/docker/docker/layer/layer_store.go similarity index 99% rename from vendor/github.com/docker/docker/layer/layer_store.go rename to vendor/src/github.com/docker/docker/layer/layer_store.go index 6d5cb259..a587b01a 100644 --- a/vendor/github.com/docker/docker/layer/layer_store.go +++ b/vendor/src/github.com/docker/docker/layer/layer_store.go @@ -14,6 +14,7 @@ import ( "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/stringid" + "github.com/docker/docker/plugin/getter" "github.com/vbatts/tar-split/tar/asm" "github.com/vbatts/tar-split/tar/storage" ) @@ -44,6 +45,7 @@ type StoreOptions struct { GraphDriverOptions []string UIDMaps []idtools.IDMap GIDMaps []idtools.IDMap + PluginGetter getter.PluginGetter } // NewStoreFromOptions creates a new Store instance @@ -53,7 +55,8 @@ func NewStoreFromOptions(options StoreOptions) (Store, error) { options.GraphDriver, options.GraphDriverOptions, options.UIDMaps, - options.GIDMaps) + options.GIDMaps, + options.PluginGetter) if err != nil { return nil, fmt.Errorf("error initializing graphdriver: %v", err) } diff --git a/vendor/github.com/docker/docker/layer/layer_store_windows.go b/vendor/src/github.com/docker/docker/layer/layer_store_windows.go similarity index 100% rename from vendor/github.com/docker/docker/layer/layer_store_windows.go rename to vendor/src/github.com/docker/docker/layer/layer_store_windows.go diff --git a/vendor/github.com/docker/docker/layer/layer_unix.go b/vendor/src/github.com/docker/docker/layer/layer_unix.go similarity index 100% rename from vendor/github.com/docker/docker/layer/layer_unix.go rename to vendor/src/github.com/docker/docker/layer/layer_unix.go diff --git a/vendor/github.com/docker/docker/layer/layer_windows.go b/vendor/src/github.com/docker/docker/layer/layer_windows.go similarity index 100% rename from vendor/github.com/docker/docker/layer/layer_windows.go rename to vendor/src/github.com/docker/docker/layer/layer_windows.go diff --git a/vendor/github.com/docker/docker/layer/migration.go b/vendor/src/github.com/docker/docker/layer/migration.go similarity index 100% rename from vendor/github.com/docker/docker/layer/migration.go rename to vendor/src/github.com/docker/docker/layer/migration.go diff --git a/vendor/github.com/docker/docker/layer/mounted_layer.go b/vendor/src/github.com/docker/docker/layer/mounted_layer.go similarity index 100% rename from vendor/github.com/docker/docker/layer/mounted_layer.go rename to vendor/src/github.com/docker/docker/layer/mounted_layer.go diff --git a/vendor/github.com/docker/docker/layer/ro_layer.go b/vendor/src/github.com/docker/docker/layer/ro_layer.go similarity index 100% rename from vendor/github.com/docker/docker/layer/ro_layer.go rename to vendor/src/github.com/docker/docker/layer/ro_layer.go diff --git a/vendor/github.com/docker/docker/layer/ro_layer_windows.go b/vendor/src/github.com/docker/docker/layer/ro_layer_windows.go similarity index 100% rename from vendor/github.com/docker/docker/layer/ro_layer_windows.go rename to vendor/src/github.com/docker/docker/layer/ro_layer_windows.go diff --git a/vendor/github.com/docker/docker/pkg/archive/README.md b/vendor/src/github.com/docker/docker/pkg/archive/README.md similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/README.md rename to vendor/src/github.com/docker/docker/pkg/archive/README.md diff --git a/vendor/github.com/docker/docker/pkg/archive/archive.go b/vendor/src/github.com/docker/docker/pkg/archive/archive.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/archive.go rename to vendor/src/github.com/docker/docker/pkg/archive/archive.go diff --git a/vendor/github.com/docker/docker/pkg/archive/archive_linux.go b/vendor/src/github.com/docker/docker/pkg/archive/archive_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/archive_linux.go rename to vendor/src/github.com/docker/docker/pkg/archive/archive_linux.go diff --git a/vendor/github.com/docker/docker/pkg/archive/archive_other.go b/vendor/src/github.com/docker/docker/pkg/archive/archive_other.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/archive_other.go rename to vendor/src/github.com/docker/docker/pkg/archive/archive_other.go diff --git a/vendor/github.com/docker/docker/pkg/archive/archive_unix.go b/vendor/src/github.com/docker/docker/pkg/archive/archive_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/archive_unix.go rename to vendor/src/github.com/docker/docker/pkg/archive/archive_unix.go diff --git a/vendor/github.com/docker/docker/pkg/archive/archive_windows.go b/vendor/src/github.com/docker/docker/pkg/archive/archive_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/archive_windows.go rename to vendor/src/github.com/docker/docker/pkg/archive/archive_windows.go diff --git a/vendor/github.com/docker/docker/pkg/archive/changes.go b/vendor/src/github.com/docker/docker/pkg/archive/changes.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/changes.go rename to vendor/src/github.com/docker/docker/pkg/archive/changes.go diff --git a/vendor/github.com/docker/docker/pkg/archive/changes_linux.go b/vendor/src/github.com/docker/docker/pkg/archive/changes_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/changes_linux.go rename to vendor/src/github.com/docker/docker/pkg/archive/changes_linux.go diff --git a/vendor/github.com/docker/docker/pkg/archive/changes_other.go b/vendor/src/github.com/docker/docker/pkg/archive/changes_other.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/changes_other.go rename to vendor/src/github.com/docker/docker/pkg/archive/changes_other.go diff --git a/vendor/github.com/docker/docker/pkg/archive/changes_unix.go b/vendor/src/github.com/docker/docker/pkg/archive/changes_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/changes_unix.go rename to vendor/src/github.com/docker/docker/pkg/archive/changes_unix.go diff --git a/vendor/github.com/docker/docker/pkg/archive/changes_windows.go b/vendor/src/github.com/docker/docker/pkg/archive/changes_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/changes_windows.go rename to vendor/src/github.com/docker/docker/pkg/archive/changes_windows.go diff --git a/vendor/github.com/docker/docker/pkg/archive/copy.go b/vendor/src/github.com/docker/docker/pkg/archive/copy.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/copy.go rename to vendor/src/github.com/docker/docker/pkg/archive/copy.go diff --git a/vendor/github.com/docker/docker/pkg/archive/copy_unix.go b/vendor/src/github.com/docker/docker/pkg/archive/copy_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/copy_unix.go rename to vendor/src/github.com/docker/docker/pkg/archive/copy_unix.go diff --git a/vendor/github.com/docker/docker/pkg/archive/copy_windows.go b/vendor/src/github.com/docker/docker/pkg/archive/copy_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/copy_windows.go rename to vendor/src/github.com/docker/docker/pkg/archive/copy_windows.go diff --git a/vendor/github.com/docker/docker/pkg/archive/diff.go b/vendor/src/github.com/docker/docker/pkg/archive/diff.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/diff.go rename to vendor/src/github.com/docker/docker/pkg/archive/diff.go diff --git a/vendor/github.com/docker/docker/pkg/archive/example_changes.go b/vendor/src/github.com/docker/docker/pkg/archive/example_changes.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/example_changes.go rename to vendor/src/github.com/docker/docker/pkg/archive/example_changes.go diff --git a/vendor/github.com/docker/docker/pkg/archive/time_linux.go b/vendor/src/github.com/docker/docker/pkg/archive/time_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/time_linux.go rename to vendor/src/github.com/docker/docker/pkg/archive/time_linux.go diff --git a/vendor/github.com/docker/docker/pkg/archive/time_unsupported.go b/vendor/src/github.com/docker/docker/pkg/archive/time_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/time_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/archive/time_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/archive/whiteouts.go b/vendor/src/github.com/docker/docker/pkg/archive/whiteouts.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/whiteouts.go rename to vendor/src/github.com/docker/docker/pkg/archive/whiteouts.go diff --git a/vendor/github.com/docker/docker/pkg/archive/wrap.go b/vendor/src/github.com/docker/docker/pkg/archive/wrap.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/archive/wrap.go rename to vendor/src/github.com/docker/docker/pkg/archive/wrap.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/archive.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/archive.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/archive.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/archive.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/archive_unix.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/archive_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/archive_unix.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/archive_unix.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/archive_windows.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/archive_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/archive_windows.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/archive_windows.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/diff.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/diff.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/diff.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/diff.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/diff_unix.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/diff_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/diff_unix.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/diff_unix.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/diff_windows.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/diff_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/diff_windows.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/diff_windows.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/init_unix.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/init_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/init_unix.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/init_unix.go diff --git a/vendor/github.com/docker/docker/pkg/chrootarchive/init_windows.go b/vendor/src/github.com/docker/docker/pkg/chrootarchive/init_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/chrootarchive/init_windows.go rename to vendor/src/github.com/docker/docker/pkg/chrootarchive/init_windows.go diff --git a/vendor/github.com/docker/docker/pkg/fileutils/fileutils.go b/vendor/src/github.com/docker/docker/pkg/fileutils/fileutils.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/fileutils/fileutils.go rename to vendor/src/github.com/docker/docker/pkg/fileutils/fileutils.go diff --git a/vendor/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go b/vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go rename to vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go diff --git a/vendor/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go b/vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go rename to vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go diff --git a/vendor/github.com/docker/docker/pkg/fileutils/fileutils_unix.go b/vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/fileutils/fileutils_unix.go rename to vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_unix.go diff --git a/vendor/github.com/docker/docker/pkg/fileutils/fileutils_windows.go b/vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/fileutils/fileutils_windows.go rename to vendor/src/github.com/docker/docker/pkg/fileutils/fileutils_windows.go diff --git a/vendor/github.com/docker/docker/pkg/homedir/homedir.go b/vendor/src/github.com/docker/docker/pkg/homedir/homedir.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/homedir/homedir.go rename to vendor/src/github.com/docker/docker/pkg/homedir/homedir.go diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/vendor/src/github.com/docker/docker/pkg/idtools/idtools.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/idtools/idtools.go rename to vendor/src/github.com/docker/docker/pkg/idtools/idtools.go diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go b/vendor/src/github.com/docker/docker/pkg/idtools/idtools_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go rename to vendor/src/github.com/docker/docker/pkg/idtools/idtools_unix.go diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go b/vendor/src/github.com/docker/docker/pkg/idtools/idtools_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go rename to vendor/src/github.com/docker/docker/pkg/idtools/idtools_windows.go diff --git a/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go b/vendor/src/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go rename to vendor/src/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go diff --git a/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go b/vendor/src/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/buffer.go b/vendor/src/github.com/docker/docker/pkg/ioutils/buffer.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/buffer.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/buffer.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/bytespipe.go b/vendor/src/github.com/docker/docker/pkg/ioutils/bytespipe.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/bytespipe.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/bytespipe.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/fmt.go b/vendor/src/github.com/docker/docker/pkg/ioutils/fmt.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/fmt.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/fmt.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/fswriters.go b/vendor/src/github.com/docker/docker/pkg/ioutils/fswriters.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/fswriters.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/fswriters.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/multireader.go b/vendor/src/github.com/docker/docker/pkg/ioutils/multireader.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/multireader.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/multireader.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/readers.go b/vendor/src/github.com/docker/docker/pkg/ioutils/readers.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/readers.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/readers.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/temp_unix.go b/vendor/src/github.com/docker/docker/pkg/ioutils/temp_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/temp_unix.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/temp_unix.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/temp_windows.go b/vendor/src/github.com/docker/docker/pkg/ioutils/temp_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/temp_windows.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/temp_windows.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/writeflusher.go b/vendor/src/github.com/docker/docker/pkg/ioutils/writeflusher.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/writeflusher.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/writeflusher.go diff --git a/vendor/github.com/docker/docker/pkg/ioutils/writers.go b/vendor/src/github.com/docker/docker/pkg/ioutils/writers.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/ioutils/writers.go rename to vendor/src/github.com/docker/docker/pkg/ioutils/writers.go diff --git a/vendor/github.com/docker/docker/pkg/mount/flags.go b/vendor/src/github.com/docker/docker/pkg/mount/flags.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/flags.go rename to vendor/src/github.com/docker/docker/pkg/mount/flags.go diff --git a/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go b/vendor/src/github.com/docker/docker/pkg/mount/flags_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go rename to vendor/src/github.com/docker/docker/pkg/mount/flags_freebsd.go diff --git a/vendor/github.com/docker/docker/pkg/mount/flags_linux.go b/vendor/src/github.com/docker/docker/pkg/mount/flags_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/flags_linux.go rename to vendor/src/github.com/docker/docker/pkg/mount/flags_linux.go diff --git a/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go b/vendor/src/github.com/docker/docker/pkg/mount/flags_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/mount/flags_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mount.go b/vendor/src/github.com/docker/docker/pkg/mount/mount.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mount.go rename to vendor/src/github.com/docker/docker/pkg/mount/mount.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go b/vendor/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go rename to vendor/src/github.com/docker/docker/pkg/mount/mounter_freebsd.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go b/vendor/src/github.com/docker/docker/pkg/mount/mounter_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mounter_linux.go rename to vendor/src/github.com/docker/docker/pkg/mount/mounter_linux.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mounter_solaris.go b/vendor/src/github.com/docker/docker/pkg/mount/mounter_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mounter_solaris.go rename to vendor/src/github.com/docker/docker/pkg/mount/mounter_solaris.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go b/vendor/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/mount/mounter_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_solaris.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo_solaris.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo_solaris.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/mount/mountinfo_windows.go b/vendor/src/github.com/docker/docker/pkg/mount/mountinfo_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/mountinfo_windows.go rename to vendor/src/github.com/docker/docker/pkg/mount/mountinfo_windows.go diff --git a/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go b/vendor/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go rename to vendor/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/client.go b/vendor/src/github.com/docker/docker/pkg/plugins/client.go new file mode 100644 index 00000000..a778677f --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/client.go @@ -0,0 +1,188 @@ +package plugins + +import ( + "bytes" + "encoding/json" + "io" + "io/ioutil" + "net/http" + "net/url" + "time" + + "github.com/Sirupsen/logrus" + "github.com/docker/docker/pkg/plugins/transport" + "github.com/docker/go-connections/sockets" + "github.com/docker/go-connections/tlsconfig" +) + +const ( + defaultTimeOut = 30 +) + +// NewClient creates a new plugin client (http). +func NewClient(addr string, tlsConfig *tlsconfig.Options) (*Client, error) { + tr := &http.Transport{} + + if tlsConfig != nil { + c, err := tlsconfig.Client(*tlsConfig) + if err != nil { + return nil, err + } + tr.TLSClientConfig = c + } + + u, err := url.Parse(addr) + if err != nil { + return nil, err + } + socket := u.Host + if socket == "" { + // valid local socket addresses have the host empty. + socket = u.Path + } + if err := sockets.ConfigureTransport(tr, u.Scheme, socket); err != nil { + return nil, err + } + scheme := httpScheme(u) + + clientTransport := transport.NewHTTPTransport(tr, scheme, socket) + return NewClientWithTransport(clientTransport), nil +} + +// NewClientWithTransport creates a new plugin client with a given transport. +func NewClientWithTransport(tr transport.Transport) *Client { + return &Client{ + http: &http.Client{ + Transport: tr, + }, + requestFactory: tr, + } +} + +// Client represents a plugin client. +type Client struct { + http *http.Client // http client to use + requestFactory transport.RequestFactory +} + +// Call calls the specified method with the specified arguments for the plugin. +// It will retry for 30 seconds if a failure occurs when calling. +func (c *Client) Call(serviceMethod string, args interface{}, ret interface{}) error { + var buf bytes.Buffer + if args != nil { + if err := json.NewEncoder(&buf).Encode(args); err != nil { + return err + } + } + body, err := c.callWithRetry(serviceMethod, &buf, true) + if err != nil { + return err + } + defer body.Close() + if ret != nil { + if err := json.NewDecoder(body).Decode(&ret); err != nil { + logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err) + return err + } + } + return nil +} + +// Stream calls the specified method with the specified arguments for the plugin and returns the response body +func (c *Client) Stream(serviceMethod string, args interface{}) (io.ReadCloser, error) { + var buf bytes.Buffer + if err := json.NewEncoder(&buf).Encode(args); err != nil { + return nil, err + } + return c.callWithRetry(serviceMethod, &buf, true) +} + +// SendFile calls the specified method, and passes through the IO stream +func (c *Client) SendFile(serviceMethod string, data io.Reader, ret interface{}) error { + body, err := c.callWithRetry(serviceMethod, data, true) + if err != nil { + return err + } + defer body.Close() + if err := json.NewDecoder(body).Decode(&ret); err != nil { + logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err) + return err + } + return nil +} + +func (c *Client) callWithRetry(serviceMethod string, data io.Reader, retry bool) (io.ReadCloser, error) { + req, err := c.requestFactory.NewRequest(serviceMethod, data) + if err != nil { + return nil, err + } + + var retries int + start := time.Now() + + for { + resp, err := c.http.Do(req) + if err != nil { + if !retry { + return nil, err + } + + timeOff := backoff(retries) + if abort(start, timeOff) { + return nil, err + } + retries++ + logrus.Warnf("Unable to connect to plugin: %s%s: %v, retrying in %v", req.URL.Host, req.URL.Path, err, timeOff) + time.Sleep(timeOff) + continue + } + + if resp.StatusCode != http.StatusOK { + b, err := ioutil.ReadAll(resp.Body) + resp.Body.Close() + if err != nil { + return nil, &statusError{resp.StatusCode, serviceMethod, err.Error()} + } + + // Plugins' Response(s) should have an Err field indicating what went + // wrong. Try to unmarshal into ResponseErr. Otherwise fallback to just + // return the string(body) + type responseErr struct { + Err string + } + remoteErr := responseErr{} + if err := json.Unmarshal(b, &remoteErr); err == nil { + if remoteErr.Err != "" { + return nil, &statusError{resp.StatusCode, serviceMethod, remoteErr.Err} + } + } + // old way... + return nil, &statusError{resp.StatusCode, serviceMethod, string(b)} + } + return resp.Body, nil + } +} + +func backoff(retries int) time.Duration { + b, max := 1, defaultTimeOut + for b < max && retries > 0 { + b *= 2 + retries-- + } + if b > max { + b = max + } + return time.Duration(b) * time.Second +} + +func abort(start time.Time, timeOff time.Duration) bool { + return timeOff+time.Since(start) >= time.Duration(defaultTimeOut)*time.Second +} + +func httpScheme(u *url.URL) string { + scheme := u.Scheme + if scheme != "https" { + scheme = "http" + } + return scheme +} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/discovery.go b/vendor/src/github.com/docker/docker/pkg/plugins/discovery.go new file mode 100644 index 00000000..e99581c5 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/discovery.go @@ -0,0 +1,131 @@ +package plugins + +import ( + "encoding/json" + "errors" + "fmt" + "io/ioutil" + "net/url" + "os" + "path/filepath" + "strings" + "sync" +) + +var ( + // ErrNotFound plugin not found + ErrNotFound = errors.New("plugin not found") + socketsPath = "/run/docker/plugins" +) + +// localRegistry defines a registry that is local (using unix socket). +type localRegistry struct{} + +func newLocalRegistry() localRegistry { + return localRegistry{} +} + +// Scan scans all the plugin paths and returns all the names it found +func Scan() ([]string, error) { + var names []string + if err := filepath.Walk(socketsPath, func(path string, fi os.FileInfo, err error) error { + if err != nil { + return nil + } + + if fi.Mode()&os.ModeSocket != 0 { + name := strings.TrimSuffix(fi.Name(), filepath.Ext(fi.Name())) + names = append(names, name) + } + return nil + }); err != nil { + return nil, err + } + + for _, path := range specsPaths { + if err := filepath.Walk(path, func(p string, fi os.FileInfo, err error) error { + if err != nil || fi.IsDir() { + return nil + } + name := strings.TrimSuffix(fi.Name(), filepath.Ext(fi.Name())) + names = append(names, name) + return nil + }); err != nil { + return nil, err + } + } + return names, nil +} + +// Plugin returns the plugin registered with the given name (or returns an error). +func (l *localRegistry) Plugin(name string) (*Plugin, error) { + socketpaths := pluginPaths(socketsPath, name, ".sock") + + for _, p := range socketpaths { + if fi, err := os.Stat(p); err == nil && fi.Mode()&os.ModeSocket != 0 { + return NewLocalPlugin(name, "unix://"+p), nil + } + } + + var txtspecpaths []string + for _, p := range specsPaths { + txtspecpaths = append(txtspecpaths, pluginPaths(p, name, ".spec")...) + txtspecpaths = append(txtspecpaths, pluginPaths(p, name, ".json")...) + } + + for _, p := range txtspecpaths { + if _, err := os.Stat(p); err == nil { + if strings.HasSuffix(p, ".json") { + return readPluginJSONInfo(name, p) + } + return readPluginInfo(name, p) + } + } + return nil, ErrNotFound +} + +func readPluginInfo(name, path string) (*Plugin, error) { + content, err := ioutil.ReadFile(path) + if err != nil { + return nil, err + } + addr := strings.TrimSpace(string(content)) + + u, err := url.Parse(addr) + if err != nil { + return nil, err + } + + if len(u.Scheme) == 0 { + return nil, fmt.Errorf("Unknown protocol") + } + + return NewLocalPlugin(name, addr), nil +} + +func readPluginJSONInfo(name, path string) (*Plugin, error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + defer f.Close() + + var p Plugin + if err := json.NewDecoder(f).Decode(&p); err != nil { + return nil, err + } + p.name = name + if p.TLSConfig != nil && len(p.TLSConfig.CAFile) == 0 { + p.TLSConfig.InsecureSkipVerify = true + } + p.activateWait = sync.NewCond(&sync.Mutex{}) + + return &p, nil +} + +func pluginPaths(base, name, ext string) []string { + return []string{ + filepath.Join(base, name+ext), + filepath.Join(base, name, name+ext), + } +} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/discovery_unix.go b/vendor/src/github.com/docker/docker/pkg/plugins/discovery_unix.go new file mode 100644 index 00000000..693a47e3 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/discovery_unix.go @@ -0,0 +1,5 @@ +// +build !windows + +package plugins + +var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/discovery_windows.go b/vendor/src/github.com/docker/docker/pkg/plugins/discovery_windows.go new file mode 100644 index 00000000..d7c1fe49 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/discovery_windows.go @@ -0,0 +1,8 @@ +package plugins + +import ( + "os" + "path/filepath" +) + +var specsPaths = []string{filepath.Join(os.Getenv("programdata"), "docker", "plugins")} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/errors.go b/vendor/src/github.com/docker/docker/pkg/plugins/errors.go new file mode 100644 index 00000000..79884710 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/errors.go @@ -0,0 +1,33 @@ +package plugins + +import ( + "fmt" + "net/http" +) + +type statusError struct { + status int + method string + err string +} + +// Error returns a formatted string for this error type +func (e *statusError) Error() string { + return fmt.Sprintf("%s: %v", e.method, e.err) +} + +// IsNotFound indicates if the passed in error is from an http.StatusNotFound from the plugin +func IsNotFound(err error) bool { + return isStatusError(err, http.StatusNotFound) +} + +func isStatusError(err error, status int) bool { + if err == nil { + return false + } + e, ok := err.(*statusError) + if !ok { + return false + } + return e.status == status +} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/plugins.go b/vendor/src/github.com/docker/docker/pkg/plugins/plugins.go new file mode 100644 index 00000000..9385b9b1 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/plugins.go @@ -0,0 +1,274 @@ +// Package plugins provides structures and helper functions to manage Docker +// plugins. +// +// Docker discovers plugins by looking for them in the plugin directory whenever +// a user or container tries to use one by name. UNIX domain socket files must +// be located under /run/docker/plugins, whereas spec files can be located +// either under /etc/docker/plugins or /usr/lib/docker/plugins. This is handled +// by the Registry interface, which lets you list all plugins or get a plugin by +// its name if it exists. +// +// The plugins need to implement an HTTP server and bind this to the UNIX socket +// or the address specified in the spec files. +// A handshake is send at /Plugin.Activate, and plugins are expected to return +// a Manifest with a list of of Docker subsystems which this plugin implements. +// +// In order to use a plugins, you can use the ``Get`` with the name of the +// plugin and the subsystem it implements. +// +// plugin, err := plugins.Get("example", "VolumeDriver") +// if err != nil { +// return fmt.Errorf("Error looking up volume plugin example: %v", err) +// } +package plugins + +import ( + "errors" + "sync" + "time" + + "github.com/Sirupsen/logrus" + "github.com/docker/go-connections/tlsconfig" +) + +var ( + // ErrNotImplements is returned if the plugin does not implement the requested driver. + ErrNotImplements = errors.New("Plugin does not implement the requested driver") +) + +type plugins struct { + sync.Mutex + plugins map[string]*Plugin +} + +var ( + storage = plugins{plugins: make(map[string]*Plugin)} + extpointHandlers = make(map[string]func(string, *Client)) +) + +// Manifest lists what a plugin implements. +type Manifest struct { + // List of subsystem the plugin implements. + Implements []string +} + +// Plugin is the definition of a docker plugin. +type Plugin struct { + // Name of the plugin + name string + // Address of the plugin + Addr string + // TLS configuration of the plugin + TLSConfig *tlsconfig.Options + // Client attached to the plugin + client *Client + // Manifest of the plugin (see above) + Manifest *Manifest `json:"-"` + + // error produced by activation + activateErr error + // specifies if the activation sequence is completed (not if it is successful or not) + activated bool + // wait for activation to finish + activateWait *sync.Cond +} + +// Name returns the name of the plugin. +func (p *Plugin) Name() string { + return p.name +} + +// Client returns a ready-to-use plugin client that can be used to communicate with the plugin. +func (p *Plugin) Client() *Client { + return p.client +} + +// IsV1 returns true for V1 plugins and false otherwise. +func (p *Plugin) IsV1() bool { + return true +} + +// NewLocalPlugin creates a new local plugin. +func NewLocalPlugin(name, addr string) *Plugin { + return &Plugin{ + name: name, + Addr: addr, + // TODO: change to nil + TLSConfig: &tlsconfig.Options{InsecureSkipVerify: true}, + activateWait: sync.NewCond(&sync.Mutex{}), + } +} + +func (p *Plugin) activate() error { + p.activateWait.L.Lock() + if p.activated { + p.activateWait.L.Unlock() + return p.activateErr + } + + p.activateErr = p.activateWithLock() + p.activated = true + + p.activateWait.L.Unlock() + p.activateWait.Broadcast() + return p.activateErr +} + +func (p *Plugin) activateWithLock() error { + c, err := NewClient(p.Addr, p.TLSConfig) + if err != nil { + return err + } + p.client = c + + m := new(Manifest) + if err = p.client.Call("Plugin.Activate", nil, m); err != nil { + return err + } + + p.Manifest = m + + for _, iface := range m.Implements { + handler, handled := extpointHandlers[iface] + if !handled { + continue + } + handler(p.name, p.client) + } + return nil +} + +func (p *Plugin) waitActive() error { + p.activateWait.L.Lock() + for !p.activated { + p.activateWait.Wait() + } + p.activateWait.L.Unlock() + return p.activateErr +} + +func (p *Plugin) implements(kind string) bool { + if err := p.waitActive(); err != nil { + return false + } + for _, driver := range p.Manifest.Implements { + if driver == kind { + return true + } + } + return false +} + +func load(name string) (*Plugin, error) { + return loadWithRetry(name, true) +} + +func loadWithRetry(name string, retry bool) (*Plugin, error) { + registry := newLocalRegistry() + start := time.Now() + + var retries int + for { + pl, err := registry.Plugin(name) + if err != nil { + if !retry { + return nil, err + } + + timeOff := backoff(retries) + if abort(start, timeOff) { + return nil, err + } + retries++ + logrus.Warnf("Unable to locate plugin: %s, retrying in %v", name, timeOff) + time.Sleep(timeOff) + continue + } + + storage.Lock() + storage.plugins[name] = pl + storage.Unlock() + + err = pl.activate() + + if err != nil { + storage.Lock() + delete(storage.plugins, name) + storage.Unlock() + } + + return pl, err + } +} + +func get(name string) (*Plugin, error) { + storage.Lock() + pl, ok := storage.plugins[name] + storage.Unlock() + if ok { + return pl, pl.activate() + } + return load(name) +} + +// Get returns the plugin given the specified name and requested implementation. +func Get(name, imp string) (*Plugin, error) { + pl, err := get(name) + if err != nil { + return nil, err + } + if pl.implements(imp) { + logrus.Debugf("%s implements: %s", name, imp) + return pl, nil + } + return nil, ErrNotImplements +} + +// Handle adds the specified function to the extpointHandlers. +func Handle(iface string, fn func(string, *Client)) { + extpointHandlers[iface] = fn +} + +// GetAll returns all the plugins for the specified implementation +func GetAll(imp string) ([]*Plugin, error) { + pluginNames, err := Scan() + if err != nil { + return nil, err + } + + type plLoad struct { + pl *Plugin + err error + } + + chPl := make(chan *plLoad, len(pluginNames)) + var wg sync.WaitGroup + for _, name := range pluginNames { + if pl, ok := storage.plugins[name]; ok { + chPl <- &plLoad{pl, nil} + continue + } + + wg.Add(1) + go func(name string) { + defer wg.Done() + pl, err := loadWithRetry(name, false) + chPl <- &plLoad{pl, err} + }(name) + } + + wg.Wait() + close(chPl) + + var out []*Plugin + for pl := range chPl { + if pl.err != nil { + logrus.Error(pl.err) + continue + } + if pl.pl.implements(imp) { + out = append(out, pl.pl) + } + } + return out, nil +} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/transport/http.go b/vendor/src/github.com/docker/docker/pkg/plugins/transport/http.go new file mode 100644 index 00000000..5be146af --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/transport/http.go @@ -0,0 +1,36 @@ +package transport + +import ( + "io" + "net/http" +) + +// httpTransport holds an http.RoundTripper +// and information about the scheme and address the transport +// sends request to. +type httpTransport struct { + http.RoundTripper + scheme string + addr string +} + +// NewHTTPTransport creates a new httpTransport. +func NewHTTPTransport(r http.RoundTripper, scheme, addr string) Transport { + return httpTransport{ + RoundTripper: r, + scheme: scheme, + addr: addr, + } +} + +// NewRequest creates a new http.Request and sets the URL +// scheme and address with the transport's fields. +func (t httpTransport) NewRequest(path string, data io.Reader) (*http.Request, error) { + req, err := newHTTPRequest(path, data) + if err != nil { + return nil, err + } + req.URL.Scheme = t.scheme + req.URL.Host = t.addr + return req, nil +} diff --git a/vendor/src/github.com/docker/docker/pkg/plugins/transport/transport.go b/vendor/src/github.com/docker/docker/pkg/plugins/transport/transport.go new file mode 100644 index 00000000..d7f1e210 --- /dev/null +++ b/vendor/src/github.com/docker/docker/pkg/plugins/transport/transport.go @@ -0,0 +1,36 @@ +package transport + +import ( + "io" + "net/http" + "strings" +) + +// VersionMimetype is the Content-Type the engine sends to plugins. +const VersionMimetype = "application/vnd.docker.plugins.v1.2+json" + +// RequestFactory defines an interface that +// transports can implement to create new requests. +type RequestFactory interface { + NewRequest(path string, data io.Reader) (*http.Request, error) +} + +// Transport defines an interface that plugin transports +// must implement. +type Transport interface { + http.RoundTripper + RequestFactory +} + +// newHTTPRequest creates a new request with a path and a body. +func newHTTPRequest(path string, data io.Reader) (*http.Request, error) { + if !strings.HasPrefix(path, "/") { + path = "/" + path + } + req, err := http.NewRequest("POST", path, data) + if err != nil { + return nil, err + } + req.Header.Add("Accept", VersionMimetype) + return req, nil +} diff --git a/vendor/github.com/docker/docker/pkg/pools/pools.go b/vendor/src/github.com/docker/docker/pkg/pools/pools.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/pools/pools.go rename to vendor/src/github.com/docker/docker/pkg/pools/pools.go diff --git a/vendor/github.com/docker/docker/pkg/promise/promise.go b/vendor/src/github.com/docker/docker/pkg/promise/promise.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/promise/promise.go rename to vendor/src/github.com/docker/docker/pkg/promise/promise.go diff --git a/vendor/github.com/docker/docker/pkg/random/random.go b/vendor/src/github.com/docker/docker/pkg/random/random.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/random/random.go rename to vendor/src/github.com/docker/docker/pkg/random/random.go diff --git a/vendor/github.com/docker/docker/pkg/reexec/README.md b/vendor/src/github.com/docker/docker/pkg/reexec/README.md similarity index 74% rename from vendor/github.com/docker/docker/pkg/reexec/README.md rename to vendor/src/github.com/docker/docker/pkg/reexec/README.md index 723fee7d..45592ce8 100644 --- a/vendor/github.com/docker/docker/pkg/reexec/README.md +++ b/vendor/src/github.com/docker/docker/pkg/reexec/README.md @@ -1,5 +1,5 @@ ## reexec -The `reexec` package facilitates the busybox style reexec of the docker binary that we require because -of the forking limitations of using Go. Handlers can be registered with a name and the argv 0 of +The `reexec` package facilitates the busybox style reexec of the docker binary that we require because +of the forking limitations of using Go. Handlers can be registered with a name and the argv 0 of the exec of the binary will be used to find and execute custom init paths. diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_linux.go b/vendor/src/github.com/docker/docker/pkg/reexec/command_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/reexec/command_linux.go rename to vendor/src/github.com/docker/docker/pkg/reexec/command_linux.go diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_unix.go b/vendor/src/github.com/docker/docker/pkg/reexec/command_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/reexec/command_unix.go rename to vendor/src/github.com/docker/docker/pkg/reexec/command_unix.go diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go b/vendor/src/github.com/docker/docker/pkg/reexec/command_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/reexec/command_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/reexec/command_windows.go b/vendor/src/github.com/docker/docker/pkg/reexec/command_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/reexec/command_windows.go rename to vendor/src/github.com/docker/docker/pkg/reexec/command_windows.go diff --git a/vendor/github.com/docker/docker/pkg/reexec/reexec.go b/vendor/src/github.com/docker/docker/pkg/reexec/reexec.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/reexec/reexec.go rename to vendor/src/github.com/docker/docker/pkg/reexec/reexec.go diff --git a/vendor/github.com/docker/docker/pkg/registrar/registrar.go b/vendor/src/github.com/docker/docker/pkg/registrar/registrar.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/registrar/registrar.go rename to vendor/src/github.com/docker/docker/pkg/registrar/registrar.go diff --git a/vendor/github.com/docker/docker/pkg/stringid/README.md b/vendor/src/github.com/docker/docker/pkg/stringid/README.md similarity index 100% rename from vendor/github.com/docker/docker/pkg/stringid/README.md rename to vendor/src/github.com/docker/docker/pkg/stringid/README.md diff --git a/vendor/github.com/docker/docker/pkg/stringid/stringid.go b/vendor/src/github.com/docker/docker/pkg/stringid/stringid.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/stringid/stringid.go rename to vendor/src/github.com/docker/docker/pkg/stringid/stringid.go diff --git a/vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE b/vendor/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE similarity index 100% rename from vendor/github.com/docker/docker/pkg/symlink/LICENSE.APACHE rename to vendor/src/github.com/docker/docker/pkg/symlink/LICENSE.APACHE diff --git a/vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD b/vendor/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD similarity index 100% rename from vendor/github.com/docker/docker/pkg/symlink/LICENSE.BSD rename to vendor/src/github.com/docker/docker/pkg/symlink/LICENSE.BSD diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes.go b/vendor/src/github.com/docker/docker/pkg/system/chtimes.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/chtimes.go rename to vendor/src/github.com/docker/docker/pkg/system/chtimes.go diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go b/vendor/src/github.com/docker/docker/pkg/system/chtimes_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/chtimes_unix.go rename to vendor/src/github.com/docker/docker/pkg/system/chtimes_unix.go diff --git a/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go b/vendor/src/github.com/docker/docker/pkg/system/chtimes_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/chtimes_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/chtimes_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/errors.go b/vendor/src/github.com/docker/docker/pkg/system/errors.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/errors.go rename to vendor/src/github.com/docker/docker/pkg/system/errors.go diff --git a/vendor/github.com/docker/docker/pkg/system/events_windows.go b/vendor/src/github.com/docker/docker/pkg/system/events_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/events_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/events_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/filesys.go b/vendor/src/github.com/docker/docker/pkg/system/filesys.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/filesys.go rename to vendor/src/github.com/docker/docker/pkg/system/filesys.go diff --git a/vendor/github.com/docker/docker/pkg/system/filesys_windows.go b/vendor/src/github.com/docker/docker/pkg/system/filesys_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/filesys_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/filesys_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/lstat.go b/vendor/src/github.com/docker/docker/pkg/system/lstat.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/lstat.go rename to vendor/src/github.com/docker/docker/pkg/system/lstat.go diff --git a/vendor/github.com/docker/docker/pkg/system/lstat_windows.go b/vendor/src/github.com/docker/docker/pkg/system/lstat_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/lstat_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/lstat_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo.go b/vendor/src/github.com/docker/docker/pkg/system/meminfo.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/meminfo.go rename to vendor/src/github.com/docker/docker/pkg/system/meminfo.go diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go b/vendor/src/github.com/docker/docker/pkg/system/meminfo_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/meminfo_linux.go rename to vendor/src/github.com/docker/docker/pkg/system/meminfo_linux.go diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go b/vendor/src/github.com/docker/docker/pkg/system/meminfo_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go rename to vendor/src/github.com/docker/docker/pkg/system/meminfo_solaris.go diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/vendor/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go b/vendor/src/github.com/docker/docker/pkg/system/meminfo_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/meminfo_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/meminfo_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/mknod.go b/vendor/src/github.com/docker/docker/pkg/system/mknod.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/mknod.go rename to vendor/src/github.com/docker/docker/pkg/system/mknod.go diff --git a/vendor/github.com/docker/docker/pkg/system/mknod_windows.go b/vendor/src/github.com/docker/docker/pkg/system/mknod_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/mknod_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/mknod_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/path_unix.go b/vendor/src/github.com/docker/docker/pkg/system/path_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/path_unix.go rename to vendor/src/github.com/docker/docker/pkg/system/path_unix.go diff --git a/vendor/github.com/docker/docker/pkg/system/path_windows.go b/vendor/src/github.com/docker/docker/pkg/system/path_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/path_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/path_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat.go b/vendor/src/github.com/docker/docker/pkg/system/stat.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat.go rename to vendor/src/github.com/docker/docker/pkg/system/stat.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_darwin.go b/vendor/src/github.com/docker/docker/pkg/system/stat_darwin.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_darwin.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_darwin.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go b/vendor/src/github.com/docker/docker/pkg/system/stat_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_freebsd.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_freebsd.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/src/github.com/docker/docker/pkg/system/stat_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_linux.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_linux.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go b/vendor/src/github.com/docker/docker/pkg/system/stat_openbsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_openbsd.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_openbsd.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_solaris.go b/vendor/src/github.com/docker/docker/pkg/system/stat_solaris.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_solaris.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_solaris.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_unsupported.go b/vendor/src/github.com/docker/docker/pkg/system/stat_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/system/stat_windows.go b/vendor/src/github.com/docker/docker/pkg/system/stat_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/stat_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/stat_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/syscall_unix.go b/vendor/src/github.com/docker/docker/pkg/system/syscall_unix.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/syscall_unix.go rename to vendor/src/github.com/docker/docker/pkg/system/syscall_unix.go diff --git a/vendor/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/syscall_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/syscall_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/umask.go b/vendor/src/github.com/docker/docker/pkg/system/umask.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/umask.go rename to vendor/src/github.com/docker/docker/pkg/system/umask.go diff --git a/vendor/github.com/docker/docker/pkg/system/umask_windows.go b/vendor/src/github.com/docker/docker/pkg/system/umask_windows.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/umask_windows.go rename to vendor/src/github.com/docker/docker/pkg/system/umask_windows.go diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go b/vendor/src/github.com/docker/docker/pkg/system/utimes_freebsd.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go rename to vendor/src/github.com/docker/docker/pkg/system/utimes_freebsd.go diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_linux.go b/vendor/src/github.com/docker/docker/pkg/system/utimes_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/utimes_linux.go rename to vendor/src/github.com/docker/docker/pkg/system/utimes_linux.go diff --git a/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go b/vendor/src/github.com/docker/docker/pkg/system/utimes_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/system/utimes_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go b/vendor/src/github.com/docker/docker/pkg/system/xattrs_linux.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/xattrs_linux.go rename to vendor/src/github.com/docker/docker/pkg/system/xattrs_linux.go diff --git a/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/vendor/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go rename to vendor/src/github.com/docker/docker/pkg/system/xattrs_unsupported.go diff --git a/vendor/github.com/docker/docker/pkg/truncindex/truncindex.go b/vendor/src/github.com/docker/docker/pkg/truncindex/truncindex.go similarity index 100% rename from vendor/github.com/docker/docker/pkg/truncindex/truncindex.go rename to vendor/src/github.com/docker/docker/pkg/truncindex/truncindex.go diff --git a/vendor/src/github.com/docker/docker/plugin/getter/interface.go b/vendor/src/github.com/docker/docker/plugin/getter/interface.go new file mode 100644 index 00000000..1c1977d3 --- /dev/null +++ b/vendor/src/github.com/docker/docker/plugin/getter/interface.go @@ -0,0 +1,25 @@ +package getter + +import "github.com/docker/docker/pkg/plugins" + +const ( + // LOOKUP doesn't update RefCount + LOOKUP = 0 + // CREATE increments RefCount + CREATE = 1 + // REMOVE decrements RefCount + REMOVE = -1 +) + +// CompatPlugin is a abstraction to handle both v2(new) and v1(legacy) plugins. +type CompatPlugin interface { + Client() *plugins.Client + Name() string + IsV1() bool +} + +// PluginGetter is the interface implemented by Store +type PluginGetter interface { + Get(name, capability string, mode int) (CompatPlugin, error) + GetAllByCap(capability string) ([]CompatPlugin, error) +} diff --git a/vendor/github.com/docker/docker/reference/reference.go b/vendor/src/github.com/docker/docker/reference/reference.go similarity index 100% rename from vendor/github.com/docker/docker/reference/reference.go rename to vendor/src/github.com/docker/docker/reference/reference.go diff --git a/vendor/github.com/docker/docker/reference/store.go b/vendor/src/github.com/docker/docker/reference/store.go similarity index 100% rename from vendor/github.com/docker/docker/reference/store.go rename to vendor/src/github.com/docker/docker/reference/store.go diff --git a/vendor/github.com/docker/go-connections/LICENSE b/vendor/src/github.com/docker/go-connections/LICENSE similarity index 100% rename from vendor/github.com/docker/go-connections/LICENSE rename to vendor/src/github.com/docker/go-connections/LICENSE diff --git a/vendor/github.com/docker/go-connections/nat/nat.go b/vendor/src/github.com/docker/go-connections/nat/nat.go similarity index 100% rename from vendor/github.com/docker/go-connections/nat/nat.go rename to vendor/src/github.com/docker/go-connections/nat/nat.go diff --git a/vendor/github.com/docker/go-connections/nat/parse.go b/vendor/src/github.com/docker/go-connections/nat/parse.go similarity index 100% rename from vendor/github.com/docker/go-connections/nat/parse.go rename to vendor/src/github.com/docker/go-connections/nat/parse.go diff --git a/vendor/github.com/docker/go-connections/nat/sort.go b/vendor/src/github.com/docker/go-connections/nat/sort.go similarity index 100% rename from vendor/github.com/docker/go-connections/nat/sort.go rename to vendor/src/github.com/docker/go-connections/nat/sort.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/README.md b/vendor/src/github.com/docker/go-connections/sockets/README.md new file mode 100644 index 00000000..e69de29b diff --git a/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go new file mode 100644 index 00000000..99846ffd --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go @@ -0,0 +1,81 @@ +package sockets + +import ( + "errors" + "net" + "sync" +) + +var errClosed = errors.New("use of closed network connection") + +// InmemSocket implements net.Listener using in-memory only connections. +type InmemSocket struct { + chConn chan net.Conn + chClose chan struct{} + addr string + mu sync.Mutex +} + +// dummyAddr is used to satisfy net.Addr for the in-mem socket +// it is just stored as a string and returns the string for all calls +type dummyAddr string + +// NewInmemSocket creates an in-memory only net.Listener +// The addr argument can be any string, but is used to satisfy the `Addr()` part +// of the net.Listener interface +func NewInmemSocket(addr string, bufSize int) *InmemSocket { + return &InmemSocket{ + chConn: make(chan net.Conn, bufSize), + chClose: make(chan struct{}), + addr: addr, + } +} + +// Addr returns the socket's addr string to satisfy net.Listener +func (s *InmemSocket) Addr() net.Addr { + return dummyAddr(s.addr) +} + +// Accept implements the Accept method in the Listener interface; it waits for the next call and returns a generic Conn. +func (s *InmemSocket) Accept() (net.Conn, error) { + select { + case conn := <-s.chConn: + return conn, nil + case <-s.chClose: + return nil, errClosed + } +} + +// Close closes the listener. It will be unavailable for use once closed. +func (s *InmemSocket) Close() error { + s.mu.Lock() + defer s.mu.Unlock() + select { + case <-s.chClose: + default: + close(s.chClose) + } + return nil +} + +// Dial is used to establish a connection with the in-mem server +func (s *InmemSocket) Dial(network, addr string) (net.Conn, error) { + srvConn, clientConn := net.Pipe() + select { + case s.chConn <- srvConn: + case <-s.chClose: + return nil, errClosed + } + + return clientConn, nil +} + +// Network returns the addr string, satisfies net.Addr +func (a dummyAddr) Network() string { + return string(a) +} + +// String returns the string form +func (a dummyAddr) String() string { + return string(a) +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/proxy.go b/vendor/src/github.com/docker/go-connections/sockets/proxy.go new file mode 100644 index 00000000..98e9a1dc --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/proxy.go @@ -0,0 +1,51 @@ +package sockets + +import ( + "net" + "net/url" + "os" + "strings" + + "golang.org/x/net/proxy" +) + +// GetProxyEnv allows access to the uppercase and the lowercase forms of +// proxy-related variables. See the Go specification for details on these +// variables. https://golang.org/pkg/net/http/ +func GetProxyEnv(key string) string { + proxyValue := os.Getenv(strings.ToUpper(key)) + if proxyValue == "" { + return os.Getenv(strings.ToLower(key)) + } + return proxyValue +} + +// DialerFromEnvironment takes in a "direct" *net.Dialer and returns a +// proxy.Dialer which will route the connections through the proxy using the +// given dialer. +func DialerFromEnvironment(direct *net.Dialer) (proxy.Dialer, error) { + allProxy := GetProxyEnv("all_proxy") + if len(allProxy) == 0 { + return direct, nil + } + + proxyURL, err := url.Parse(allProxy) + if err != nil { + return direct, err + } + + proxyFromURL, err := proxy.FromURL(proxyURL, direct) + if err != nil { + return direct, err + } + + noProxy := GetProxyEnv("no_proxy") + if len(noProxy) == 0 { + return proxyFromURL, nil + } + + perHost := proxy.NewPerHost(proxyFromURL, direct) + perHost.AddFromString(noProxy) + + return perHost, nil +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets.go b/vendor/src/github.com/docker/go-connections/sockets/sockets.go new file mode 100644 index 00000000..1739cecf --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/sockets.go @@ -0,0 +1,42 @@ +// Package sockets provides helper functions to create and configure Unix or TCP sockets. +package sockets + +import ( + "net" + "net/http" + "time" +) + +// Why 32? See https://github.com/docker/docker/pull/8035. +const defaultTimeout = 32 * time.Second + +// ConfigureTransport configures the specified Transport according to the +// specified proto and addr. +// If the proto is unix (using a unix socket to communicate) or npipe the +// compression is disabled. +func ConfigureTransport(tr *http.Transport, proto, addr string) error { + switch proto { + case "unix": + // No need for compression in local communications. + tr.DisableCompression = true + tr.Dial = func(_, _ string) (net.Conn, error) { + return net.DialTimeout(proto, addr, defaultTimeout) + } + case "npipe": + // No need for compression in local communications. + tr.DisableCompression = true + tr.Dial = func(_, _ string) (net.Conn, error) { + return DialPipe(addr, defaultTimeout) + } + default: + tr.Proxy = http.ProxyFromEnvironment + dialer, err := DialerFromEnvironment(&net.Dialer{ + Timeout: defaultTimeout, + }) + if err != nil { + return err + } + tr.Dial = dialer.Dial + } + return nil +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go new file mode 100644 index 00000000..b255ac9a --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go @@ -0,0 +1,15 @@ +// +build !windows + +package sockets + +import ( + "net" + "syscall" + "time" +) + +// DialPipe connects to a Windows named pipe. +// This is not supported on other OSes. +func DialPipe(_ string, _ time.Duration) (net.Conn, error) { + return nil, syscall.EAFNOSUPPORT +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go new file mode 100644 index 00000000..1f3540b2 --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go @@ -0,0 +1,13 @@ +package sockets + +import ( + "net" + "time" + + "github.com/Microsoft/go-winio" +) + +// DialPipe connects to a Windows named pipe. +func DialPipe(addr string, timeout time.Duration) (net.Conn, error) { + return winio.DialPipe(addr, &timeout) +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go new file mode 100644 index 00000000..8a82727d --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go @@ -0,0 +1,22 @@ +// Package sockets provides helper functions to create and configure Unix or TCP sockets. +package sockets + +import ( + "crypto/tls" + "net" +) + +// NewTCPSocket creates a TCP socket listener with the specified address and +// and the specified tls configuration. If TLSConfig is set, will encapsulate the +// TCP listener inside a TLS one. +func NewTCPSocket(addr string, tlsConfig *tls.Config) (net.Listener, error) { + l, err := net.Listen("tcp", addr) + if err != nil { + return nil, err + } + if tlsConfig != nil { + tlsConfig.NextProtos = []string{"http/1.1"} + l = tls.NewListener(l, tlsConfig) + } + return l, nil +} diff --git a/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go new file mode 100644 index 00000000..d1627349 --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go @@ -0,0 +1,80 @@ +// +build linux freebsd solaris + +package sockets + +import ( + "fmt" + "net" + "os" + "strconv" + "syscall" + + "github.com/Sirupsen/logrus" + "github.com/opencontainers/runc/libcontainer/user" +) + +// NewUnixSocket creates a unix socket with the specified path and group. +func NewUnixSocket(path, group string) (net.Listener, error) { + if err := syscall.Unlink(path); err != nil && !os.IsNotExist(err) { + return nil, err + } + mask := syscall.Umask(0777) + defer syscall.Umask(mask) + l, err := net.Listen("unix", path) + if err != nil { + return nil, err + } + if err := setSocketGroup(path, group); err != nil { + l.Close() + return nil, err + } + if err := os.Chmod(path, 0660); err != nil { + l.Close() + return nil, err + } + return l, nil +} + +func setSocketGroup(path, group string) error { + if group == "" { + return nil + } + if err := changeGroup(path, group); err != nil { + if group != "docker" { + return err + } + logrus.Debugf("Warning: could not change group %s to docker: %v", path, err) + } + return nil +} + +func changeGroup(path string, nameOrGid string) error { + gid, err := lookupGidByName(nameOrGid) + if err != nil { + return err + } + logrus.Debugf("%s group found. gid: %d", nameOrGid, gid) + return os.Chown(path, 0, gid) +} + +func lookupGidByName(nameOrGid string) (int, error) { + groupFile, err := user.GetGroupPath() + if err != nil { + return -1, err + } + groups, err := user.ParseGroupFileFilter(groupFile, func(g user.Group) bool { + return g.Name == nameOrGid || strconv.Itoa(g.Gid) == nameOrGid + }) + if err != nil { + return -1, err + } + if groups != nil && len(groups) > 0 { + return groups[0].Gid, nil + } + gid, err := strconv.Atoi(nameOrGid) + if err == nil { + logrus.Warnf("Could not find GID %d", gid) + return gid, nil + } + return -1, fmt.Errorf("Group %s not found", nameOrGid) +} diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config.go b/vendor/src/github.com/docker/go-connections/tlsconfig/config.go new file mode 100644 index 00000000..2cd50a62 --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/tlsconfig/config.go @@ -0,0 +1,126 @@ +// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers. +// +// As a reminder from https://golang.org/pkg/crypto/tls/#Config: +// A Config structure is used to configure a TLS client or server. After one has been passed to a TLS function it must not be modified. +// A Config may be reused; the tls package will also not modify it. +package tlsconfig + +import ( + "crypto/tls" + "crypto/x509" + "fmt" + "io/ioutil" + "os" + + "github.com/Sirupsen/logrus" +) + +// Options represents the information needed to create client and server TLS configurations. +type Options struct { + CAFile string + + // If either CertFile or KeyFile is empty, Client() will not load them + // preventing the client from authenticating to the server. + // However, Server() requires them and will error out if they are empty. + CertFile string + KeyFile string + + // client-only option + InsecureSkipVerify bool + // server-only option + ClientAuth tls.ClientAuthType +} + +// Extra (server-side) accepted CBC cipher suites - will phase out in the future +var acceptedCBCCiphers = []uint16{ + tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, + tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, + tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, + tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, + tls.TLS_RSA_WITH_AES_256_CBC_SHA, + tls.TLS_RSA_WITH_AES_128_CBC_SHA, +} + +// DefaultServerAcceptedCiphers should be uses by code which already has a crypto/tls +// options struct but wants to use a commonly accepted set of TLS cipher suites, with +// known weak algorithms removed. +var DefaultServerAcceptedCiphers = append(clientCipherSuites, acceptedCBCCiphers...) + +// ServerDefault returns a secure-enough TLS configuration for the server TLS configuration. +func ServerDefault() *tls.Config { + return &tls.Config{ + // Avoid fallback to SSL protocols < TLS1.0 + MinVersion: tls.VersionTLS10, + PreferServerCipherSuites: true, + CipherSuites: DefaultServerAcceptedCiphers, + } +} + +// ClientDefault returns a secure-enough TLS configuration for the client TLS configuration. +func ClientDefault() *tls.Config { + return &tls.Config{ + // Prefer TLS1.2 as the client minimum + MinVersion: tls.VersionTLS12, + CipherSuites: clientCipherSuites, + } +} + +// certPool returns an X.509 certificate pool from `caFile`, the certificate file. +func certPool(caFile string) (*x509.CertPool, error) { + // If we should verify the server, we need to load a trusted ca + certPool := x509.NewCertPool() + pem, err := ioutil.ReadFile(caFile) + if err != nil { + return nil, fmt.Errorf("Could not read CA certificate %q: %v", caFile, err) + } + if !certPool.AppendCertsFromPEM(pem) { + return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile) + } + logrus.Debugf("Trusting %d certs", len(certPool.Subjects())) + return certPool, nil +} + +// Client returns a TLS configuration meant to be used by a client. +func Client(options Options) (*tls.Config, error) { + tlsConfig := ClientDefault() + tlsConfig.InsecureSkipVerify = options.InsecureSkipVerify + if !options.InsecureSkipVerify && options.CAFile != "" { + CAs, err := certPool(options.CAFile) + if err != nil { + return nil, err + } + tlsConfig.RootCAs = CAs + } + + if options.CertFile != "" || options.KeyFile != "" { + tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile) + if err != nil { + return nil, fmt.Errorf("Could not load X509 key pair: %v. Make sure the key is not encrypted", err) + } + tlsConfig.Certificates = []tls.Certificate{tlsCert} + } + + return tlsConfig, nil +} + +// Server returns a TLS configuration meant to be used by a server. +func Server(options Options) (*tls.Config, error) { + tlsConfig := ServerDefault() + tlsConfig.ClientAuth = options.ClientAuth + tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile) + if err != nil { + if os.IsNotExist(err) { + return nil, fmt.Errorf("Could not load X509 key pair (cert: %q, key: %q): %v", options.CertFile, options.KeyFile, err) + } + return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err) + } + tlsConfig.Certificates = []tls.Certificate{tlsCert} + if options.ClientAuth >= tls.VerifyClientCertIfGiven { + CAs, err := certPool(options.CAFile) + if err != nil { + return nil, err + } + tlsConfig.ClientCAs = CAs + } + return tlsConfig, nil +} diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go new file mode 100644 index 00000000..6b4c6a7c --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go @@ -0,0 +1,17 @@ +// +build go1.5 + +// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers. +// +package tlsconfig + +import ( + "crypto/tls" +) + +// Client TLS cipher suites (dropping CBC ciphers for client preferred suite set) +var clientCipherSuites = []uint16{ + tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, +} diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go b/vendor/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go new file mode 100644 index 00000000..ee22df47 --- /dev/null +++ b/vendor/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go @@ -0,0 +1,15 @@ +// +build !go1.5 + +// Package tlsconfig provides primitives to retrieve secure-enough TLS configurations for both clients and servers. +// +package tlsconfig + +import ( + "crypto/tls" +) + +// Client TLS cipher suites (dropping CBC ciphers for client preferred suite set) +var clientCipherSuites = []uint16{ + tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, +} diff --git a/vendor/github.com/docker/go-units/CONTRIBUTING.md b/vendor/src/github.com/docker/go-units/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/docker/go-units/CONTRIBUTING.md rename to vendor/src/github.com/docker/go-units/CONTRIBUTING.md diff --git a/vendor/github.com/docker/go-units/LICENSE b/vendor/src/github.com/docker/go-units/LICENSE similarity index 100% rename from vendor/github.com/docker/go-units/LICENSE rename to vendor/src/github.com/docker/go-units/LICENSE diff --git a/vendor/github.com/docker/go-units/MAINTAINERS b/vendor/src/github.com/docker/go-units/MAINTAINERS similarity index 100% rename from vendor/github.com/docker/go-units/MAINTAINERS rename to vendor/src/github.com/docker/go-units/MAINTAINERS diff --git a/vendor/github.com/docker/go-units/README.md b/vendor/src/github.com/docker/go-units/README.md similarity index 100% rename from vendor/github.com/docker/go-units/README.md rename to vendor/src/github.com/docker/go-units/README.md diff --git a/vendor/github.com/docker/go-units/circle.yml b/vendor/src/github.com/docker/go-units/circle.yml similarity index 100% rename from vendor/github.com/docker/go-units/circle.yml rename to vendor/src/github.com/docker/go-units/circle.yml diff --git a/vendor/github.com/docker/go-units/duration.go b/vendor/src/github.com/docker/go-units/duration.go similarity index 100% rename from vendor/github.com/docker/go-units/duration.go rename to vendor/src/github.com/docker/go-units/duration.go diff --git a/vendor/github.com/docker/go-units/size.go b/vendor/src/github.com/docker/go-units/size.go similarity index 100% rename from vendor/github.com/docker/go-units/size.go rename to vendor/src/github.com/docker/go-units/size.go diff --git a/vendor/github.com/docker/go-units/ulimit.go b/vendor/src/github.com/docker/go-units/ulimit.go similarity index 100% rename from vendor/github.com/docker/go-units/ulimit.go rename to vendor/src/github.com/docker/go-units/ulimit.go diff --git a/vendor/github.com/docker/libtrust/CONTRIBUTING.md b/vendor/src/github.com/docker/libtrust/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/docker/libtrust/CONTRIBUTING.md rename to vendor/src/github.com/docker/libtrust/CONTRIBUTING.md diff --git a/vendor/github.com/docker/libtrust/LICENSE b/vendor/src/github.com/docker/libtrust/LICENSE similarity index 100% rename from vendor/github.com/docker/libtrust/LICENSE rename to vendor/src/github.com/docker/libtrust/LICENSE diff --git a/vendor/github.com/docker/libtrust/MAINTAINERS b/vendor/src/github.com/docker/libtrust/MAINTAINERS similarity index 100% rename from vendor/github.com/docker/libtrust/MAINTAINERS rename to vendor/src/github.com/docker/libtrust/MAINTAINERS diff --git a/vendor/github.com/docker/libtrust/README.md b/vendor/src/github.com/docker/libtrust/README.md similarity index 99% rename from vendor/github.com/docker/libtrust/README.md rename to vendor/src/github.com/docker/libtrust/README.md index 11ede4dd..8e7db381 100644 --- a/vendor/github.com/docker/libtrust/README.md +++ b/vendor/src/github.com/docker/libtrust/README.md @@ -15,3 +15,4 @@ Trust servers are used as the authorities of the trust graph and allow caching p Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license. Docs released under Creative commons. + diff --git a/vendor/github.com/docker/libtrust/certificates.go b/vendor/src/github.com/docker/libtrust/certificates.go similarity index 100% rename from vendor/github.com/docker/libtrust/certificates.go rename to vendor/src/github.com/docker/libtrust/certificates.go diff --git a/vendor/github.com/docker/libtrust/doc.go b/vendor/src/github.com/docker/libtrust/doc.go similarity index 100% rename from vendor/github.com/docker/libtrust/doc.go rename to vendor/src/github.com/docker/libtrust/doc.go diff --git a/vendor/github.com/docker/libtrust/ec_key.go b/vendor/src/github.com/docker/libtrust/ec_key.go similarity index 100% rename from vendor/github.com/docker/libtrust/ec_key.go rename to vendor/src/github.com/docker/libtrust/ec_key.go diff --git a/vendor/github.com/docker/libtrust/filter.go b/vendor/src/github.com/docker/libtrust/filter.go similarity index 100% rename from vendor/github.com/docker/libtrust/filter.go rename to vendor/src/github.com/docker/libtrust/filter.go diff --git a/vendor/github.com/docker/libtrust/hash.go b/vendor/src/github.com/docker/libtrust/hash.go similarity index 100% rename from vendor/github.com/docker/libtrust/hash.go rename to vendor/src/github.com/docker/libtrust/hash.go diff --git a/vendor/github.com/docker/libtrust/jsonsign.go b/vendor/src/github.com/docker/libtrust/jsonsign.go similarity index 100% rename from vendor/github.com/docker/libtrust/jsonsign.go rename to vendor/src/github.com/docker/libtrust/jsonsign.go diff --git a/vendor/github.com/docker/libtrust/key.go b/vendor/src/github.com/docker/libtrust/key.go similarity index 100% rename from vendor/github.com/docker/libtrust/key.go rename to vendor/src/github.com/docker/libtrust/key.go diff --git a/vendor/github.com/docker/libtrust/key_files.go b/vendor/src/github.com/docker/libtrust/key_files.go similarity index 100% rename from vendor/github.com/docker/libtrust/key_files.go rename to vendor/src/github.com/docker/libtrust/key_files.go diff --git a/vendor/github.com/docker/libtrust/key_manager.go b/vendor/src/github.com/docker/libtrust/key_manager.go similarity index 100% rename from vendor/github.com/docker/libtrust/key_manager.go rename to vendor/src/github.com/docker/libtrust/key_manager.go diff --git a/vendor/github.com/docker/libtrust/rsa_key.go b/vendor/src/github.com/docker/libtrust/rsa_key.go similarity index 100% rename from vendor/github.com/docker/libtrust/rsa_key.go rename to vendor/src/github.com/docker/libtrust/rsa_key.go diff --git a/vendor/github.com/docker/libtrust/util.go b/vendor/src/github.com/docker/libtrust/util.go similarity index 100% rename from vendor/github.com/docker/libtrust/util.go rename to vendor/src/github.com/docker/libtrust/util.go diff --git a/vendor/github.com/ghodss/yaml/.gitignore b/vendor/src/github.com/ghodss/yaml/.gitignore similarity index 100% rename from vendor/github.com/ghodss/yaml/.gitignore rename to vendor/src/github.com/ghodss/yaml/.gitignore diff --git a/vendor/github.com/ghodss/yaml/.travis.yml b/vendor/src/github.com/ghodss/yaml/.travis.yml similarity index 100% rename from vendor/github.com/ghodss/yaml/.travis.yml rename to vendor/src/github.com/ghodss/yaml/.travis.yml diff --git a/vendor/github.com/ghodss/yaml/LICENSE b/vendor/src/github.com/ghodss/yaml/LICENSE similarity index 100% rename from vendor/github.com/ghodss/yaml/LICENSE rename to vendor/src/github.com/ghodss/yaml/LICENSE diff --git a/vendor/github.com/ghodss/yaml/README.md b/vendor/src/github.com/ghodss/yaml/README.md similarity index 99% rename from vendor/github.com/ghodss/yaml/README.md rename to vendor/src/github.com/ghodss/yaml/README.md index be0542ec..f8f7e369 100644 --- a/vendor/github.com/ghodss/yaml/README.md +++ b/vendor/src/github.com/ghodss/yaml/README.md @@ -4,7 +4,7 @@ ## Introduction -A wrapper around [go-yaml](https://github.com/go-yaml/yaml) designed to enable a better way of handling YAML when marshaling to and from structs. +A wrapper around [go-yaml](https://github.com/go-yaml/yaml) designed to enable a better way of handling YAML when marshaling to and from structs. In short, this library first converts YAML to JSON using go-yaml and then uses `json.Marshal` and `json.Unmarshal` to convert to or from the struct. This means that it effectively reuses the JSON struct tags as well as the custom JSON methods `MarshalJSON` and `UnmarshalJSON` unlike go-yaml. For a detailed overview of the rationale behind this method, [see this blog post](http://ghodss.com/2014/the-right-way-to-handle-yaml-in-golang/). diff --git a/vendor/github.com/ghodss/yaml/fields.go b/vendor/src/github.com/ghodss/yaml/fields.go similarity index 100% rename from vendor/github.com/ghodss/yaml/fields.go rename to vendor/src/github.com/ghodss/yaml/fields.go diff --git a/vendor/github.com/ghodss/yaml/yaml.go b/vendor/src/github.com/ghodss/yaml/yaml.go similarity index 100% rename from vendor/github.com/ghodss/yaml/yaml.go rename to vendor/src/github.com/ghodss/yaml/yaml.go diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE b/vendor/src/github.com/gogo/protobuf/LICENSE similarity index 99% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE rename to vendor/src/github.com/gogo/protobuf/LICENSE index 844aa54d..335e38e1 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE +++ b/vendor/src/github.com/gogo/protobuf/LICENSE @@ -33,3 +33,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/vendor/github.com/gogo/protobuf/proto/Makefile b/vendor/src/github.com/gogo/protobuf/proto/Makefile similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/Makefile rename to vendor/src/github.com/gogo/protobuf/proto/Makefile diff --git a/vendor/github.com/gogo/protobuf/proto/clone.go b/vendor/src/github.com/gogo/protobuf/proto/clone.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/clone.go rename to vendor/src/github.com/gogo/protobuf/proto/clone.go diff --git a/vendor/github.com/gogo/protobuf/proto/decode.go b/vendor/src/github.com/gogo/protobuf/proto/decode.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/decode.go rename to vendor/src/github.com/gogo/protobuf/proto/decode.go diff --git a/vendor/github.com/gogo/protobuf/proto/decode_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/decode_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/decode_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/decode_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/encode.go b/vendor/src/github.com/gogo/protobuf/proto/encode.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/encode.go rename to vendor/src/github.com/gogo/protobuf/proto/encode.go diff --git a/vendor/github.com/gogo/protobuf/proto/encode_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/encode_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/encode_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/encode_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/equal.go b/vendor/src/github.com/gogo/protobuf/proto/equal.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/equal.go rename to vendor/src/github.com/gogo/protobuf/proto/equal.go diff --git a/vendor/github.com/gogo/protobuf/proto/extensions.go b/vendor/src/github.com/gogo/protobuf/proto/extensions.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/extensions.go rename to vendor/src/github.com/gogo/protobuf/proto/extensions.go diff --git a/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/extensions_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/extensions_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/extensions_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/lib.go b/vendor/src/github.com/gogo/protobuf/proto/lib.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/lib.go rename to vendor/src/github.com/gogo/protobuf/proto/lib.go diff --git a/vendor/github.com/gogo/protobuf/proto/lib_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/lib_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/lib_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/lib_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/message_set.go b/vendor/src/github.com/gogo/protobuf/proto/message_set.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/message_set.go rename to vendor/src/github.com/gogo/protobuf/proto/message_set.go diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go b/vendor/src/github.com/gogo/protobuf/proto/pointer_reflect.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/pointer_reflect.go rename to vendor/src/github.com/gogo/protobuf/proto/pointer_reflect.go diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go b/vendor/src/github.com/gogo/protobuf/proto/pointer_unsafe.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go rename to vendor/src/github.com/gogo/protobuf/proto/pointer_unsafe.go diff --git a/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/src/github.com/gogo/protobuf/proto/properties.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/properties.go rename to vendor/src/github.com/gogo/protobuf/proto/properties.go diff --git a/vendor/github.com/gogo/protobuf/proto/properties_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/properties_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/properties_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/properties_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/skip_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/skip_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/skip_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/skip_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/text.go b/vendor/src/github.com/gogo/protobuf/proto/text.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/text.go rename to vendor/src/github.com/gogo/protobuf/proto/text.go diff --git a/vendor/github.com/gogo/protobuf/proto/text_gogo.go b/vendor/src/github.com/gogo/protobuf/proto/text_gogo.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/text_gogo.go rename to vendor/src/github.com/gogo/protobuf/proto/text_gogo.go diff --git a/vendor/github.com/gogo/protobuf/proto/text_parser.go b/vendor/src/github.com/gogo/protobuf/proto/text_parser.go similarity index 100% rename from vendor/github.com/gogo/protobuf/proto/text_parser.go rename to vendor/src/github.com/gogo/protobuf/proto/text_parser.go diff --git a/vendor/github.com/golang/glog/LICENSE b/vendor/src/github.com/golang/glog/LICENSE similarity index 100% rename from vendor/github.com/golang/glog/LICENSE rename to vendor/src/github.com/golang/glog/LICENSE diff --git a/vendor/github.com/golang/glog/README b/vendor/src/github.com/golang/glog/README similarity index 99% rename from vendor/github.com/golang/glog/README rename to vendor/src/github.com/golang/glog/README index c7b1e60c..5f9c1148 100644 --- a/vendor/github.com/golang/glog/README +++ b/vendor/src/github.com/golang/glog/README @@ -19,20 +19,20 @@ The comment from glog.go introduces the ideas: Error, Fatal, plus formatting variants such as Infof. It also provides V-style logging controlled by the -v and -vmodule=file=2 flags. - + Basic examples: - + glog.Info("Prepare to repel boarders") - + glog.Fatalf("Initialization failed: %s", err) - + See the documentation for the V function for an explanation of these examples: - + if glog.V(2) { glog.Info("Starting transaction...") } - + glog.V(2).Infoln("Processed", nItems, "elements") diff --git a/vendor/github.com/golang/glog/glog.go b/vendor/src/github.com/golang/glog/glog.go similarity index 100% rename from vendor/github.com/golang/glog/glog.go rename to vendor/src/github.com/golang/glog/glog.go diff --git a/vendor/github.com/golang/glog/glog_file.go b/vendor/src/github.com/golang/glog/glog_file.go similarity index 100% rename from vendor/github.com/golang/glog/glog_file.go rename to vendor/src/github.com/golang/glog/glog_file.go diff --git a/vendor/github.com/golang/protobuf/LICENSE b/vendor/src/github.com/golang/protobuf/LICENSE similarity index 99% rename from vendor/github.com/golang/protobuf/LICENSE rename to vendor/src/github.com/golang/protobuf/LICENSE index 98805ae1..1b1b1921 100644 --- a/vendor/github.com/golang/protobuf/LICENSE +++ b/vendor/src/github.com/golang/protobuf/LICENSE @@ -28,3 +28,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/vendor/github.com/golang/protobuf/proto/Makefile b/vendor/src/github.com/golang/protobuf/proto/Makefile similarity index 100% rename from vendor/github.com/golang/protobuf/proto/Makefile rename to vendor/src/github.com/golang/protobuf/proto/Makefile diff --git a/vendor/github.com/golang/protobuf/proto/clone.go b/vendor/src/github.com/golang/protobuf/proto/clone.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/clone.go rename to vendor/src/github.com/golang/protobuf/proto/clone.go diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/src/github.com/golang/protobuf/proto/decode.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/decode.go rename to vendor/src/github.com/golang/protobuf/proto/decode.go diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/src/github.com/golang/protobuf/proto/encode.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/encode.go rename to vendor/src/github.com/golang/protobuf/proto/encode.go diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/src/github.com/golang/protobuf/proto/equal.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/equal.go rename to vendor/src/github.com/golang/protobuf/proto/equal.go diff --git a/vendor/github.com/golang/protobuf/proto/extensions.go b/vendor/src/github.com/golang/protobuf/proto/extensions.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/extensions.go rename to vendor/src/github.com/golang/protobuf/proto/extensions.go diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/src/github.com/golang/protobuf/proto/lib.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/lib.go rename to vendor/src/github.com/golang/protobuf/proto/lib.go diff --git a/vendor/github.com/golang/protobuf/proto/message_set.go b/vendor/src/github.com/golang/protobuf/proto/message_set.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/message_set.go rename to vendor/src/github.com/golang/protobuf/proto/message_set.go diff --git a/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/vendor/src/github.com/golang/protobuf/proto/pointer_reflect.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/pointer_reflect.go rename to vendor/src/github.com/golang/protobuf/proto/pointer_reflect.go diff --git a/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/vendor/src/github.com/golang/protobuf/proto/pointer_unsafe.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/pointer_unsafe.go rename to vendor/src/github.com/golang/protobuf/proto/pointer_unsafe.go diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/src/github.com/golang/protobuf/proto/properties.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/properties.go rename to vendor/src/github.com/golang/protobuf/proto/properties.go diff --git a/vendor/github.com/golang/protobuf/proto/text.go b/vendor/src/github.com/golang/protobuf/proto/text.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/text.go rename to vendor/src/github.com/golang/protobuf/proto/text.go diff --git a/vendor/github.com/golang/protobuf/proto/text_parser.go b/vendor/src/github.com/golang/protobuf/proto/text_parser.go similarity index 100% rename from vendor/github.com/golang/protobuf/proto/text_parser.go rename to vendor/src/github.com/golang/protobuf/proto/text_parser.go diff --git a/vendor/github.com/gorilla/context/.travis.yml b/vendor/src/github.com/gorilla/context/.travis.yml similarity index 100% rename from vendor/github.com/gorilla/context/.travis.yml rename to vendor/src/github.com/gorilla/context/.travis.yml diff --git a/vendor/github.com/gorilla/context/LICENSE b/vendor/src/github.com/gorilla/context/LICENSE similarity index 100% rename from vendor/github.com/gorilla/context/LICENSE rename to vendor/src/github.com/gorilla/context/LICENSE diff --git a/vendor/github.com/gorilla/context/README.md b/vendor/src/github.com/gorilla/context/README.md similarity index 100% rename from vendor/github.com/gorilla/context/README.md rename to vendor/src/github.com/gorilla/context/README.md diff --git a/vendor/github.com/gorilla/context/context.go b/vendor/src/github.com/gorilla/context/context.go similarity index 100% rename from vendor/github.com/gorilla/context/context.go rename to vendor/src/github.com/gorilla/context/context.go diff --git a/vendor/github.com/gorilla/context/doc.go b/vendor/src/github.com/gorilla/context/doc.go similarity index 100% rename from vendor/github.com/gorilla/context/doc.go rename to vendor/src/github.com/gorilla/context/doc.go diff --git a/vendor/github.com/gorilla/mux/.travis.yml b/vendor/src/github.com/gorilla/mux/.travis.yml similarity index 100% rename from vendor/github.com/gorilla/mux/.travis.yml rename to vendor/src/github.com/gorilla/mux/.travis.yml diff --git a/vendor/github.com/gorilla/mux/LICENSE b/vendor/src/github.com/gorilla/mux/LICENSE similarity index 100% rename from vendor/github.com/gorilla/mux/LICENSE rename to vendor/src/github.com/gorilla/mux/LICENSE diff --git a/vendor/github.com/gorilla/mux/README.md b/vendor/src/github.com/gorilla/mux/README.md similarity index 100% rename from vendor/github.com/gorilla/mux/README.md rename to vendor/src/github.com/gorilla/mux/README.md diff --git a/vendor/github.com/gorilla/mux/doc.go b/vendor/src/github.com/gorilla/mux/doc.go similarity index 100% rename from vendor/github.com/gorilla/mux/doc.go rename to vendor/src/github.com/gorilla/mux/doc.go diff --git a/vendor/github.com/gorilla/mux/mux.go b/vendor/src/github.com/gorilla/mux/mux.go similarity index 100% rename from vendor/github.com/gorilla/mux/mux.go rename to vendor/src/github.com/gorilla/mux/mux.go diff --git a/vendor/github.com/gorilla/mux/regexp.go b/vendor/src/github.com/gorilla/mux/regexp.go similarity index 100% rename from vendor/github.com/gorilla/mux/regexp.go rename to vendor/src/github.com/gorilla/mux/regexp.go diff --git a/vendor/github.com/gorilla/mux/route.go b/vendor/src/github.com/gorilla/mux/route.go similarity index 100% rename from vendor/github.com/gorilla/mux/route.go rename to vendor/src/github.com/gorilla/mux/route.go diff --git a/vendor/github.com/imdario/mergo/.travis.yml b/vendor/src/github.com/imdario/mergo/.travis.yml similarity index 100% rename from vendor/github.com/imdario/mergo/.travis.yml rename to vendor/src/github.com/imdario/mergo/.travis.yml diff --git a/vendor/github.com/imdario/mergo/LICENSE b/vendor/src/github.com/imdario/mergo/LICENSE similarity index 100% rename from vendor/github.com/imdario/mergo/LICENSE rename to vendor/src/github.com/imdario/mergo/LICENSE diff --git a/vendor/github.com/imdario/mergo/README.md b/vendor/src/github.com/imdario/mergo/README.md similarity index 100% rename from vendor/github.com/imdario/mergo/README.md rename to vendor/src/github.com/imdario/mergo/README.md diff --git a/vendor/github.com/imdario/mergo/doc.go b/vendor/src/github.com/imdario/mergo/doc.go similarity index 100% rename from vendor/github.com/imdario/mergo/doc.go rename to vendor/src/github.com/imdario/mergo/doc.go diff --git a/vendor/github.com/imdario/mergo/map.go b/vendor/src/github.com/imdario/mergo/map.go similarity index 100% rename from vendor/github.com/imdario/mergo/map.go rename to vendor/src/github.com/imdario/mergo/map.go diff --git a/vendor/github.com/imdario/mergo/merge.go b/vendor/src/github.com/imdario/mergo/merge.go similarity index 100% rename from vendor/github.com/imdario/mergo/merge.go rename to vendor/src/github.com/imdario/mergo/merge.go diff --git a/vendor/github.com/imdario/mergo/mergo.go b/vendor/src/github.com/imdario/mergo/mergo.go similarity index 100% rename from vendor/github.com/imdario/mergo/mergo.go rename to vendor/src/github.com/imdario/mergo/mergo.go diff --git a/vendor/github.com/opencontainers/image-spec/LICENSE b/vendor/src/github.com/opencontainers/image-spec/LICENSE similarity index 100% rename from vendor/github.com/opencontainers/image-spec/LICENSE rename to vendor/src/github.com/opencontainers/image-spec/LICENSE diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/descriptor.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/descriptor.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/descriptor.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/v1/config.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/v1/config.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/v1/manifest.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/v1/manifest.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/v1/manifest_list.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/version.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/version.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/version.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/version.go diff --git a/vendor/github.com/opencontainers/image-spec/specs-go/versioned.go b/vendor/src/github.com/opencontainers/image-spec/specs-go/versioned.go similarity index 100% rename from vendor/github.com/opencontainers/image-spec/specs-go/versioned.go rename to vendor/src/github.com/opencontainers/image-spec/specs-go/versioned.go diff --git a/vendor/github.com/opencontainers/runc/LICENSE b/vendor/src/github.com/opencontainers/runc/LICENSE similarity index 100% rename from vendor/github.com/opencontainers/runc/LICENSE rename to vendor/src/github.com/opencontainers/runc/LICENSE diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/linux.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/linux.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/linux.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/proc.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/proc.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/proc.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/proc.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/unsupported.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/unsupported.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/unsupported.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/unsupported.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go b/vendor/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS rename to vendor/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/src/github.com/opencontainers/runc/libcontainer/user/user.go similarity index 100% rename from vendor/github.com/opencontainers/runc/libcontainer/user/user.go rename to vendor/src/github.com/opencontainers/runc/libcontainer/user/user.go diff --git a/vendor/github.com/opencontainers/runtime-spec/LICENSE b/vendor/src/github.com/opencontainers/runtime-spec/LICENSE similarity index 100% rename from vendor/github.com/opencontainers/runtime-spec/LICENSE rename to vendor/src/github.com/opencontainers/runtime-spec/LICENSE diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go similarity index 100% rename from vendor/github.com/opencontainers/runtime-spec/specs-go/config.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go similarity index 100% rename from vendor/github.com/opencontainers/runtime-spec/specs-go/state.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go similarity index 100% rename from vendor/github.com/opencontainers/runtime-spec/specs-go/version.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go diff --git a/vendor/github.com/opencontainers/runtime-tools/LICENSE b/vendor/src/github.com/opencontainers/runtime-tools/LICENSE similarity index 100% rename from vendor/github.com/opencontainers/runtime-tools/LICENSE rename to vendor/src/github.com/opencontainers/runtime-tools/LICENSE diff --git a/vendor/github.com/opencontainers/runtime-tools/cmd/runtimetest/mount/LICENSE b/vendor/src/github.com/opencontainers/runtime-tools/cmd/runtimetest/mount/LICENSE similarity index 100% rename from vendor/github.com/opencontainers/runtime-tools/cmd/runtimetest/mount/LICENSE rename to vendor/src/github.com/opencontainers/runtime-tools/cmd/runtimetest/mount/LICENSE diff --git a/vendor/github.com/opencontainers/runtime-tools/generate/generate.go b/vendor/src/github.com/opencontainers/runtime-tools/generate/generate.go similarity index 100% rename from vendor/github.com/opencontainers/runtime-tools/generate/generate.go rename to vendor/src/github.com/opencontainers/runtime-tools/generate/generate.go diff --git a/vendor/github.com/opencontainers/runtime-tools/generate/spec.go b/vendor/src/github.com/opencontainers/runtime-tools/generate/spec.go similarity index 100% rename from vendor/github.com/opencontainers/runtime-tools/generate/spec.go rename to vendor/src/github.com/opencontainers/runtime-tools/generate/spec.go diff --git a/vendor/github.com/rajatchopra/ocicni/README.md b/vendor/src/github.com/rajatchopra/ocicni/README.md similarity index 100% rename from vendor/github.com/rajatchopra/ocicni/README.md rename to vendor/src/github.com/rajatchopra/ocicni/README.md diff --git a/vendor/github.com/rajatchopra/ocicni/noop.go b/vendor/src/github.com/rajatchopra/ocicni/noop.go similarity index 100% rename from vendor/github.com/rajatchopra/ocicni/noop.go rename to vendor/src/github.com/rajatchopra/ocicni/noop.go diff --git a/vendor/github.com/rajatchopra/ocicni/ocicni.go b/vendor/src/github.com/rajatchopra/ocicni/ocicni.go similarity index 99% rename from vendor/github.com/rajatchopra/ocicni/ocicni.go rename to vendor/src/github.com/rajatchopra/ocicni/ocicni.go index c4ec66bc..03f7889a 100644 --- a/vendor/github.com/rajatchopra/ocicni/ocicni.go +++ b/vendor/src/github.com/rajatchopra/ocicni/ocicni.go @@ -1,5 +1,5 @@ -package ocicni +package ocicni import ( "errors" diff --git a/vendor/github.com/rajatchopra/ocicni/types.go b/vendor/src/github.com/rajatchopra/ocicni/types.go similarity index 100% rename from vendor/github.com/rajatchopra/ocicni/types.go rename to vendor/src/github.com/rajatchopra/ocicni/types.go diff --git a/vendor/github.com/rajatchopra/ocicni/util.go b/vendor/src/github.com/rajatchopra/ocicni/util.go similarity index 100% rename from vendor/github.com/rajatchopra/ocicni/util.go rename to vendor/src/github.com/rajatchopra/ocicni/util.go diff --git a/vendor/github.com/syndtr/gocapability/LICENSE b/vendor/src/github.com/syndtr/gocapability/LICENSE similarity index 100% rename from vendor/github.com/syndtr/gocapability/LICENSE rename to vendor/src/github.com/syndtr/gocapability/LICENSE diff --git a/vendor/github.com/syndtr/gocapability/capability/capability.go b/vendor/src/github.com/syndtr/gocapability/capability/capability.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/capability.go rename to vendor/src/github.com/syndtr/gocapability/capability/capability.go diff --git a/vendor/github.com/syndtr/gocapability/capability/capability_linux.go b/vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/capability_linux.go rename to vendor/src/github.com/syndtr/gocapability/capability/capability_linux.go diff --git a/vendor/github.com/syndtr/gocapability/capability/capability_noop.go b/vendor/src/github.com/syndtr/gocapability/capability/capability_noop.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/capability_noop.go rename to vendor/src/github.com/syndtr/gocapability/capability/capability_noop.go diff --git a/vendor/github.com/syndtr/gocapability/capability/enum.go b/vendor/src/github.com/syndtr/gocapability/capability/enum.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/enum.go rename to vendor/src/github.com/syndtr/gocapability/capability/enum.go diff --git a/vendor/github.com/syndtr/gocapability/capability/enum_gen.go b/vendor/src/github.com/syndtr/gocapability/capability/enum_gen.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/enum_gen.go rename to vendor/src/github.com/syndtr/gocapability/capability/enum_gen.go diff --git a/vendor/github.com/syndtr/gocapability/capability/syscall_linux.go b/vendor/src/github.com/syndtr/gocapability/capability/syscall_linux.go similarity index 100% rename from vendor/github.com/syndtr/gocapability/capability/syscall_linux.go rename to vendor/src/github.com/syndtr/gocapability/capability/syscall_linux.go diff --git a/vendor/github.com/tchap/go-patricia/LICENSE b/vendor/src/github.com/tchap/go-patricia/LICENSE similarity index 100% rename from vendor/github.com/tchap/go-patricia/LICENSE rename to vendor/src/github.com/tchap/go-patricia/LICENSE diff --git a/vendor/github.com/tchap/go-patricia/patricia/children.go b/vendor/src/github.com/tchap/go-patricia/patricia/children.go similarity index 100% rename from vendor/github.com/tchap/go-patricia/patricia/children.go rename to vendor/src/github.com/tchap/go-patricia/patricia/children.go diff --git a/vendor/github.com/tchap/go-patricia/patricia/patricia.go b/vendor/src/github.com/tchap/go-patricia/patricia/patricia.go similarity index 100% rename from vendor/github.com/tchap/go-patricia/patricia/patricia.go rename to vendor/src/github.com/tchap/go-patricia/patricia/patricia.go diff --git a/vendor/github.com/urfave/cli/.gitignore b/vendor/src/github.com/urfave/cli/.gitignore similarity index 100% rename from vendor/github.com/urfave/cli/.gitignore rename to vendor/src/github.com/urfave/cli/.gitignore diff --git a/vendor/github.com/urfave/cli/.travis.yml b/vendor/src/github.com/urfave/cli/.travis.yml similarity index 100% rename from vendor/github.com/urfave/cli/.travis.yml rename to vendor/src/github.com/urfave/cli/.travis.yml diff --git a/vendor/github.com/urfave/cli/CHANGELOG.md b/vendor/src/github.com/urfave/cli/CHANGELOG.md similarity index 100% rename from vendor/github.com/urfave/cli/CHANGELOG.md rename to vendor/src/github.com/urfave/cli/CHANGELOG.md diff --git a/vendor/github.com/urfave/cli/LICENSE b/vendor/src/github.com/urfave/cli/LICENSE similarity index 100% rename from vendor/github.com/urfave/cli/LICENSE rename to vendor/src/github.com/urfave/cli/LICENSE diff --git a/vendor/github.com/urfave/cli/README.md b/vendor/src/github.com/urfave/cli/README.md similarity index 99% rename from vendor/github.com/urfave/cli/README.md rename to vendor/src/github.com/urfave/cli/README.md index fb360a89..ebb1d741 100644 --- a/vendor/github.com/urfave/cli/README.md +++ b/vendor/src/github.com/urfave/cli/README.md @@ -845,7 +845,7 @@ func main() { ### Generated Help Text -The default help flag (`-h/--help`) is defined as `cli.HelpFlag` and is checked +The default help flag (`-h/--help`) is defined as `cli.HelpFlag` and is checked by the cli internals in order to print generated help text for the app, command, or subcommand, and break execution. diff --git a/vendor/github.com/urfave/cli/app.go b/vendor/src/github.com/urfave/cli/app.go similarity index 100% rename from vendor/github.com/urfave/cli/app.go rename to vendor/src/github.com/urfave/cli/app.go diff --git a/vendor/github.com/urfave/cli/appveyor.yml b/vendor/src/github.com/urfave/cli/appveyor.yml similarity index 100% rename from vendor/github.com/urfave/cli/appveyor.yml rename to vendor/src/github.com/urfave/cli/appveyor.yml diff --git a/vendor/github.com/urfave/cli/category.go b/vendor/src/github.com/urfave/cli/category.go similarity index 100% rename from vendor/github.com/urfave/cli/category.go rename to vendor/src/github.com/urfave/cli/category.go diff --git a/vendor/github.com/urfave/cli/cli.go b/vendor/src/github.com/urfave/cli/cli.go similarity index 100% rename from vendor/github.com/urfave/cli/cli.go rename to vendor/src/github.com/urfave/cli/cli.go diff --git a/vendor/github.com/urfave/cli/command.go b/vendor/src/github.com/urfave/cli/command.go similarity index 100% rename from vendor/github.com/urfave/cli/command.go rename to vendor/src/github.com/urfave/cli/command.go diff --git a/vendor/github.com/urfave/cli/context.go b/vendor/src/github.com/urfave/cli/context.go similarity index 100% rename from vendor/github.com/urfave/cli/context.go rename to vendor/src/github.com/urfave/cli/context.go diff --git a/vendor/github.com/urfave/cli/errors.go b/vendor/src/github.com/urfave/cli/errors.go similarity index 100% rename from vendor/github.com/urfave/cli/errors.go rename to vendor/src/github.com/urfave/cli/errors.go diff --git a/vendor/github.com/urfave/cli/flag.go b/vendor/src/github.com/urfave/cli/flag.go similarity index 100% rename from vendor/github.com/urfave/cli/flag.go rename to vendor/src/github.com/urfave/cli/flag.go diff --git a/vendor/github.com/urfave/cli/funcs.go b/vendor/src/github.com/urfave/cli/funcs.go similarity index 100% rename from vendor/github.com/urfave/cli/funcs.go rename to vendor/src/github.com/urfave/cli/funcs.go diff --git a/vendor/github.com/urfave/cli/help.go b/vendor/src/github.com/urfave/cli/help.go similarity index 100% rename from vendor/github.com/urfave/cli/help.go rename to vendor/src/github.com/urfave/cli/help.go diff --git a/vendor/github.com/urfave/cli/runtests b/vendor/src/github.com/urfave/cli/runtests similarity index 100% rename from vendor/github.com/urfave/cli/runtests rename to vendor/src/github.com/urfave/cli/runtests diff --git a/vendor/github.com/vbatts/tar-split/LICENSE b/vendor/src/github.com/vbatts/tar-split/LICENSE similarity index 100% rename from vendor/github.com/vbatts/tar-split/LICENSE rename to vendor/src/github.com/vbatts/tar-split/LICENSE diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/common.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/common.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/common.go diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/reader.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/reader.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/stat_atim.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atim.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/stat_atim.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atim.go diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/stat_unix.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_unix.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/stat_unix.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/stat_unix.go diff --git a/vendor/github.com/vbatts/tar-split/archive/tar/writer.go b/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/archive/tar/writer.go rename to vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go diff --git a/vendor/github.com/vbatts/tar-split/tar/asm/README.md b/vendor/src/github.com/vbatts/tar-split/tar/asm/README.md similarity index 98% rename from vendor/github.com/vbatts/tar-split/tar/asm/README.md rename to vendor/src/github.com/vbatts/tar-split/tar/asm/README.md index 161bd137..2a3a5b56 100644 --- a/vendor/github.com/vbatts/tar-split/tar/asm/README.md +++ b/vendor/src/github.com/vbatts/tar-split/tar/asm/README.md @@ -14,7 +14,7 @@ Addressable Storage (CAS) directory, that maps to a checksum in the This is due to the fact that tar archives _can_ allow multiple records for the same path, but the last one effectively wins. Even if the prior records had a -different payload. +different payload. In this way, when assembling an archive from relative paths, if the archive has multiple entries for the same path, then all payloads read in from a relative @@ -41,3 +41,4 @@ security concern either, as if it did occur, we would reassemble an archive that doesn't validate signature/checksum, so it shouldn't be trusted anyway. Otherwise, this will allow us to defer support for appended files as a FUTURE FEATURE. + diff --git a/vendor/github.com/vbatts/tar-split/tar/asm/assemble.go b/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/asm/assemble.go rename to vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go diff --git a/vendor/github.com/vbatts/tar-split/tar/asm/disassemble.go b/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/asm/disassemble.go rename to vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go diff --git a/vendor/github.com/vbatts/tar-split/tar/asm/doc.go b/vendor/src/github.com/vbatts/tar-split/tar/asm/doc.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/asm/doc.go rename to vendor/src/github.com/vbatts/tar-split/tar/asm/doc.go diff --git a/vendor/github.com/vbatts/tar-split/tar/storage/doc.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/doc.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/storage/doc.go rename to vendor/src/github.com/vbatts/tar-split/tar/storage/doc.go diff --git a/vendor/github.com/vbatts/tar-split/tar/storage/entry.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/storage/entry.go rename to vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go diff --git a/vendor/github.com/vbatts/tar-split/tar/storage/getter.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/getter.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/storage/getter.go rename to vendor/src/github.com/vbatts/tar-split/tar/storage/getter.go diff --git a/vendor/github.com/vbatts/tar-split/tar/storage/packer.go b/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go similarity index 100% rename from vendor/github.com/vbatts/tar-split/tar/storage/packer.go rename to vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go diff --git a/vendor/github.com/docker/docker/client/transport/cancellable/LICENSE b/vendor/src/golang.org/x/net/LICENSE similarity index 100% rename from vendor/github.com/docker/docker/client/transport/cancellable/LICENSE rename to vendor/src/golang.org/x/net/LICENSE diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/src/golang.org/x/net/context/context.go similarity index 100% rename from vendor/golang.org/x/net/context/context.go rename to vendor/src/golang.org/x/net/context/context.go diff --git a/vendor/golang.org/x/net/http2/.gitignore b/vendor/src/golang.org/x/net/http2/.gitignore similarity index 100% rename from vendor/golang.org/x/net/http2/.gitignore rename to vendor/src/golang.org/x/net/http2/.gitignore diff --git a/vendor/golang.org/x/net/http2/Dockerfile b/vendor/src/golang.org/x/net/http2/Dockerfile similarity index 99% rename from vendor/golang.org/x/net/http2/Dockerfile rename to vendor/src/golang.org/x/net/http2/Dockerfile index a7ab6d2f..53fc5257 100644 --- a/vendor/golang.org/x/net/http2/Dockerfile +++ b/vendor/src/golang.org/x/net/http2/Dockerfile @@ -48,3 +48,4 @@ RUN ldconfig CMD ["-h"] ENTRYPOINT ["/usr/local/bin/curl"] + diff --git a/vendor/golang.org/x/net/http2/Makefile b/vendor/src/golang.org/x/net/http2/Makefile similarity index 97% rename from vendor/golang.org/x/net/http2/Makefile rename to vendor/src/golang.org/x/net/http2/Makefile index 56fc20a0..55fd826f 100644 --- a/vendor/golang.org/x/net/http2/Makefile +++ b/vendor/src/golang.org/x/net/http2/Makefile @@ -1,2 +1,3 @@ curlimage: docker build -t gohttp2/curl . + diff --git a/vendor/golang.org/x/net/http2/README b/vendor/src/golang.org/x/net/http2/README similarity index 100% rename from vendor/golang.org/x/net/http2/README rename to vendor/src/golang.org/x/net/http2/README diff --git a/vendor/golang.org/x/net/http2/client_conn_pool.go b/vendor/src/golang.org/x/net/http2/client_conn_pool.go similarity index 100% rename from vendor/golang.org/x/net/http2/client_conn_pool.go rename to vendor/src/golang.org/x/net/http2/client_conn_pool.go diff --git a/vendor/golang.org/x/net/http2/configure_transport.go b/vendor/src/golang.org/x/net/http2/configure_transport.go similarity index 100% rename from vendor/golang.org/x/net/http2/configure_transport.go rename to vendor/src/golang.org/x/net/http2/configure_transport.go diff --git a/vendor/golang.org/x/net/http2/errors.go b/vendor/src/golang.org/x/net/http2/errors.go similarity index 100% rename from vendor/golang.org/x/net/http2/errors.go rename to vendor/src/golang.org/x/net/http2/errors.go diff --git a/vendor/golang.org/x/net/http2/fixed_buffer.go b/vendor/src/golang.org/x/net/http2/fixed_buffer.go similarity index 100% rename from vendor/golang.org/x/net/http2/fixed_buffer.go rename to vendor/src/golang.org/x/net/http2/fixed_buffer.go diff --git a/vendor/golang.org/x/net/http2/flow.go b/vendor/src/golang.org/x/net/http2/flow.go similarity index 100% rename from vendor/golang.org/x/net/http2/flow.go rename to vendor/src/golang.org/x/net/http2/flow.go diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/src/golang.org/x/net/http2/frame.go similarity index 100% rename from vendor/golang.org/x/net/http2/frame.go rename to vendor/src/golang.org/x/net/http2/frame.go diff --git a/vendor/golang.org/x/net/http2/go15.go b/vendor/src/golang.org/x/net/http2/go15.go similarity index 100% rename from vendor/golang.org/x/net/http2/go15.go rename to vendor/src/golang.org/x/net/http2/go15.go diff --git a/vendor/golang.org/x/net/http2/gotrack.go b/vendor/src/golang.org/x/net/http2/gotrack.go similarity index 100% rename from vendor/golang.org/x/net/http2/gotrack.go rename to vendor/src/golang.org/x/net/http2/gotrack.go diff --git a/vendor/golang.org/x/net/http2/headermap.go b/vendor/src/golang.org/x/net/http2/headermap.go similarity index 100% rename from vendor/golang.org/x/net/http2/headermap.go rename to vendor/src/golang.org/x/net/http2/headermap.go diff --git a/vendor/golang.org/x/net/http2/hpack/encode.go b/vendor/src/golang.org/x/net/http2/hpack/encode.go similarity index 100% rename from vendor/golang.org/x/net/http2/hpack/encode.go rename to vendor/src/golang.org/x/net/http2/hpack/encode.go diff --git a/vendor/golang.org/x/net/http2/hpack/hpack.go b/vendor/src/golang.org/x/net/http2/hpack/hpack.go similarity index 100% rename from vendor/golang.org/x/net/http2/hpack/hpack.go rename to vendor/src/golang.org/x/net/http2/hpack/hpack.go diff --git a/vendor/golang.org/x/net/http2/hpack/huffman.go b/vendor/src/golang.org/x/net/http2/hpack/huffman.go similarity index 100% rename from vendor/golang.org/x/net/http2/hpack/huffman.go rename to vendor/src/golang.org/x/net/http2/hpack/huffman.go diff --git a/vendor/golang.org/x/net/http2/hpack/tables.go b/vendor/src/golang.org/x/net/http2/hpack/tables.go similarity index 100% rename from vendor/golang.org/x/net/http2/hpack/tables.go rename to vendor/src/golang.org/x/net/http2/hpack/tables.go diff --git a/vendor/golang.org/x/net/http2/http2.go b/vendor/src/golang.org/x/net/http2/http2.go similarity index 100% rename from vendor/golang.org/x/net/http2/http2.go rename to vendor/src/golang.org/x/net/http2/http2.go diff --git a/vendor/golang.org/x/net/http2/not_go15.go b/vendor/src/golang.org/x/net/http2/not_go15.go similarity index 100% rename from vendor/golang.org/x/net/http2/not_go15.go rename to vendor/src/golang.org/x/net/http2/not_go15.go diff --git a/vendor/golang.org/x/net/http2/not_go16.go b/vendor/src/golang.org/x/net/http2/not_go16.go similarity index 100% rename from vendor/golang.org/x/net/http2/not_go16.go rename to vendor/src/golang.org/x/net/http2/not_go16.go diff --git a/vendor/golang.org/x/net/http2/pipe.go b/vendor/src/golang.org/x/net/http2/pipe.go similarity index 100% rename from vendor/golang.org/x/net/http2/pipe.go rename to vendor/src/golang.org/x/net/http2/pipe.go diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/src/golang.org/x/net/http2/server.go similarity index 100% rename from vendor/golang.org/x/net/http2/server.go rename to vendor/src/golang.org/x/net/http2/server.go diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/src/golang.org/x/net/http2/transport.go similarity index 100% rename from vendor/golang.org/x/net/http2/transport.go rename to vendor/src/golang.org/x/net/http2/transport.go diff --git a/vendor/golang.org/x/net/http2/write.go b/vendor/src/golang.org/x/net/http2/write.go similarity index 100% rename from vendor/golang.org/x/net/http2/write.go rename to vendor/src/golang.org/x/net/http2/write.go diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/src/golang.org/x/net/http2/writesched.go similarity index 100% rename from vendor/golang.org/x/net/http2/writesched.go rename to vendor/src/golang.org/x/net/http2/writesched.go diff --git a/vendor/golang.org/x/net/internal/timeseries/timeseries.go b/vendor/src/golang.org/x/net/internal/timeseries/timeseries.go similarity index 100% rename from vendor/golang.org/x/net/internal/timeseries/timeseries.go rename to vendor/src/golang.org/x/net/internal/timeseries/timeseries.go diff --git a/vendor/src/golang.org/x/net/proxy/direct.go b/vendor/src/golang.org/x/net/proxy/direct.go new file mode 100644 index 00000000..4c5ad88b --- /dev/null +++ b/vendor/src/golang.org/x/net/proxy/direct.go @@ -0,0 +1,18 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package proxy + +import ( + "net" +) + +type direct struct{} + +// Direct is a direct proxy: one that makes network connections directly. +var Direct = direct{} + +func (direct) Dial(network, addr string) (net.Conn, error) { + return net.Dial(network, addr) +} diff --git a/vendor/src/golang.org/x/net/proxy/per_host.go b/vendor/src/golang.org/x/net/proxy/per_host.go new file mode 100644 index 00000000..f540b196 --- /dev/null +++ b/vendor/src/golang.org/x/net/proxy/per_host.go @@ -0,0 +1,140 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package proxy + +import ( + "net" + "strings" +) + +// A PerHost directs connections to a default Dialer unless the hostname +// requested matches one of a number of exceptions. +type PerHost struct { + def, bypass Dialer + + bypassNetworks []*net.IPNet + bypassIPs []net.IP + bypassZones []string + bypassHosts []string +} + +// NewPerHost returns a PerHost Dialer that directs connections to either +// defaultDialer or bypass, depending on whether the connection matches one of +// the configured rules. +func NewPerHost(defaultDialer, bypass Dialer) *PerHost { + return &PerHost{ + def: defaultDialer, + bypass: bypass, + } +} + +// Dial connects to the address addr on the given network through either +// defaultDialer or bypass. +func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) { + host, _, err := net.SplitHostPort(addr) + if err != nil { + return nil, err + } + + return p.dialerForRequest(host).Dial(network, addr) +} + +func (p *PerHost) dialerForRequest(host string) Dialer { + if ip := net.ParseIP(host); ip != nil { + for _, net := range p.bypassNetworks { + if net.Contains(ip) { + return p.bypass + } + } + for _, bypassIP := range p.bypassIPs { + if bypassIP.Equal(ip) { + return p.bypass + } + } + return p.def + } + + for _, zone := range p.bypassZones { + if strings.HasSuffix(host, zone) { + return p.bypass + } + if host == zone[1:] { + // For a zone "example.com", we match "example.com" + // too. + return p.bypass + } + } + for _, bypassHost := range p.bypassHosts { + if bypassHost == host { + return p.bypass + } + } + return p.def +} + +// AddFromString parses a string that contains comma-separated values +// specifying hosts that should use the bypass proxy. Each value is either an +// IP address, a CIDR range, a zone (*.example.com) or a hostname +// (localhost). A best effort is made to parse the string and errors are +// ignored. +func (p *PerHost) AddFromString(s string) { + hosts := strings.Split(s, ",") + for _, host := range hosts { + host = strings.TrimSpace(host) + if len(host) == 0 { + continue + } + if strings.Contains(host, "/") { + // We assume that it's a CIDR address like 127.0.0.0/8 + if _, net, err := net.ParseCIDR(host); err == nil { + p.AddNetwork(net) + } + continue + } + if ip := net.ParseIP(host); ip != nil { + p.AddIP(ip) + continue + } + if strings.HasPrefix(host, "*.") { + p.AddZone(host[1:]) + continue + } + p.AddHost(host) + } +} + +// AddIP specifies an IP address that will use the bypass proxy. Note that +// this will only take effect if a literal IP address is dialed. A connection +// to a named host will never match an IP. +func (p *PerHost) AddIP(ip net.IP) { + p.bypassIPs = append(p.bypassIPs, ip) +} + +// AddNetwork specifies an IP range that will use the bypass proxy. Note that +// this will only take effect if a literal IP address is dialed. A connection +// to a named host will never match. +func (p *PerHost) AddNetwork(net *net.IPNet) { + p.bypassNetworks = append(p.bypassNetworks, net) +} + +// AddZone specifies a DNS suffix that will use the bypass proxy. A zone of +// "example.com" matches "example.com" and all of its subdomains. +func (p *PerHost) AddZone(zone string) { + if strings.HasSuffix(zone, ".") { + zone = zone[:len(zone)-1] + } + if !strings.HasPrefix(zone, ".") { + zone = "." + zone + } + p.bypassZones = append(p.bypassZones, zone) +} + +// AddHost specifies a hostname that will use the bypass proxy. +func (p *PerHost) AddHost(host string) { + if strings.HasSuffix(host, ".") { + host = host[:len(host)-1] + } + p.bypassHosts = append(p.bypassHosts, host) +} diff --git a/vendor/src/golang.org/x/net/proxy/proxy.go b/vendor/src/golang.org/x/net/proxy/proxy.go new file mode 100644 index 00000000..78a8b7be --- /dev/null +++ b/vendor/src/golang.org/x/net/proxy/proxy.go @@ -0,0 +1,94 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package proxy provides support for a variety of protocols to proxy network +// data. +package proxy // import "golang.org/x/net/proxy" + +import ( + "errors" + "net" + "net/url" + "os" +) + +// A Dialer is a means to establish a connection. +type Dialer interface { + // Dial connects to the given address via the proxy. + Dial(network, addr string) (c net.Conn, err error) +} + +// Auth contains authentication parameters that specific Dialers may require. +type Auth struct { + User, Password string +} + +// FromEnvironment returns the dialer specified by the proxy related variables in +// the environment. +func FromEnvironment() Dialer { + allProxy := os.Getenv("all_proxy") + if len(allProxy) == 0 { + return Direct + } + + proxyURL, err := url.Parse(allProxy) + if err != nil { + return Direct + } + proxy, err := FromURL(proxyURL, Direct) + if err != nil { + return Direct + } + + noProxy := os.Getenv("no_proxy") + if len(noProxy) == 0 { + return proxy + } + + perHost := NewPerHost(proxy, Direct) + perHost.AddFromString(noProxy) + return perHost +} + +// proxySchemes is a map from URL schemes to a function that creates a Dialer +// from a URL with such a scheme. +var proxySchemes map[string]func(*url.URL, Dialer) (Dialer, error) + +// RegisterDialerType takes a URL scheme and a function to generate Dialers from +// a URL with that scheme and a forwarding Dialer. Registered schemes are used +// by FromURL. +func RegisterDialerType(scheme string, f func(*url.URL, Dialer) (Dialer, error)) { + if proxySchemes == nil { + proxySchemes = make(map[string]func(*url.URL, Dialer) (Dialer, error)) + } + proxySchemes[scheme] = f +} + +// FromURL returns a Dialer given a URL specification and an underlying +// Dialer for it to make network requests. +func FromURL(u *url.URL, forward Dialer) (Dialer, error) { + var auth *Auth + if u.User != nil { + auth = new(Auth) + auth.User = u.User.Username() + if p, ok := u.User.Password(); ok { + auth.Password = p + } + } + + switch u.Scheme { + case "socks5": + return SOCKS5("tcp", u.Host, auth, forward) + } + + // If the scheme doesn't match any of the built-in schemes, see if it + // was registered by another package. + if proxySchemes != nil { + if f, ok := proxySchemes[u.Scheme]; ok { + return f(u, forward) + } + } + + return nil, errors.New("proxy: unknown scheme: " + u.Scheme) +} diff --git a/vendor/src/golang.org/x/net/proxy/socks5.go b/vendor/src/golang.org/x/net/proxy/socks5.go new file mode 100644 index 00000000..9b962823 --- /dev/null +++ b/vendor/src/golang.org/x/net/proxy/socks5.go @@ -0,0 +1,210 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package proxy + +import ( + "errors" + "io" + "net" + "strconv" +) + +// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given address +// with an optional username and password. See RFC 1928. +func SOCKS5(network, addr string, auth *Auth, forward Dialer) (Dialer, error) { + s := &socks5{ + network: network, + addr: addr, + forward: forward, + } + if auth != nil { + s.user = auth.User + s.password = auth.Password + } + + return s, nil +} + +type socks5 struct { + user, password string + network, addr string + forward Dialer +} + +const socks5Version = 5 + +const ( + socks5AuthNone = 0 + socks5AuthPassword = 2 +) + +const socks5Connect = 1 + +const ( + socks5IP4 = 1 + socks5Domain = 3 + socks5IP6 = 4 +) + +var socks5Errors = []string{ + "", + "general failure", + "connection forbidden", + "network unreachable", + "host unreachable", + "connection refused", + "TTL expired", + "command not supported", + "address type not supported", +} + +// Dial connects to the address addr on the network net via the SOCKS5 proxy. +func (s *socks5) Dial(network, addr string) (net.Conn, error) { + switch network { + case "tcp", "tcp6", "tcp4": + default: + return nil, errors.New("proxy: no support for SOCKS5 proxy connections of type " + network) + } + + conn, err := s.forward.Dial(s.network, s.addr) + if err != nil { + return nil, err + } + closeConn := &conn + defer func() { + if closeConn != nil { + (*closeConn).Close() + } + }() + + host, portStr, err := net.SplitHostPort(addr) + if err != nil { + return nil, err + } + + port, err := strconv.Atoi(portStr) + if err != nil { + return nil, errors.New("proxy: failed to parse port number: " + portStr) + } + if port < 1 || port > 0xffff { + return nil, errors.New("proxy: port number out of range: " + portStr) + } + + // the size here is just an estimate + buf := make([]byte, 0, 6+len(host)) + + buf = append(buf, socks5Version) + if len(s.user) > 0 && len(s.user) < 256 && len(s.password) < 256 { + buf = append(buf, 2 /* num auth methods */, socks5AuthNone, socks5AuthPassword) + } else { + buf = append(buf, 1 /* num auth methods */, socks5AuthNone) + } + + if _, err := conn.Write(buf); err != nil { + return nil, errors.New("proxy: failed to write greeting to SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + if _, err := io.ReadFull(conn, buf[:2]); err != nil { + return nil, errors.New("proxy: failed to read greeting from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + if buf[0] != 5 { + return nil, errors.New("proxy: SOCKS5 proxy at " + s.addr + " has unexpected version " + strconv.Itoa(int(buf[0]))) + } + if buf[1] == 0xff { + return nil, errors.New("proxy: SOCKS5 proxy at " + s.addr + " requires authentication") + } + + if buf[1] == socks5AuthPassword { + buf = buf[:0] + buf = append(buf, 1 /* password protocol version */) + buf = append(buf, uint8(len(s.user))) + buf = append(buf, s.user...) + buf = append(buf, uint8(len(s.password))) + buf = append(buf, s.password...) + + if _, err := conn.Write(buf); err != nil { + return nil, errors.New("proxy: failed to write authentication request to SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + if _, err := io.ReadFull(conn, buf[:2]); err != nil { + return nil, errors.New("proxy: failed to read authentication reply from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + if buf[1] != 0 { + return nil, errors.New("proxy: SOCKS5 proxy at " + s.addr + " rejected username/password") + } + } + + buf = buf[:0] + buf = append(buf, socks5Version, socks5Connect, 0 /* reserved */) + + if ip := net.ParseIP(host); ip != nil { + if ip4 := ip.To4(); ip4 != nil { + buf = append(buf, socks5IP4) + ip = ip4 + } else { + buf = append(buf, socks5IP6) + } + buf = append(buf, ip...) + } else { + if len(host) > 255 { + return nil, errors.New("proxy: destination hostname too long: " + host) + } + buf = append(buf, socks5Domain) + buf = append(buf, byte(len(host))) + buf = append(buf, host...) + } + buf = append(buf, byte(port>>8), byte(port)) + + if _, err := conn.Write(buf); err != nil { + return nil, errors.New("proxy: failed to write connect request to SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + if _, err := io.ReadFull(conn, buf[:4]); err != nil { + return nil, errors.New("proxy: failed to read connect reply from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + failure := "unknown error" + if int(buf[1]) < len(socks5Errors) { + failure = socks5Errors[buf[1]] + } + + if len(failure) > 0 { + return nil, errors.New("proxy: SOCKS5 proxy at " + s.addr + " failed to connect: " + failure) + } + + bytesToDiscard := 0 + switch buf[3] { + case socks5IP4: + bytesToDiscard = net.IPv4len + case socks5IP6: + bytesToDiscard = net.IPv6len + case socks5Domain: + _, err := io.ReadFull(conn, buf[:1]) + if err != nil { + return nil, errors.New("proxy: failed to read domain length from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + bytesToDiscard = int(buf[0]) + default: + return nil, errors.New("proxy: got unknown address type " + strconv.Itoa(int(buf[3])) + " from SOCKS5 proxy at " + s.addr) + } + + if cap(buf) < bytesToDiscard { + buf = make([]byte, bytesToDiscard) + } else { + buf = buf[:bytesToDiscard] + } + if _, err := io.ReadFull(conn, buf); err != nil { + return nil, errors.New("proxy: failed to read address from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + // Also need to discard the port number + if _, err := io.ReadFull(conn, buf[:2]); err != nil { + return nil, errors.New("proxy: failed to read port from SOCKS5 proxy at " + s.addr + ": " + err.Error()) + } + + closeConn = nil + return conn, nil +} diff --git a/vendor/golang.org/x/net/trace/events.go b/vendor/src/golang.org/x/net/trace/events.go similarity index 100% rename from vendor/golang.org/x/net/trace/events.go rename to vendor/src/golang.org/x/net/trace/events.go diff --git a/vendor/golang.org/x/net/trace/histogram.go b/vendor/src/golang.org/x/net/trace/histogram.go similarity index 100% rename from vendor/golang.org/x/net/trace/histogram.go rename to vendor/src/golang.org/x/net/trace/histogram.go diff --git a/vendor/golang.org/x/net/trace/trace.go b/vendor/src/golang.org/x/net/trace/trace.go similarity index 100% rename from vendor/golang.org/x/net/trace/trace.go rename to vendor/src/golang.org/x/net/trace/trace.go diff --git a/vendor/google.golang.org/grpc/.travis.yml b/vendor/src/google.golang.org/grpc/.travis.yml similarity index 100% rename from vendor/google.golang.org/grpc/.travis.yml rename to vendor/src/google.golang.org/grpc/.travis.yml diff --git a/vendor/google.golang.org/grpc/CONTRIBUTING.md b/vendor/src/google.golang.org/grpc/CONTRIBUTING.md similarity index 100% rename from vendor/google.golang.org/grpc/CONTRIBUTING.md rename to vendor/src/google.golang.org/grpc/CONTRIBUTING.md diff --git a/vendor/google.golang.org/grpc/LICENSE b/vendor/src/google.golang.org/grpc/LICENSE similarity index 100% rename from vendor/google.golang.org/grpc/LICENSE rename to vendor/src/google.golang.org/grpc/LICENSE diff --git a/vendor/google.golang.org/grpc/Makefile b/vendor/src/google.golang.org/grpc/Makefile similarity index 100% rename from vendor/google.golang.org/grpc/Makefile rename to vendor/src/google.golang.org/grpc/Makefile diff --git a/vendor/google.golang.org/grpc/PATENTS b/vendor/src/google.golang.org/grpc/PATENTS similarity index 100% rename from vendor/google.golang.org/grpc/PATENTS rename to vendor/src/google.golang.org/grpc/PATENTS diff --git a/vendor/google.golang.org/grpc/README.md b/vendor/src/google.golang.org/grpc/README.md similarity index 99% rename from vendor/google.golang.org/grpc/README.md rename to vendor/src/google.golang.org/grpc/README.md index 4f95eb4f..660658be 100644 --- a/vendor/google.golang.org/grpc/README.md +++ b/vendor/src/google.golang.org/grpc/README.md @@ -29,3 +29,4 @@ See [API documentation](https://godoc.org/google.golang.org/grpc) for package an Status ------ GA + diff --git a/vendor/google.golang.org/grpc/backoff.go b/vendor/src/google.golang.org/grpc/backoff.go similarity index 100% rename from vendor/google.golang.org/grpc/backoff.go rename to vendor/src/google.golang.org/grpc/backoff.go diff --git a/vendor/google.golang.org/grpc/balancer.go b/vendor/src/google.golang.org/grpc/balancer.go similarity index 100% rename from vendor/google.golang.org/grpc/balancer.go rename to vendor/src/google.golang.org/grpc/balancer.go diff --git a/vendor/google.golang.org/grpc/call.go b/vendor/src/google.golang.org/grpc/call.go similarity index 100% rename from vendor/google.golang.org/grpc/call.go rename to vendor/src/google.golang.org/grpc/call.go diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/src/google.golang.org/grpc/clientconn.go similarity index 100% rename from vendor/google.golang.org/grpc/clientconn.go rename to vendor/src/google.golang.org/grpc/clientconn.go diff --git a/vendor/google.golang.org/grpc/codegen.sh b/vendor/src/google.golang.org/grpc/codegen.sh similarity index 100% rename from vendor/google.golang.org/grpc/codegen.sh rename to vendor/src/google.golang.org/grpc/codegen.sh diff --git a/vendor/google.golang.org/grpc/codes/code_string.go b/vendor/src/google.golang.org/grpc/codes/code_string.go similarity index 100% rename from vendor/google.golang.org/grpc/codes/code_string.go rename to vendor/src/google.golang.org/grpc/codes/code_string.go diff --git a/vendor/google.golang.org/grpc/codes/codes.go b/vendor/src/google.golang.org/grpc/codes/codes.go similarity index 100% rename from vendor/google.golang.org/grpc/codes/codes.go rename to vendor/src/google.golang.org/grpc/codes/codes.go diff --git a/vendor/google.golang.org/grpc/coverage.sh b/vendor/src/google.golang.org/grpc/coverage.sh similarity index 100% rename from vendor/google.golang.org/grpc/coverage.sh rename to vendor/src/google.golang.org/grpc/coverage.sh diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/src/google.golang.org/grpc/credentials/credentials.go similarity index 100% rename from vendor/google.golang.org/grpc/credentials/credentials.go rename to vendor/src/google.golang.org/grpc/credentials/credentials.go diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_go17.go b/vendor/src/google.golang.org/grpc/credentials/credentials_util_go17.go similarity index 100% rename from vendor/google.golang.org/grpc/credentials/credentials_util_go17.go rename to vendor/src/google.golang.org/grpc/credentials/credentials_util_go17.go diff --git a/vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go b/vendor/src/google.golang.org/grpc/credentials/credentials_util_pre_go17.go similarity index 100% rename from vendor/google.golang.org/grpc/credentials/credentials_util_pre_go17.go rename to vendor/src/google.golang.org/grpc/credentials/credentials_util_pre_go17.go diff --git a/vendor/google.golang.org/grpc/doc.go b/vendor/src/google.golang.org/grpc/doc.go similarity index 100% rename from vendor/google.golang.org/grpc/doc.go rename to vendor/src/google.golang.org/grpc/doc.go diff --git a/vendor/google.golang.org/grpc/grpclog/logger.go b/vendor/src/google.golang.org/grpc/grpclog/logger.go similarity index 100% rename from vendor/google.golang.org/grpc/grpclog/logger.go rename to vendor/src/google.golang.org/grpc/grpclog/logger.go diff --git a/vendor/google.golang.org/grpc/interceptor.go b/vendor/src/google.golang.org/grpc/interceptor.go similarity index 100% rename from vendor/google.golang.org/grpc/interceptor.go rename to vendor/src/google.golang.org/grpc/interceptor.go diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/src/google.golang.org/grpc/internal/internal.go similarity index 100% rename from vendor/google.golang.org/grpc/internal/internal.go rename to vendor/src/google.golang.org/grpc/internal/internal.go diff --git a/vendor/google.golang.org/grpc/metadata/metadata.go b/vendor/src/google.golang.org/grpc/metadata/metadata.go similarity index 100% rename from vendor/google.golang.org/grpc/metadata/metadata.go rename to vendor/src/google.golang.org/grpc/metadata/metadata.go diff --git a/vendor/google.golang.org/grpc/naming/naming.go b/vendor/src/google.golang.org/grpc/naming/naming.go similarity index 100% rename from vendor/google.golang.org/grpc/naming/naming.go rename to vendor/src/google.golang.org/grpc/naming/naming.go diff --git a/vendor/google.golang.org/grpc/peer/peer.go b/vendor/src/google.golang.org/grpc/peer/peer.go similarity index 100% rename from vendor/google.golang.org/grpc/peer/peer.go rename to vendor/src/google.golang.org/grpc/peer/peer.go diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/src/google.golang.org/grpc/rpc_util.go similarity index 100% rename from vendor/google.golang.org/grpc/rpc_util.go rename to vendor/src/google.golang.org/grpc/rpc_util.go diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/src/google.golang.org/grpc/server.go similarity index 100% rename from vendor/google.golang.org/grpc/server.go rename to vendor/src/google.golang.org/grpc/server.go diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/src/google.golang.org/grpc/stream.go similarity index 100% rename from vendor/google.golang.org/grpc/stream.go rename to vendor/src/google.golang.org/grpc/stream.go diff --git a/vendor/google.golang.org/grpc/trace.go b/vendor/src/google.golang.org/grpc/trace.go similarity index 100% rename from vendor/google.golang.org/grpc/trace.go rename to vendor/src/google.golang.org/grpc/trace.go diff --git a/vendor/google.golang.org/grpc/transport/control.go b/vendor/src/google.golang.org/grpc/transport/control.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/control.go rename to vendor/src/google.golang.org/grpc/transport/control.go diff --git a/vendor/google.golang.org/grpc/transport/go16.go b/vendor/src/google.golang.org/grpc/transport/go16.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/go16.go rename to vendor/src/google.golang.org/grpc/transport/go16.go diff --git a/vendor/google.golang.org/grpc/transport/go17.go b/vendor/src/google.golang.org/grpc/transport/go17.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/go17.go rename to vendor/src/google.golang.org/grpc/transport/go17.go diff --git a/vendor/google.golang.org/grpc/transport/handler_server.go b/vendor/src/google.golang.org/grpc/transport/handler_server.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/handler_server.go rename to vendor/src/google.golang.org/grpc/transport/handler_server.go diff --git a/vendor/google.golang.org/grpc/transport/http2_client.go b/vendor/src/google.golang.org/grpc/transport/http2_client.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/http2_client.go rename to vendor/src/google.golang.org/grpc/transport/http2_client.go diff --git a/vendor/google.golang.org/grpc/transport/http2_server.go b/vendor/src/google.golang.org/grpc/transport/http2_server.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/http2_server.go rename to vendor/src/google.golang.org/grpc/transport/http2_server.go diff --git a/vendor/google.golang.org/grpc/transport/http_util.go b/vendor/src/google.golang.org/grpc/transport/http_util.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/http_util.go rename to vendor/src/google.golang.org/grpc/transport/http_util.go diff --git a/vendor/google.golang.org/grpc/transport/pre_go16.go b/vendor/src/google.golang.org/grpc/transport/pre_go16.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/pre_go16.go rename to vendor/src/google.golang.org/grpc/transport/pre_go16.go diff --git a/vendor/google.golang.org/grpc/transport/transport.go b/vendor/src/google.golang.org/grpc/transport/transport.go similarity index 100% rename from vendor/google.golang.org/grpc/transport/transport.go rename to vendor/src/google.golang.org/grpc/transport/transport.go diff --git a/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/src/gopkg.in/yaml.v2/LICENSE similarity index 100% rename from vendor/gopkg.in/yaml.v2/LICENSE rename to vendor/src/gopkg.in/yaml.v2/LICENSE diff --git a/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/src/gopkg.in/yaml.v2/LICENSE.libyaml similarity index 100% rename from vendor/gopkg.in/yaml.v2/LICENSE.libyaml rename to vendor/src/gopkg.in/yaml.v2/LICENSE.libyaml diff --git a/vendor/gopkg.in/yaml.v2/README.md b/vendor/src/gopkg.in/yaml.v2/README.md similarity index 99% rename from vendor/gopkg.in/yaml.v2/README.md rename to vendor/src/gopkg.in/yaml.v2/README.md index 03837cbd..d6c919e6 100644 --- a/vendor/gopkg.in/yaml.v2/README.md +++ b/vendor/src/gopkg.in/yaml.v2/README.md @@ -72,27 +72,27 @@ type T struct { func main() { t := T{} - + err := yaml.Unmarshal([]byte(data), &t) if err != nil { log.Fatalf("error: %v", err) } fmt.Printf("--- t:\n%v\n\n", t) - + d, err := yaml.Marshal(&t) if err != nil { log.Fatalf("error: %v", err) } fmt.Printf("--- t dump:\n%s\n\n", string(d)) - + m := make(map[interface{}]interface{}) - + err = yaml.Unmarshal([]byte(data), &m) if err != nil { log.Fatalf("error: %v", err) } fmt.Printf("--- m:\n%v\n\n", m) - + d, err = yaml.Marshal(&m) if err != nil { log.Fatalf("error: %v", err) @@ -125,3 +125,4 @@ b: - 3 - 4 ``` + diff --git a/vendor/gopkg.in/yaml.v2/apic.go b/vendor/src/gopkg.in/yaml.v2/apic.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/apic.go rename to vendor/src/gopkg.in/yaml.v2/apic.go diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/src/gopkg.in/yaml.v2/decode.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/decode.go rename to vendor/src/gopkg.in/yaml.v2/decode.go diff --git a/vendor/gopkg.in/yaml.v2/emitterc.go b/vendor/src/gopkg.in/yaml.v2/emitterc.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/emitterc.go rename to vendor/src/gopkg.in/yaml.v2/emitterc.go diff --git a/vendor/gopkg.in/yaml.v2/encode.go b/vendor/src/gopkg.in/yaml.v2/encode.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/encode.go rename to vendor/src/gopkg.in/yaml.v2/encode.go diff --git a/vendor/gopkg.in/yaml.v2/parserc.go b/vendor/src/gopkg.in/yaml.v2/parserc.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/parserc.go rename to vendor/src/gopkg.in/yaml.v2/parserc.go diff --git a/vendor/gopkg.in/yaml.v2/readerc.go b/vendor/src/gopkg.in/yaml.v2/readerc.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/readerc.go rename to vendor/src/gopkg.in/yaml.v2/readerc.go diff --git a/vendor/gopkg.in/yaml.v2/resolve.go b/vendor/src/gopkg.in/yaml.v2/resolve.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/resolve.go rename to vendor/src/gopkg.in/yaml.v2/resolve.go diff --git a/vendor/gopkg.in/yaml.v2/scannerc.go b/vendor/src/gopkg.in/yaml.v2/scannerc.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/scannerc.go rename to vendor/src/gopkg.in/yaml.v2/scannerc.go diff --git a/vendor/gopkg.in/yaml.v2/sorter.go b/vendor/src/gopkg.in/yaml.v2/sorter.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/sorter.go rename to vendor/src/gopkg.in/yaml.v2/sorter.go diff --git a/vendor/gopkg.in/yaml.v2/writerc.go b/vendor/src/gopkg.in/yaml.v2/writerc.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/writerc.go rename to vendor/src/gopkg.in/yaml.v2/writerc.go diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/src/gopkg.in/yaml.v2/yaml.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/yaml.go rename to vendor/src/gopkg.in/yaml.v2/yaml.go diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/src/gopkg.in/yaml.v2/yamlh.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/yamlh.go rename to vendor/src/gopkg.in/yaml.v2/yamlh.go diff --git a/vendor/gopkg.in/yaml.v2/yamlprivateh.go b/vendor/src/gopkg.in/yaml.v2/yamlprivateh.go similarity index 100% rename from vendor/gopkg.in/yaml.v2/yamlprivateh.go rename to vendor/src/gopkg.in/yaml.v2/yamlprivateh.go diff --git a/vendor/k8s.io/kubernetes/Godeps/LICENSES b/vendor/src/k8s.io/kubernetes/Godeps/LICENSES similarity index 99% rename from vendor/k8s.io/kubernetes/Godeps/LICENSES rename to vendor/src/k8s.io/kubernetes/Godeps/LICENSES index 8cbf55d4..6cc42f00 100644 --- a/vendor/k8s.io/kubernetes/Godeps/LICENSES +++ b/vendor/src/k8s.io/kubernetes/Godeps/LICENSES @@ -30579,7 +30579,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Copyright (c) 2014, Evan Phoenix All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this @@ -30587,19 +30587,19 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the Evan Phoenix nor the names of its contributors - may be used to endorse or promote products derived from this software +* Neither the name of the Evan Phoenix nor the names of its contributors + may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. = vendor/github.com/evanphx/json-patch/LICENSE 72c842ec53c3334a81b6d65b6f9025a3 - @@ -56639,10 +56639,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -56838,10 +56838,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -57037,10 +57037,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -57236,10 +57236,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -57435,10 +57435,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -57634,10 +57634,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -57833,10 +57833,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -58032,10 +58032,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -58231,10 +58231,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -58430,10 +58430,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -58629,10 +58629,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -58828,10 +58828,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -59027,10 +59027,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -59226,10 +59226,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -59425,10 +59425,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -59624,10 +59624,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -59823,10 +59823,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -60022,10 +60022,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -60221,10 +60221,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -60420,10 +60420,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -60619,10 +60619,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -60818,10 +60818,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -61017,10 +61017,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -61216,10 +61216,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -61415,10 +61415,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -61614,10 +61614,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -61813,10 +61813,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -62012,10 +62012,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -62211,10 +62211,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -62410,10 +62410,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -62609,10 +62609,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -62808,10 +62808,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -63007,10 +63007,10 @@ License at Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. +specific language governing permissions and limitations under the License. ------ - + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -63989,23 +63989,23 @@ Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell Please consider promoting this project if you find it useful. -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. = vendor/github.com/stretchr/testify/LICENCE.txt 39cd1d751bc25944831de86496e3cf68 - @@ -64019,23 +64019,23 @@ Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell Please consider promoting this project if you find it useful. -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. = vendor/github.com/stretchr/testify/LICENCE.txt 39cd1d751bc25944831de86496e3cf68 - @@ -64049,23 +64049,23 @@ Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell Please consider promoting this project if you find it useful. -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT -OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. = vendor/github.com/stretchr/testify/LICENCE.txt 39cd1d751bc25944831de86496e3cf68 - @@ -70591,7 +70591,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The MIT License (MIT) -Copyright (c) 2014 Nate Finch +Copyright (c) 2014 Nate Finch Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -71226,3 +71226,4 @@ Apache License = vendor/k8s.io/heapster/LICENSE 136e4f49dbf29942c572a3a8f6e88a77 - ================================================================================ + diff --git a/vendor/k8s.io/kubernetes/LICENSE b/vendor/src/k8s.io/kubernetes/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/LICENSE rename to vendor/src/k8s.io/kubernetes/LICENSE diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go b/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go rename to vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto b/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto similarity index 99% rename from vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto rename to vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto index 901c6cca..8e3e4856 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto +++ b/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto @@ -126,7 +126,7 @@ message NamespaceOption { // host platforms and Linux-based containers. message LinuxPodSandboxConfig { // The parent cgroup of the pod sandbox. - // The cgroupfs style syntax will be used, but the container runtime can + // The cgroupfs style syntax will be used, but the container runtime can // convert it to systemd semantices if needed. optional string cgroup_parent = 1; // The configurations for the sandbox's namespaces. diff --git a/vendor/k8s.io/kubernetes/pkg/util/errors/doc.go b/vendor/src/k8s.io/kubernetes/pkg/util/errors/doc.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/errors/doc.go rename to vendor/src/k8s.io/kubernetes/pkg/util/errors/doc.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/errors/errors.go b/vendor/src/k8s.io/kubernetes/pkg/util/errors/errors.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/errors/errors.go rename to vendor/src/k8s.io/kubernetes/pkg/util/errors/errors.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/homedir/homedir.go b/vendor/src/k8s.io/kubernetes/pkg/util/homedir/homedir.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/homedir/homedir.go rename to vendor/src/k8s.io/kubernetes/pkg/util/homedir/homedir.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/net/http.go b/vendor/src/k8s.io/kubernetes/pkg/util/net/http.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/net/http.go rename to vendor/src/k8s.io/kubernetes/pkg/util/net/http.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/net/interface.go b/vendor/src/k8s.io/kubernetes/pkg/util/net/interface.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/net/interface.go rename to vendor/src/k8s.io/kubernetes/pkg/util/net/interface.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/net/port_range.go b/vendor/src/k8s.io/kubernetes/pkg/util/net/port_range.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/net/port_range.go rename to vendor/src/k8s.io/kubernetes/pkg/util/net/port_range.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/net/port_split.go b/vendor/src/k8s.io/kubernetes/pkg/util/net/port_split.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/net/port_split.go rename to vendor/src/k8s.io/kubernetes/pkg/util/net/port_split.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/net/util.go b/vendor/src/k8s.io/kubernetes/pkg/util/net/util.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/net/util.go rename to vendor/src/k8s.io/kubernetes/pkg/util/net/util.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/byte.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/byte.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/byte.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/byte.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/doc.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/doc.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/doc.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/doc.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/empty.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/empty.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/empty.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/empty.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/int.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/int.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/int.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/int.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/int64.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/int64.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/int64.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/int64.go diff --git a/vendor/k8s.io/kubernetes/pkg/util/sets/string.go b/vendor/src/k8s.io/kubernetes/pkg/util/sets/string.go similarity index 100% rename from vendor/k8s.io/kubernetes/pkg/util/sets/string.go rename to vendor/src/k8s.io/kubernetes/pkg/util/sets/string.go diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE similarity index 99% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE index 6277af76..5ba5c86f 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE +++ b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/blang/semver/LICENSE @@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/davecgh/go-spew/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/davecgh/go-spew/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/davecgh/go-spew/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/davecgh/go-spew/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE similarity index 99% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE index 5c304d1a..e06d2081 100644 --- a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE +++ b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/docker/distribution/LICENSE @@ -199,3 +199,4 @@ Apache License WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/emicklei/go-restful/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/emicklei/go-restful/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/emicklei/go-restful/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/emicklei/go-restful/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ghodss/yaml/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ghodss/yaml/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ghodss/yaml/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ghodss/yaml/LICENSE diff --git a/vendor/github.com/gogo/protobuf/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE similarity index 99% rename from vendor/github.com/gogo/protobuf/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE index 844aa54d..335e38e1 100644 --- a/vendor/github.com/gogo/protobuf/LICENSE +++ b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/gogo/protobuf/LICENSE @@ -33,3 +33,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/glog/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/glog/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/glog/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/glog/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/groupcache/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/groupcache/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/groupcache/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/golang/groupcache/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/google/gofuzz/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/google/gofuzz/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/google/gofuzz/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/google/gofuzz/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/imdario/mergo/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/imdario/mergo/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/imdario/mergo/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/imdario/mergo/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/juju/ratelimit/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/juju/ratelimit/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/juju/ratelimit/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/juju/ratelimit/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/pborman/uuid/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/pborman/uuid/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/pborman/uuid/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/pborman/uuid/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/spf13/pflag/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/spf13/pflag/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/spf13/pflag/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/spf13/pflag/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ugorji/go/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ugorji/go/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ugorji/go/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/github.com/ugorji/go/LICENSE diff --git a/vendor/golang.org/x/net/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/golang.org/x/net/LICENSE similarity index 100% rename from vendor/golang.org/x/net/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/golang.org/x/net/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/inf.v0/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/inf.v0/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/inf.v0/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/inf.v0/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE.libyaml similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE.libyaml rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/1.4/_vendor/gopkg.in/yaml.v2/LICENSE.libyaml diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/LICENSE b/vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/LICENSE rename to vendor/src/k8s.io/kubernetes/staging/src/k8s.io/client-go/LICENSE diff --git a/vendor/k8s.io/kubernetes/third_party/forked/golang/LICENSE b/vendor/src/k8s.io/kubernetes/third_party/forked/golang/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/third_party/forked/golang/LICENSE rename to vendor/src/k8s.io/kubernetes/third_party/forked/golang/LICENSE diff --git a/vendor/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE b/vendor/src/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE similarity index 81% rename from vendor/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE rename to vendor/src/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE index 54c86b92..a03114bc 100644 --- a/vendor/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE +++ b/vendor/src/k8s.io/kubernetes/third_party/forked/shell2junit/LICENSE @@ -10,162 +10,163 @@ shell2junit library and sample code is licensed under Apache License, v.2.0. Apache License Version 2.0, January 2004 -http://www.apache.org/licenses/ +http://www.apache.org/licenses/ 1. Definitions. -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. -"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License. +"Licensor" shall mean the copyright owner or entity authorized by the +copyright owner that is granting the License. -"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control with -that entity. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such -entity, whether by contract or otherwise, or (ii) ownership of fifty percent -(50%) or more of the outstanding shares, or (iii) beneficial ownership of -such entity. +"Legal Entity" shall mean the union of the acting entity and all other +entities that control, are controlled by, or are under common control with +that entity. For the purposes of this definition, "control" means (i) the +power, direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership of +such entity. -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, and -configuration files. +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, and +configuration files. -"Object" form shall mean any form resulting from mechanical transformation -or translation of a Source form, including but not limited to compiled -object code, generated documentation, and conversions to other media types. +"Object" form shall mean any form resulting from mechanical transformation +or translation of a Source form, including but not limited to compiled +object code, generated documentation, and conversions to other media types. -"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice that is -included in or attached to the work (an example is provided in the Appendix -below). +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice that is +included in or attached to the work (an example is provided in the Appendix +below). -"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, as a -whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, or -merely link (or bind by name) to the interfaces of, the Work and Derivative -Works thereof. +"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, as a +whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, or +merely link (or bind by name) to the interfaces of, the Work and Derivative +Works thereof. -"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor for -inclusion in the Work by the copyright owner or by an individual or Legal -Entity authorized to submit on behalf of the copyright owner. For the -purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Licensor or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that -are managed by, or on behalf of, the Licensor for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by the copyright owner as "Not a -Contribution." +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor for +inclusion in the Work by the copyright owner or by an individual or Legal +Entity authorized to submit on behalf of the copyright owner. For the +purposes of this definition, "submitted" means any form of electronic, +verbal, or written communication sent to the Licensor or its +representatives, including but not limited to communication on electronic +mailing lists, source code control systems, and issue tracking systems that +are managed by, or on behalf of, the Licensor for the purpose of discussing +and improving the Work, but excluding communication that is conspicuously +marked or otherwise designated in writing by the copyright owner as "Not a +Contribution." -"Contributor" shall mean Licensor and any individual or Legal Entity on -behalf of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. +"Contributor" shall mean Licensor and any individual or Legal Entity on +behalf of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. -2. Grant of Copyright License. Subject to the terms and conditions of this -License, each Contributor hereby grants to You a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable copyright license to -reproduce, prepare Derivative Works of, publicly display, publicly perform, -sublicense, and distribute the Work and such Derivative Works in Source or -Object form. +2. Grant of Copyright License. Subject to the terms and conditions of this +License, each Contributor hereby grants to You a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable copyright license to +reproduce, prepare Derivative Works of, publicly display, publicly perform, +sublicense, and distribute the Work and such Derivative Works in Source or +Object form. -3. Grant of Patent License. Subject to the terms and conditions of this -License, each Contributor hereby grants to You a perpetual, worldwide, -non-exclusive, no-charge, royalty-free, irrevocable (except as stated in -this section) patent license to make, have made, use, offer to sell, sell, -import, and otherwise transfer the Work, where such license applies only to -those patent claims licensable by such Contributor that are necessarily -infringed by their Contribution(s) alone or by combination of their -Contribution(s) with the Work to which such Contribution(s) was submitted. -If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this -License for that Work shall terminate as of the date such litigation is -filed. +3. Grant of Patent License. Subject to the terms and conditions of this +License, each Contributor hereby grants to You a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable (except as stated in +this section) patent license to make, have made, use, offer to sell, sell, +import, and otherwise transfer the Work, where such license applies only to +those patent claims licensable by such Contributor that are necessarily +infringed by their Contribution(s) alone or by combination of their +Contribution(s) with the Work to which such Contribution(s) was submitted. +If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation is +filed. -4. Redistribution. You may reproduce and distribute copies of the Work or -Derivative Works thereof in any medium, with or without modifications, and -in Source or Object form, provided that You meet the following conditions: +4. Redistribution. You may reproduce and distribute copies of the Work or +Derivative Works thereof in any medium, with or without modifications, and +in Source or Object form, provided that You meet the following conditions: -a. You must give any other recipients of the Work or Derivative Works a copy -of this License; and +a. You must give any other recipients of the Work or Derivative Works a copy +of this License; and -b. You must cause any modified files to carry prominent notices stating that -You changed the files; and +b. You must cause any modified files to carry prominent notices stating that +You changed the files; and -c. You must retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices from -the Source form of the Work, excluding those notices that do not pertain to -any part of the Derivative Works; and +c. You must retain, in the Source form of any Derivative Works that You +distribute, all copyright, patent, trademark, and attribution notices from +the Source form of the Work, excluding those notices that do not pertain to +any part of the Derivative Works; and -d. If the Work includes a "NOTICE" text file as part of its distribution, -then any Derivative Works that You distribute must include a readable copy -of the attribution notices contained within such NOTICE file, excluding -those notices that do not pertain to any part of the Derivative Works, in at -least one of the following places: within a NOTICE text file distributed as -part of the Derivative Works; within the Source form or documentation, if -provided along with the Derivative Works; or, within a display generated by -the Derivative Works, if and wherever such third-party notices normally -appear. The contents of the NOTICE file are for informational purposes only -and do not modify the License. You may add Your own attribution notices -within Derivative Works that You distribute, alongside or as an addendum to -the NOTICE text from the Work, provided that such additional attribution +d. If the Work includes a "NOTICE" text file as part of its distribution, +then any Derivative Works that You distribute must include a readable copy +of the attribution notices contained within such NOTICE file, excluding +those notices that do not pertain to any part of the Derivative Works, in at +least one of the following places: within a NOTICE text file distributed as +part of the Derivative Works; within the Source form or documentation, if +provided along with the Derivative Works; or, within a display generated by +the Derivative Works, if and wherever such third-party notices normally +appear. The contents of the NOTICE file are for informational purposes only +and do not modify the License. You may add Your own attribution notices +within Derivative Works that You distribute, alongside or as an addendum to +the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. -You may add Your own copyright statement to Your modifications and may -provide additional or different license terms and conditions for use, -reproduction, or distribution of Your modifications, or for any such -Derivative Works as a whole, provided Your use, reproduction, and -distribution of the Work otherwise complies with the conditions stated in -this License. +You may add Your own copyright statement to Your modifications and may +provide additional or different license terms and conditions for use, +reproduction, or distribution of Your modifications, or for any such +Derivative Works as a whole, provided Your use, reproduction, and +distribution of the Work otherwise complies with the conditions stated in +this License. -5. Submission of Contributions. Unless You explicitly state otherwise, any -Contribution intentionally submitted for inclusion in the Work by You to the -Licensor shall be under the terms and conditions of this License, without -any additional terms or conditions. Notwithstanding the above, nothing -herein shall supersede or modify the terms of any separate license agreement -you may have executed with Licensor regarding such Contributions. +5. Submission of Contributions. Unless You explicitly state otherwise, any +Contribution intentionally submitted for inclusion in the Work by You to the +Licensor shall be under the terms and conditions of this License, without +any additional terms or conditions. Notwithstanding the above, nothing +herein shall supersede or modify the terms of any separate license agreement +you may have executed with Licensor regarding such Contributions. -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, except -as required for reasonable and customary use in describing the origin of the -Work and reproducing the content of the NOTICE file. +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, except +as required for reasonable and customary use in describing the origin of the +Work and reproducing the content of the NOTICE file. -7. Disclaimer of Warranty. Unless required by applicable law or agreed to in -writing, Licensor provides the Work (and each Contributor provides its -Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied, including, without limitation, any -warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or -FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining -the appropriateness of using or redistributing the Work and assume any risks -associated with Your exercise of permissions under this License. +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in +writing, Licensor provides the Work (and each Contributor provides its +Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied, including, without limitation, any +warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or +FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining +the appropriateness of using or redistributing the Work and assume any risks +associated with Your exercise of permissions under this License. -8. Limitation of Liability. In no event and under no legal theory, whether -in tort (including negligence), contract, or otherwise, unless required by -applicable law (such as deliberate and grossly negligent acts) or agreed to -in writing, shall any Contributor be liable to You for damages, including -any direct, indirect, special, incidental, or consequential damages of any -character arising as a result of this License or out of the use or inability -to use the Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all other -commercial damages or losses), even if such Contributor has been advised of -the possibility of such damages. +8. Limitation of Liability. In no event and under no legal theory, whether +in tort (including negligence), contract, or otherwise, unless required by +applicable law (such as deliberate and grossly negligent acts) or agreed to +in writing, shall any Contributor be liable to You for damages, including +any direct, indirect, special, incidental, or consequential damages of any +character arising as a result of this License or out of the use or inability +to use the Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all other +commercial damages or losses), even if such Contributor has been advised of +the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work +or Derivative Works thereof, You may choose to offer, and charge a fee for, +acceptance of support, warranty, indemnity, or other liability obligations +and/or rights consistent with this License. However, in accepting such +obligations, You may act only on Your own behalf and on Your sole +responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any +liability incurred by, or claims asserted against, such Contributor by +reason of your accepting any such warranty or additional liability. -9. Accepting Warranty or Additional Liability. While redistributing the Work -or Derivative Works thereof, You may choose to offer, and charge a fee for, -acceptance of support, warranty, indemnity, or other liability obligations -and/or rights consistent with this License. However, in accepting such -obligations, You may act only on Your own behalf and on Your sole -responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any -liability incurred by, or claims asserted against, such Contributor by -reason of your accepting any such warranty or additional liability. diff --git a/vendor/k8s.io/kubernetes/third_party/htpasswd/COPYING b/vendor/src/k8s.io/kubernetes/third_party/htpasswd/COPYING similarity index 100% rename from vendor/k8s.io/kubernetes/third_party/htpasswd/COPYING rename to vendor/src/k8s.io/kubernetes/third_party/htpasswd/COPYING diff --git a/vendor/k8s.io/kubernetes/third_party/intemp/LICENSE b/vendor/src/k8s.io/kubernetes/third_party/intemp/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/third_party/intemp/LICENSE rename to vendor/src/k8s.io/kubernetes/third_party/intemp/LICENSE diff --git a/vendor/k8s.io/kubernetes/third_party/swagger-ui/LICENSE b/vendor/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE similarity index 100% rename from vendor/k8s.io/kubernetes/third_party/swagger-ui/LICENSE rename to vendor/src/k8s.io/kubernetes/third_party/swagger-ui/LICENSE