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 6e0942b51d
commit 8b4aa59c0e
3 changed files with 57 additions and 38 deletions

74
Godeps/Godeps.json generated
View File

@ -8,23 +8,23 @@
"Deps": [
{
"ImportPath": "cloud.google.com/go",
"Rev": "v0.51.0"
"Rev": "v0.54.0"
},
{
"ImportPath": "cloud.google.com/go/bigquery",
"Rev": "v1.0.1"
"Rev": "v1.4.0"
},
{
"ImportPath": "cloud.google.com/go/datastore",
"Rev": "v1.0.0"
"Rev": "v1.1.0"
},
{
"ImportPath": "cloud.google.com/go/pubsub",
"Rev": "v1.0.1"
"Rev": "v1.2.0"
},
{
"ImportPath": "cloud.google.com/go/storage",
"Rev": "v1.0.0"
"Rev": "v1.6.0"
},
{
"ImportPath": "dmitri.shuralyov.com/gpu/mtl",
@ -150,9 +150,13 @@
"ImportPath": "github.com/ghodss/yaml",
"Rev": "73d445a93680"
},
{
"ImportPath": "github.com/go-gl/glfw",
"Rev": "e6da0acd62b1"
},
{
"ImportPath": "github.com/go-gl/glfw/v3.3/glfw",
"Rev": "12ad95a8df72"
"Rev": "6f7a984d4dc4"
},
{
"ImportPath": "github.com/go-logr/logr",
@ -184,15 +188,15 @@
},
{
"ImportPath": "github.com/golang/groupcache",
"Rev": "215e87163ea7"
"Rev": "8c9f03a8e57e"
},
{
"ImportPath": "github.com/golang/mock",
"Rev": "v1.3.1"
"Rev": "v1.4.1"
},
{
"ImportPath": "github.com/golang/protobuf",
"Rev": "v1.4.2"
"Rev": "v1.4.3"
},
{
"ImportPath": "github.com/google/btree",
@ -200,7 +204,7 @@
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.4.0"
"Rev": "v0.5.2"
},
{
"ImportPath": "github.com/google/gofuzz",
@ -212,7 +216,7 @@
},
{
"ImportPath": "github.com/google/pprof",
"Rev": "d4f498aebedc"
"Rev": "1ebb73c60ed3"
},
{
"ImportPath": "github.com/google/renameio",
@ -220,7 +224,7 @@
},
{
"ImportPath": "github.com/google/uuid",
"Rev": "v1.1.1"
"Rev": "v1.1.2"
},
{
"ImportPath": "github.com/googleapis/gax-go/v2",
@ -344,7 +348,7 @@
},
{
"ImportPath": "github.com/stretchr/testify",
"Rev": "v1.4.0"
"Rev": "v1.6.1"
},
{
"ImportPath": "github.com/yuin/goldmark",
@ -352,7 +356,7 @@
},
{
"ImportPath": "go.opencensus.io",
"Rev": "v0.22.2"
"Rev": "v0.22.3"
},
{
"ImportPath": "golang.org/x/crypto",
@ -360,7 +364,7 @@
},
{
"ImportPath": "golang.org/x/exp",
"Rev": "da58074b4299"
"Rev": "6cc2880d07d6"
},
{
"ImportPath": "golang.org/x/image",
@ -368,7 +372,7 @@
},
{
"ImportPath": "golang.org/x/lint",
"Rev": "fdd1cda4f05f"
"Rev": "738671d3881b"
},
{
"ImportPath": "golang.org/x/mobile",
@ -384,7 +388,7 @@
},
{
"ImportPath": "golang.org/x/oauth2",
"Rev": "858c2ad4c8b6"
"Rev": "bf48bf16ab8d"
},
{
"ImportPath": "golang.org/x/sync",
@ -396,11 +400,11 @@
},
{
"ImportPath": "golang.org/x/text",
"Rev": "v0.3.3"
"Rev": "v0.3.4"
},
{
"ImportPath": "golang.org/x/time",
"Rev": "555d28b269f0"
"Rev": "3af7569d3a1e"
},
{
"ImportPath": "golang.org/x/tools",
@ -408,11 +412,11 @@
},
{
"ImportPath": "golang.org/x/xerrors",
"Rev": "9bdfabe68543"
"Rev": "5ec99f83aff1"
},
{
"ImportPath": "google.golang.org/api",
"Rev": "v0.15.0"
"Rev": "v0.20.0"
},
{
"ImportPath": "google.golang.org/appengine",
@ -424,11 +428,11 @@
},
{
"ImportPath": "google.golang.org/grpc",
"Rev": "v1.27.0"
"Rev": "v1.27.1"
},
{
"ImportPath": "google.golang.org/protobuf",
"Rev": "v1.24.0"
"Rev": "v1.25.0"
},
{
"ImportPath": "gopkg.in/check.v1",
@ -454,25 +458,29 @@
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.8"
},
{
"ImportPath": "gopkg.in/yaml.v3",
"Rev": "9f266ea9e77c"
},
{
"ImportPath": "honnef.co/go/tools",
"Rev": "v0.0.1-2019.2.3"
"Rev": "v0.0.1-2020.1.3"
},
{
"ImportPath": "k8s.io/api",
"Rev": "e29b22345993"
"Rev": "ccdf63aa6ee8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "323157012f87"
"Rev": "65a627a281ee"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "d396fd99ebba"
"Rev": "4ab8fb4585a5"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "ebc5cde1959a"
"Rev": "18d1afbd2833"
},
{
"ImportPath": "k8s.io/gengo",
@ -488,12 +496,20 @@
},
{
"ImportPath": "k8s.io/utils",
"Rev": "8146046b121e"
"Rev": "67b214c5f920"
},
{
"ImportPath": "rsc.io/binaryregexp",
"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",
"Rev": "v4.0.2"

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5
k8s.io/code-generator v0.0.0-20201114005222-18d1afbd2833
k8s.io/klog/v2 v2.4.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20201114005542-ccdf63aa6ee8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/client-go => k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201114005222-18d1afbd2833
)

4
go.sum
View File

@ -431,6 +431,10 @@ 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.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
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/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/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=