diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 25d1d80fe2a..0cfd0cb41a5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -446,47 +446,47 @@ }, { "ImportPath": "github.com/containerd/containerd/api/services/containers/v1", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/api/services/tasks/v1", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/api/services/version/v1", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/api/types", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/api/types/task", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/containers", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/dialer", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/errdefs", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { "ImportPath": "github.com/containerd/containerd/namespaces", - "Comment": "v1.0.0-beta.2-159-g27d450a0", + "Comment": "v1.0.0-beta.2-159-g27d450a", "Rev": "27d450a01bb533d7ebc5701eb52792565396b084" }, { @@ -1006,162 +1006,162 @@ }, { "ImportPath": "github.com/docker/distribution/digestset", - "Comment": "v2.6.0-rc.1-209-gedc3ab29", + "Comment": "v2.6.0-rc.1-209-gedc3ab2", "Rev": "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" }, { "ImportPath": "github.com/docker/distribution/reference", - "Comment": "v2.6.0-rc.1-209-gedc3ab29", + "Comment": "v2.6.0-rc.1-209-gedc3ab2", "Rev": "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" }, { "ImportPath": "github.com/docker/docker/api", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/blkiodev", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/container", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/events", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/filters", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/image", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/mount", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/network", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/registry", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/strslice", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/swarm", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/swarm/runtime", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/time", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/versions", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/api/types/volume", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/client", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/ioutils", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/jsonlog", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/jsonmessage", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/longpath", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/mount", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/stdcopy", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/system", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/term", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/term/windows", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/docker/pkg/tlsconfig", - "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1", + "Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f", "Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756" }, { "ImportPath": "github.com/docker/go-connections/nat", - "Comment": "v0.3.0", + "Comment": "v0.2.1-30-g3ede32e", "Rev": "3ede32e2033de7505e6500d6c868c2b9ed9f169d" }, { "ImportPath": "github.com/docker/go-connections/sockets", - "Comment": "v0.3.0", + "Comment": "v0.2.1-30-g3ede32e", "Rev": "3ede32e2033de7505e6500d6c868c2b9ed9f169d" }, { "ImportPath": "github.com/docker/go-connections/tlsconfig", - "Comment": "v0.3.0", + "Comment": "v0.2.1-30-g3ede32e", "Rev": "3ede32e2033de7505e6500d6c868c2b9ed9f169d" }, { @@ -1171,7 +1171,7 @@ }, { "ImportPath": "github.com/docker/libnetwork/ipvs", - "Comment": "v0.8.0-dev.2-910-gba46b928", + "Comment": "v0.8.0-dev.2-910-gba46b92", "Rev": "ba46b928444931e6865d8618dc03622cac79aa6f" }, { @@ -1298,132 +1298,132 @@ }, { "ImportPath": "github.com/gogo/protobuf/gogoproto", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/compare", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/defaultcheck", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/description", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/embedcheck", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/enumstringer", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/equal", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/face", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/gostring", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/marshalto", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/oneofcheck", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/populate", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/size", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/stringer", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/testgen", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/union", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/plugin/unmarshal", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/proto", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/descriptor", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/generator", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/grpc", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/protoc-gen-gogo/plugin", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/sortkeys", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/types", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/vanity", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { "ImportPath": "github.com/gogo/protobuf/vanity/command", - "Comment": "v0.4-3-gc0656edd", + "Comment": "v0.4-3-gc0656ed", "Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7" }, { @@ -1480,218 +1480,218 @@ }, { "ImportPath": "github.com/google/cadvisor/accelerators", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/api", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/cache/memory", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/client/v2", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/collector", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/common", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/containerd", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/crio", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/docker", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/libcontainer", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/raw", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/rkt", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/container/systemd", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/devicemapper", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/events", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/fs", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/healthz", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/http", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/http/mux", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/info/v1", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/info/v2", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/machine", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/manager", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/raw", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/manager/watcher/rkt", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/metrics", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/pages", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/pages/static", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/storage", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/summary", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/cloudinfo", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/cpuload/netlink", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/docker", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/oomparser", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/sysfs", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/utils/sysinfo", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/validate", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/version", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/cadvisor/zfs", - "Comment": "v0.28.3-7-g13d955d6", - "Rev": "13d955d6a9faa2f70387354ff17df3d614a6c37b" + "Comment": "v0.28.3-20-g6116f26", + "Rev": "6116f265302357cbb10f84737af30b1f13ce2d6c" }, { "ImportPath": "github.com/google/certificate-transparency/go", @@ -2345,82 +2345,82 @@ }, { "ImportPath": "github.com/opencontainers/runc/libcontainer", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/apparmor", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/fs", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/systemd", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/configs", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/configs/validate", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/criurpc", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/intelrdt", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/keys", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/mount", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/seccomp", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/stacktrace", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/system", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/user", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { "ImportPath": "github.com/opencontainers/runc/libcontainer/utils", - "Comment": "v1.0.0-rc4-197-gd5b4a3ed", + "Comment": "v1.0.0-rc4-197-gd5b4a3e", "Rev": "d5b4a3eddbe4c890843da971b64f45a0f023f4db" }, { diff --git a/vendor/BUILD b/vendor/BUILD index 3e3c243c36b..3eb12bb6415 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -273,7 +273,6 @@ filegroup( "//vendor/github.com/jonboulle/clockwork:all-srcs", "//vendor/github.com/json-iterator/go:all-srcs", "//vendor/github.com/jteeuwen/go-bindata:all-srcs", - "//vendor/github.com/juju/ratelimit:all-srcs", "//vendor/github.com/kardianos/osext:all-srcs", "//vendor/github.com/kr/fs:all-srcs", "//vendor/github.com/kr/pretty:all-srcs", diff --git a/vendor/github.com/google/cadvisor/container/containerd/client.go b/vendor/github.com/google/cadvisor/container/containerd/client.go index 182fd010b29..365f54a71ac 100644 --- a/vendor/github.com/google/cadvisor/container/containerd/client.go +++ b/vendor/github.com/google/cadvisor/container/containerd/client.go @@ -16,6 +16,7 @@ package containerd import ( "context" + "sync" "time" containersapi "github.com/containerd/containerd/api/services/containers/v1" @@ -45,32 +46,38 @@ type containerdClient interface { Version(ctx context.Context) (string, error) } +var once sync.Once +var ctrdClient containerdClient = nil + // Client creates a containerd client func Client() (containerdClient, error) { - gopts := []grpc.DialOption{ - grpc.WithInsecure(), - grpc.FailOnNonTempDialError(true), - grpc.WithDialer(dialer.Dialer), - grpc.WithBlock(), - grpc.WithTimeout(2 * time.Second), - grpc.WithBackoffMaxDelay(3 * time.Second), - } - unary, stream := newNSInterceptors(k8sNamespace) - gopts = append(gopts, - grpc.WithUnaryInterceptor(unary), - grpc.WithStreamInterceptor(stream), - ) + var retErr error + once.Do(func() { + gopts := []grpc.DialOption{ + grpc.WithInsecure(), + grpc.WithDialer(dialer.Dialer), + grpc.WithBlock(), + grpc.WithTimeout(2 * time.Second), + grpc.WithBackoffMaxDelay(3 * time.Second), + } + unary, stream := newNSInterceptors(k8sNamespace) + gopts = append(gopts, + grpc.WithUnaryInterceptor(unary), + grpc.WithStreamInterceptor(stream), + ) - conn, err := grpc.Dial(dialer.DialAddress("/var/run/containerd/containerd.sock"), gopts...) - if err != nil { - return nil, err - } - c := &client{ - containerService: containersapi.NewContainersClient(conn), - taskService: tasksapi.NewTasksClient(conn), - versionService: versionapi.NewVersionClient(conn), - } - return c, err + conn, err := grpc.Dial(dialer.DialAddress("/var/run/containerd/containerd.sock"), gopts...) + if err != nil { + retErr = err + return + } + ctrdClient = &client{ + containerService: containersapi.NewContainersClient(conn), + taskService: tasksapi.NewTasksClient(conn), + versionService: versionapi.NewVersionClient(conn), + } + }) + return ctrdClient, retErr } func (c *client) LoadContainer(ctx context.Context, id string) (*containers.Container, error) { diff --git a/vendor/github.com/google/cadvisor/container/docker/docker.go b/vendor/github.com/google/cadvisor/container/docker/docker.go index b0ed227dda0..f1cda2be8f5 100644 --- a/vendor/github.com/google/cadvisor/container/docker/docker.go +++ b/vendor/github.com/google/cadvisor/container/docker/docker.go @@ -29,19 +29,27 @@ import ( "github.com/google/cadvisor/machine" ) -const defaultTimeout = time.Second * 5 +var dockerTimeout = 10 * time.Second func defaultContext() context.Context { - ctx, _ := context.WithTimeout(context.Background(), defaultTimeout) + ctx, _ := context.WithTimeout(context.Background(), dockerTimeout) return ctx } +func SetTimeout(timeout time.Duration) { + dockerTimeout = timeout +} + func Status() (v1.DockerStatus, error) { + return StatusWithContext(defaultContext()) +} + +func StatusWithContext(ctx context.Context) (v1.DockerStatus, error) { client, err := Client() if err != nil { return v1.DockerStatus{}, fmt.Errorf("unable to communicate with docker daemon: %v", err) } - dockerInfo, err := client.Info(defaultContext()) + dockerInfo, err := client.Info(ctx) if err != nil { return v1.DockerStatus{}, err } diff --git a/vendor/github.com/google/cadvisor/container/docker/handler.go b/vendor/github.com/google/cadvisor/container/docker/handler.go index c5c46ae4bf2..8f63d02eb04 100644 --- a/vendor/github.com/google/cadvisor/container/docker/handler.go +++ b/vendor/github.com/google/cadvisor/container/docker/handler.go @@ -44,6 +44,7 @@ import ( const ( // The read write layers exist here. aufsRWLayer = "diff" + overlayRWLayer = "upper" overlay2RWLayer = "diff" // Path to the directory where docker stores log files if the json logging driver is enabled. @@ -197,7 +198,7 @@ func newDockerContainerHandler( case aufsStorageDriver: rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID) case overlayStorageDriver: - rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID) + rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlayRWLayer) case overlay2StorageDriver: rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer) case zfsStorageDriver: diff --git a/vendor/github.com/google/cadvisor/fs/fs.go b/vendor/github.com/google/cadvisor/fs/fs.go index ae11b576802..b86ec36efed 100644 --- a/vendor/github.com/google/cadvisor/fs/fs.go +++ b/vendor/github.com/google/cadvisor/fs/fs.go @@ -114,7 +114,9 @@ func NewFsInfo(context Context) (FsInfo, error) { fsUUIDToDeviceName, err := getFsUUIDToDeviceNameMap() if err != nil { - return nil, err + // UUID is not always avaiable across different OS distributions. + // Do not fail if there is an error. + glog.Warningf("Failed to get disk UUID mapping, getting disk info by uuid will not work: %v", err) } // Avoid devicemapper container mounts - these are tracked by the ThinPoolWatcher diff --git a/vendor/github.com/google/cadvisor/manager/BUILD b/vendor/github.com/google/cadvisor/manager/BUILD index d61c2d96a39..892264811ac 100644 --- a/vendor/github.com/google/cadvisor/manager/BUILD +++ b/vendor/github.com/google/cadvisor/manager/BUILD @@ -35,6 +35,7 @@ go_library( "//vendor/github.com/google/cadvisor/utils/sysfs:go_default_library", "//vendor/github.com/google/cadvisor/version:go_default_library", "//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library", + "//vendor/golang.org/x/net/context:go_default_library", "//vendor/k8s.io/utils/clock:go_default_library", ], ) diff --git a/vendor/github.com/google/cadvisor/manager/container.go b/vendor/github.com/google/cadvisor/manager/container.go index 8193bb5e375..88dd7c15365 100644 --- a/vendor/github.com/google/cadvisor/manager/container.go +++ b/vendor/github.com/google/cadvisor/manager/container.go @@ -504,7 +504,7 @@ func (c *containerData) housekeepingTick(timer <-chan time.Time, longHousekeepin err := c.updateStats() if err != nil { if c.allowErrorLogging() { - glog.Warning("Failed to update stats for container \"%s\": %s", c.info.Name, err) + glog.Warningf("Failed to update stats for container \"%s\": %s", c.info.Name, err) } } // Log if housekeeping took too long. diff --git a/vendor/github.com/google/cadvisor/manager/manager.go b/vendor/github.com/google/cadvisor/manager/manager.go index 08955833bff..10a725f7eb5 100644 --- a/vendor/github.com/google/cadvisor/manager/manager.go +++ b/vendor/github.com/google/cadvisor/manager/manager.go @@ -50,6 +50,7 @@ import ( "github.com/golang/glog" "github.com/opencontainers/runc/libcontainer/cgroups" + "golang.org/x/net/context" "k8s.io/utils/clock" ) @@ -59,6 +60,8 @@ var eventStorageAgeLimit = flag.String("event_storage_age_limit", "default=24h", var eventStorageEventLimit = flag.String("event_storage_event_limit", "default=100000", "Max number of events to store (per type). Value is a comma separated list of key values, where the keys are event types (e.g.: creation, oom) or \"default\" and the value is an integer. Default is applied to all non-specified event types") var applicationMetricsCountLimit = flag.Int("application_metrics_count_limit", 100, "Max number of application metrics to store (per container)") +const dockerClientTimeout = 10 * time.Second + // The Manager interface defines operations for starting a manager and getting // container and machine information. type Manager interface { @@ -154,11 +157,10 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn dockerStatus info.DockerStatus rktPath string ) - if tempDockerStatus, err := docker.Status(); err != nil { - glog.V(5).Infof("Docker not connected: %v", err) - } else { - dockerStatus = tempDockerStatus - } + docker.SetTimeout(dockerClientTimeout) + // Try to connect to docker indefinitely on startup. + dockerStatus = retryDockerStatus() + if tmpRktPath, err := rkt.RktPath(); err != nil { glog.V(5).Infof("Rkt not connected: %v", err) } else { @@ -234,6 +236,31 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn return newManager, nil } +func retryDockerStatus() info.DockerStatus { + startupTimeout := dockerClientTimeout + maxTimeout := 4 * startupTimeout + for { + ctx, _ := context.WithTimeout(context.Background(), startupTimeout) + dockerStatus, err := docker.StatusWithContext(ctx) + if err != nil { + return dockerStatus + } + + switch err { + case context.DeadlineExceeded: + glog.Warningf("Timeout trying to communicate with docker during initialization, will retry") + default: + glog.V(5).Infof("Docker not connected: %v", err) + return info.DockerStatus{} + } + + startupTimeout = 2 * startupTimeout + if startupTimeout > maxTimeout { + startupTimeout = maxTimeout + } + } +} + // A namespaced container name. type namespacedContainerName struct { // The namespace of the container. Can be empty for the root namespace. diff --git a/vendor/github.com/juju/ratelimit/BUILD b/vendor/github.com/juju/ratelimit/BUILD deleted file mode 100644 index d5c5a773d7f..00000000000 --- a/vendor/github.com/juju/ratelimit/BUILD +++ /dev/null @@ -1,25 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "ratelimit.go", - "reader.go", - ], - importpath = "github.com/juju/ratelimit", - visibility = ["//visibility:public"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -)