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 4bbb204f15
commit 4ab8fb4585
3 changed files with 51 additions and 34 deletions

74
Godeps/Godeps.json generated
View File

@ -8,23 +8,23 @@
"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/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",
@ -150,9 +150,13 @@
"ImportPath": "github.com/ghodss/yaml", "ImportPath": "github.com/ghodss/yaml",
"Rev": "73d445a93680" "Rev": "73d445a93680"
}, },
{
"ImportPath": "github.com/go-gl/glfw",
"Rev": "e6da0acd62b1"
},
{ {
"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-logr/logr", "ImportPath": "github.com/go-logr/logr",
@ -184,15 +188,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/google/btree", "ImportPath": "github.com/google/btree",
@ -200,7 +204,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",
@ -212,7 +216,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",
@ -220,7 +224,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",
@ -344,11 +348,11 @@
}, },
{ {
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
"Rev": "v1.4.0" "Rev": "v1.6.1"
}, },
{ {
"ImportPath": "go.opencensus.io", "ImportPath": "go.opencensus.io",
"Rev": "v0.22.2" "Rev": "v0.22.3"
}, },
{ {
"ImportPath": "golang.org/x/crypto", "ImportPath": "golang.org/x/crypto",
@ -356,7 +360,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",
@ -364,7 +368,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",
@ -372,7 +376,7 @@
}, },
{ {
"ImportPath": "golang.org/x/mod", "ImportPath": "golang.org/x/mod",
"Rev": "c90efee705ee" "Rev": "v0.2.0"
}, },
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
@ -380,7 +384,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",
@ -392,23 +396,23 @@
}, },
{ {
"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",
"Rev": "7b8e75db28f4" "Rev": "95d2e580d8eb"
}, },
{ {
"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",
@ -420,11 +424,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/check.v1", "ImportPath": "gopkg.in/check.v1",
@ -450,17 +454,21 @@
"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": "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/gengo", "ImportPath": "k8s.io/gengo",
@ -476,12 +484,20 @@
}, },
{ {
"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/structured-merge-diff/v4", "ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.2" "Rev": "v4.0.2"

9
go.mod
View File

@ -26,15 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
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/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 k8s.io/utils v0.0.0-20201110183641-67b214c5f920
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/client-go => ../client-go
) )

2
go.sum
View File

@ -433,6 +433,8 @@ 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/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/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=