Merge pull request #96425 from bobbypage/vendor-cadvisor-v0.38

Vendor cadvisor v0.38.4

Kubernetes-commit: 41533ecec8966636554faba44368a36d5d6c5347
This commit is contained in:
Kubernetes Publisher 2020-11-13 15:15:05 -08:00
parent c6e972835b
commit f39294d463
3 changed files with 70 additions and 51 deletions

82
Godeps/Godeps.json generated
View File

@ -8,15 +8,15 @@
"Deps": [ "Deps": [
{ {
"ImportPath": "cloud.google.com/go", "ImportPath": "cloud.google.com/go",
"Rev": "v0.51.0" "Rev": "v0.54.0"
}, },
{ {
"ImportPath": "cloud.google.com/go/bigquery", "ImportPath": "cloud.google.com/go/bigquery",
"Rev": "v1.0.1" "Rev": "v1.4.0"
}, },
{ {
"ImportPath": "cloud.google.com/go/datastore", "ImportPath": "cloud.google.com/go/datastore",
"Rev": "v1.0.0" "Rev": "v1.1.0"
}, },
{ {
"ImportPath": "cloud.google.com/go/firestore", "ImportPath": "cloud.google.com/go/firestore",
@ -24,11 +24,11 @@
}, },
{ {
"ImportPath": "cloud.google.com/go/pubsub", "ImportPath": "cloud.google.com/go/pubsub",
"Rev": "v1.0.1" "Rev": "v1.2.0"
}, },
{ {
"ImportPath": "cloud.google.com/go/storage", "ImportPath": "cloud.google.com/go/storage",
"Rev": "v1.0.0" "Rev": "v1.6.0"
}, },
{ {
"ImportPath": "dmitri.shuralyov.com/gpu/mtl", "ImportPath": "dmitri.shuralyov.com/gpu/mtl",
@ -132,7 +132,7 @@
}, },
{ {
"ImportPath": "github.com/blang/semver", "ImportPath": "github.com/blang/semver",
"Rev": "v3.5.0" "Rev": "v3.5.1"
}, },
{ {
"ImportPath": "github.com/census-instrumentation/opencensus-proto", "ImportPath": "github.com/census-instrumentation/opencensus-proto",
@ -272,7 +272,7 @@
}, },
{ {
"ImportPath": "github.com/go-gl/glfw/v3.3/glfw", "ImportPath": "github.com/go-gl/glfw/v3.3/glfw",
"Rev": "12ad95a8df72" "Rev": "6f7a984d4dc4"
}, },
{ {
"ImportPath": "github.com/go-kit/kit", "ImportPath": "github.com/go-kit/kit",
@ -316,15 +316,15 @@
}, },
{ {
"ImportPath": "github.com/golang/groupcache", "ImportPath": "github.com/golang/groupcache",
"Rev": "215e87163ea7" "Rev": "8c9f03a8e57e"
}, },
{ {
"ImportPath": "github.com/golang/mock", "ImportPath": "github.com/golang/mock",
"Rev": "v1.3.1" "Rev": "v1.4.1"
}, },
{ {
"ImportPath": "github.com/golang/protobuf", "ImportPath": "github.com/golang/protobuf",
"Rev": "v1.4.2" "Rev": "v1.4.3"
}, },
{ {
"ImportPath": "github.com/golangplus/bytes", "ImportPath": "github.com/golangplus/bytes",
@ -344,7 +344,7 @@
}, },
{ {
"ImportPath": "github.com/google/go-cmp", "ImportPath": "github.com/google/go-cmp",
"Rev": "v0.4.0" "Rev": "v0.5.2"
}, },
{ {
"ImportPath": "github.com/google/gofuzz", "ImportPath": "github.com/google/gofuzz",
@ -356,7 +356,7 @@
}, },
{ {
"ImportPath": "github.com/google/pprof", "ImportPath": "github.com/google/pprof",
"Rev": "d4f498aebedc" "Rev": "1ebb73c60ed3"
}, },
{ {
"ImportPath": "github.com/google/renameio", "ImportPath": "github.com/google/renameio",
@ -364,7 +364,7 @@
}, },
{ {
"ImportPath": "github.com/google/uuid", "ImportPath": "github.com/google/uuid",
"Rev": "v1.1.1" "Rev": "v1.1.2"
}, },
{ {
"ImportPath": "github.com/googleapis/gax-go/v2", "ImportPath": "github.com/googleapis/gax-go/v2",
@ -672,7 +672,7 @@
}, },
{ {
"ImportPath": "github.com/prometheus/procfs", "ImportPath": "github.com/prometheus/procfs",
"Rev": "v0.1.3" "Rev": "v0.2.0"
}, },
{ {
"ImportPath": "github.com/prometheus/tsdb", "ImportPath": "github.com/prometheus/tsdb",
@ -756,7 +756,7 @@
}, },
{ {
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
"Rev": "v1.4.0" "Rev": "v1.6.1"
}, },
{ {
"ImportPath": "github.com/subosito/gotenv", "ImportPath": "github.com/subosito/gotenv",
@ -780,7 +780,7 @@
}, },
{ {
"ImportPath": "go.opencensus.io", "ImportPath": "go.opencensus.io",
"Rev": "v0.22.2" "Rev": "v0.22.3"
}, },
{ {
"ImportPath": "go.uber.org/atomic", "ImportPath": "go.uber.org/atomic",
@ -800,7 +800,7 @@
}, },
{ {
"ImportPath": "golang.org/x/exp", "ImportPath": "golang.org/x/exp",
"Rev": "da58074b4299" "Rev": "6cc2880d07d6"
}, },
{ {
"ImportPath": "golang.org/x/image", "ImportPath": "golang.org/x/image",
@ -808,7 +808,7 @@
}, },
{ {
"ImportPath": "golang.org/x/lint", "ImportPath": "golang.org/x/lint",
"Rev": "fdd1cda4f05f" "Rev": "738671d3881b"
}, },
{ {
"ImportPath": "golang.org/x/mobile", "ImportPath": "golang.org/x/mobile",
@ -824,7 +824,7 @@
}, },
{ {
"ImportPath": "golang.org/x/oauth2", "ImportPath": "golang.org/x/oauth2",
"Rev": "858c2ad4c8b6" "Rev": "bf48bf16ab8d"
}, },
{ {
"ImportPath": "golang.org/x/sync", "ImportPath": "golang.org/x/sync",
@ -836,11 +836,11 @@
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "v0.3.3" "Rev": "v0.3.4"
}, },
{ {
"ImportPath": "golang.org/x/time", "ImportPath": "golang.org/x/time",
"Rev": "555d28b269f0" "Rev": "3af7569d3a1e"
}, },
{ {
"ImportPath": "golang.org/x/tools", "ImportPath": "golang.org/x/tools",
@ -848,11 +848,11 @@
}, },
{ {
"ImportPath": "golang.org/x/xerrors", "ImportPath": "golang.org/x/xerrors",
"Rev": "9bdfabe68543" "Rev": "5ec99f83aff1"
}, },
{ {
"ImportPath": "google.golang.org/api", "ImportPath": "google.golang.org/api",
"Rev": "v0.15.0" "Rev": "v0.20.0"
}, },
{ {
"ImportPath": "google.golang.org/appengine", "ImportPath": "google.golang.org/appengine",
@ -864,11 +864,11 @@
}, },
{ {
"ImportPath": "google.golang.org/grpc", "ImportPath": "google.golang.org/grpc",
"Rev": "v1.27.0" "Rev": "v1.27.1"
}, },
{ {
"ImportPath": "google.golang.org/protobuf", "ImportPath": "google.golang.org/protobuf",
"Rev": "v1.24.0" "Rev": "v1.25.0"
}, },
{ {
"ImportPath": "gopkg.in/alecthomas/kingpin.v2", "ImportPath": "gopkg.in/alecthomas/kingpin.v2",
@ -906,6 +906,10 @@
"ImportPath": "gopkg.in/yaml.v2", "ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.8" "Rev": "v2.2.8"
}, },
{
"ImportPath": "gopkg.in/yaml.v3",
"Rev": "9f266ea9e77c"
},
{ {
"ImportPath": "gotest.tools", "ImportPath": "gotest.tools",
"Rev": "v2.2.0" "Rev": "v2.2.0"
@ -916,35 +920,35 @@
}, },
{ {
"ImportPath": "honnef.co/go/tools", "ImportPath": "honnef.co/go/tools",
"Rev": "v0.0.1-2019.2.3" "Rev": "v0.0.1-2020.1.3"
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "e29b22345993" "Rev": "ccdf63aa6ee8"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "323157012f87" "Rev": "65a627a281ee"
}, },
{ {
"ImportPath": "k8s.io/cli-runtime", "ImportPath": "k8s.io/cli-runtime",
"Rev": "fbe98341a6e2" "Rev": "1dd5b70cce55"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "d396fd99ebba" "Rev": "4ab8fb4585a5"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "ebc5cde1959a" "Rev": "18d1afbd2833"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "3e59e5bc0401" "Rev": "9894bfc661fe"
}, },
{ {
"ImportPath": "k8s.io/component-helpers", "ImportPath": "k8s.io/component-helpers",
"Rev": "77b3698ccf7c" "Rev": "12ccb9f27b2c"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -960,16 +964,24 @@
}, },
{ {
"ImportPath": "k8s.io/metrics", "ImportPath": "k8s.io/metrics",
"Rev": "f246df756006" "Rev": "5165134a210d"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",
"Rev": "8146046b121e" "Rev": "67b214c5f920"
}, },
{ {
"ImportPath": "rsc.io/binaryregexp", "ImportPath": "rsc.io/binaryregexp",
"Rev": "v0.2.0" "Rev": "v0.2.0"
}, },
{
"ImportPath": "rsc.io/quote/v3",
"Rev": "v3.1.0"
},
{
"ImportPath": "rsc.io/sampler",
"Rev": "v1.3.0"
},
{ {
"ImportPath": "sigs.k8s.io/kustomize", "ImportPath": "sigs.k8s.io/kustomize",
"Rev": "v2.0.3" "Rev": "v2.0.3"

31
go.mod
View File

@ -34,28 +34,27 @@ require (
github.com/stretchr/testify v1.6.1 github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/cli-runtime v0.0.0 k8s.io/cli-runtime v0.0.0-20201114011601-1dd5b70cce55
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20201114010252-9894bfc661fe
k8s.io/component-helpers v0.0.0 k8s.io/component-helpers v0.0.0-20201114010350-12ccb9f27b2c
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622
k8s.io/metrics v0.0.0 k8s.io/metrics v0.0.0-20201114011454-5165134a210d
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/cli-runtime => ../cli-runtime k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201114011601-1dd5b70cce55
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201114005222-18d1afbd2833
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20201114010252-9894bfc661fe
k8s.io/component-helpers => ../component-helpers k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201114010350-12ccb9f27b2c
k8s.io/kubectl => ../kubectl k8s.io/metrics => k8s.io/metrics v0.0.0-20201114011454-5165134a210d
k8s.io/metrics => ../metrics
) )

8
go.sum
View File

@ -633,6 +633,13 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8/go.mod h1:gWbPsp77mlP9ze/MsTGn1keIW3+fq/3AORAT453pf04=
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee/go.mod h1:legT3ySyyLFPOHkL8znm+gYpXm5mr3eGzpY2TFuH//M=
k8s.io/cli-runtime v0.0.0-20201114011601-1dd5b70cce55/go.mod h1:VZBRn8i+Hf2Zb3hPz6rhP+tCFSkYkVw0oDpbilxTCIE=
k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5/go.mod h1:4JoZy1wCRKFTVU4xsCplBlOsWEoxbDQVh0TAHFcULig=
k8s.io/code-generator v0.0.0-20201114005222-18d1afbd2833/go.mod h1:dMIgsm513fn9KilGhdhMNeNjYXjEPHHzrspd8cHDHd4=
k8s.io/component-base v0.0.0-20201114010252-9894bfc661fe/go.mod h1:qjXRB1B7gX0x1RzP+3mKuyrJLhALuQe+rsJAzdMEa4U=
k8s.io/component-helpers v0.0.0-20201114010350-12ccb9f27b2c/go.mod h1:NuTyrb6pjIcEHNECbLLCI/GZ3XpLYIsE3TrHSF8xHME=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -640,6 +647,7 @@ k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 h1:CJasJGBT+Atu2XLJHJ90GJBqW23sfBn4vtTlB/+aJJ4= k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 h1:CJasJGBT+Atu2XLJHJ90GJBqW23sfBn4vtTlB/+aJJ4=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/metrics v0.0.0-20201114011454-5165134a210d/go.mod h1:Kqhcw0Yxoqw01cU6ETHNiWfM1d6LjEfmuQzISj2v4Ho=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=