github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97174 from hanlins/fix/cadvisor-95727

Browse Source 
vendor: update cAdvisor to v0.38.6
This commit is contained in:
Kubernetes Prow Robot 2020-12-10 17:33:21 -08:00 committed by GitHub
commit 73118aecca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -53,7 +53,7 @@ require (
github.com/gogo/protobuf v1.3.1 github.com/gogo/protobuf v1.3.1
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/mock v1.4.1 github.com/golang/mock v1.4.1
github.com/google/cadvisor v0.38.5 github.com/google/cadvisor v0.38.6
github.com/google/go-cmp v0.5.2 github.com/google/go-cmp v0.5.2
github.com/google/gofuzz v1.1.0 github.com/google/gofuzz v1.1.0
github.com/google/uuid v1.1.2 github.com/google/uuid v1.1.2
@ -281,7 +281,7 @@ replace (
github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995
github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e
github.com/google/btree => github.com/google/btree v1.0.0 github.com/google/btree => github.com/google/btree v1.0.0
github.com/google/cadvisor => github.com/google/cadvisor v0.38.5 github.com/google/cadvisor => github.com/google/cadvisor v0.38.6
github.com/google/go-cmp => github.com/google/go-cmp v0.5.2 github.com/google/go-cmp => github.com/google/go-cmp v0.5.2
github.com/google/gofuzz => github.com/google/gofuzz v1.1.0 github.com/google/gofuzz => github.com/google/gofuzz v1.1.0
github.com/google/martian => github.com/google/martian v2.1.0+incompatible github.com/google/martian => github.com/google/martian v2.1.0+incompatible

4
go.sum
View File

@ -234,8 +234,8 @@ github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZ
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/cadvisor v0.38.5 h1:XOvqjL2+xMEuDORcLMv77NystZvQB7YgGxcKpRul/vE= github.com/google/cadvisor v0.38.6 h1:5vu8NaOqsBKF6wOxBLeDPD7hcmxfg/4I5NZGYXK7gIo=
github.com/google/cadvisor v0.38.5/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA= github.com/google/cadvisor v0.38.6/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA=
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=

7
vendor/github.com/google/cadvisor/container/containerd/client.go generated vendored
View File

@ -65,11 +65,10 @@ func Client(address, namespace string) (ContainerdClient, error) {
tryConn.Close() tryConn.Close()
connParams := grpc.ConnectParams{ connParams := grpc.ConnectParams{
Backoff: backoff.Config{ Backoff: backoff.DefaultConfig,
BaseDelay: baseBackoffDelay,
MaxDelay: maxBackoffDelay,
},
} }
connParams.Backoff.BaseDelay = baseBackoffDelay
connParams.Backoff.MaxDelay = maxBackoffDelay
gopts := []grpc.DialOption{ gopts := []grpc.DialOption{
grpc.WithInsecure(), grpc.WithInsecure(),
grpc.WithContextDialer(dialer.ContextDialer), grpc.WithContextDialer(dialer.ContextDialer),

4
vendor/modules.txt vendored
View File

@ -521,9 +521,9 @@ github.com/golang/protobuf/ptypes/wrappers
# github.com/google/btree v1.0.0 => github.com/google/btree v1.0.0 # github.com/google/btree v1.0.0 => github.com/google/btree v1.0.0
github.com/google/btree github.com/google/btree
# github.com/google/btree => github.com/google/btree v1.0.0 # github.com/google/btree => github.com/google/btree v1.0.0
# github.com/google/cadvisor v0.38.5 => github.com/google/cadvisor v0.38.5 # github.com/google/cadvisor v0.38.6 => github.com/google/cadvisor v0.38.6
## explicit ## explicit
# github.com/google/cadvisor => github.com/google/cadvisor v0.38.5 # github.com/google/cadvisor => github.com/google/cadvisor v0.38.6
github.com/google/cadvisor/accelerators github.com/google/cadvisor/accelerators
github.com/google/cadvisor/cache/memory github.com/google/cadvisor/cache/memory
github.com/google/cadvisor/client/v2 github.com/google/cadvisor/client/v2