From 26d02bea9afbef7168093aa547538d343d09645d Mon Sep 17 00:00:00 2001 From: Hanlin Shi Date: Wed, 9 Dec 2020 15:07:49 -0800 Subject: [PATCH] vendor: update cAdvisor to v0.38.6 Signed-off-by: Hanlin Shi --- go.mod | 4 ++-- go.sum | 4 ++-- .../google/cadvisor/container/containerd/client.go | 7 +++---- vendor/modules.txt | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 18118f42e3e..6da2f1c172f 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e 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/gofuzz v1.1.0 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/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e 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/gofuzz => github.com/google/gofuzz v1.1.0 github.com/google/martian => github.com/google/martian v2.1.0+incompatible diff --git a/go.sum b/go.sum index 32588af3339..1257ebe6942 100644 --- a/go.sum +++ b/go.sum @@ -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/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= 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.5/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA= +github.com/google/cadvisor v0.38.6 h1:5vu8NaOqsBKF6wOxBLeDPD7hcmxfg/4I5NZGYXK7gIo= +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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= diff --git a/vendor/github.com/google/cadvisor/container/containerd/client.go b/vendor/github.com/google/cadvisor/container/containerd/client.go index 986476385f8..47eaffad7bd 100644 --- a/vendor/github.com/google/cadvisor/container/containerd/client.go +++ b/vendor/github.com/google/cadvisor/container/containerd/client.go @@ -65,11 +65,10 @@ func Client(address, namespace string) (ContainerdClient, error) { tryConn.Close() connParams := grpc.ConnectParams{ - Backoff: backoff.Config{ - BaseDelay: baseBackoffDelay, - MaxDelay: maxBackoffDelay, - }, + Backoff: backoff.DefaultConfig, } + connParams.Backoff.BaseDelay = baseBackoffDelay + connParams.Backoff.MaxDelay = maxBackoffDelay gopts := []grpc.DialOption{ grpc.WithInsecure(), grpc.WithContextDialer(dialer.ContextDialer), diff --git a/vendor/modules.txt b/vendor/modules.txt index d789fe16f0d..53758a61eff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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 # 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 -# 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/cache/memory github.com/google/cadvisor/client/v2