kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 d2227ddea0
commit caeff9485f
3 changed files with 66 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
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",
@ -128,7 +128,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",
@ -260,7 +260,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",
@ -304,15 +304,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",
@ -320,7 +320,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",
@ -332,7 +332,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",
@ -340,7 +340,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",
@ -644,7 +644,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",
@ -724,7 +724,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",
@ -752,7 +752,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",
@ -772,7 +772,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",
@ -780,7 +780,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",
@ -788,7 +788,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",
@ -796,7 +796,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",
@ -808,23 +808,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",
@ -832,15 +832,15 @@
}, },
{ {
"ImportPath": "google.golang.org/genproto", "ImportPath": "google.golang.org/genproto",
"Rev": "cb27e3aa2013" "Rev": "8816d57aaa9a"
}, },
{ {
"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",
@ -890,6 +890,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"
@ -900,35 +904,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/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "6b7cca877d2b" "Rev": "13d987893e89"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "d396fd99ebba" "Rev": "4ab8fb4585a5"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "b8d0d31376f9" "Rev": "4b13297a0652"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "3e59e5bc0401" "Rev": "9894bfc661fe"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "5c27769214da" "Rev": "398093c33abc"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -944,12 +948,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/apiserver-network-proxy/konnectivity-client", "ImportPath": "sigs.k8s.io/apiserver-network-proxy/konnectivity-client",
"Rev": "v0.0.14" "Rev": "v0.0.14"

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.15 go 1.15
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20201114012213-4b13297a0652
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20201114012118-398093c33abc
) )
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/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20201114010627-13d987893e89
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201114012213-4b13297a0652
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20201114010252-9894bfc661fe
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20201114012118-398093c33abc
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

7
go.sum
View File

@ -648,6 +648,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/apiserver v0.0.0-20201114010627-13d987893e89/go.mod h1:kV/G//zltx3aTfn7/gPngq+OycpQvqF1SyP9Fw1QT8I=
k8s.io/client-go v0.0.0-20201114005807-4ab8fb4585a5/go.mod h1:4JoZy1wCRKFTVU4xsCplBlOsWEoxbDQVh0TAHFcULig=
k8s.io/cloud-provider v0.0.0-20201114012213-4b13297a0652/go.mod h1:XwYyeHCsMixcIn7uwvd3D/PTWJgqmCjxyLfF4rDsTEk=
k8s.io/component-base v0.0.0-20201114010252-9894bfc661fe/go.mod h1:qjXRB1B7gX0x1RzP+3mKuyrJLhALuQe+rsJAzdMEa4U=
k8s.io/controller-manager v0.0.0-20201114012118-398093c33abc/go.mod h1:6pBtqrLmJObk1VnRqCEnxtC2vAoahsNovHBPKKAZpzg=
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=