Skip to content

Commit 1f70708

Browse files
dashpoledashpole
committed
update cAdvisor to v0.37.0
1 parent 82baa26 commit 1f70708

File tree

97 files changed

+2427
-378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2427
-378
lines changed

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/gogo/protobuf v1.3.1
5454
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7
5555
github.com/golang/mock v1.3.1
56-
github.com/google/cadvisor v0.36.1-0.20200623171404-8450c56c21bc
56+
github.com/google/cadvisor v0.37.0
5757
github.com/google/go-cmp v0.4.0
5858
github.com/google/gofuzz v1.1.0
5959
github.com/google/uuid v1.1.1
@@ -63,7 +63,7 @@ require (
6363
github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible
6464
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
6565
github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5
66-
github.com/json-iterator/go v1.1.9
66+
github.com/json-iterator/go v1.1.10
6767
github.com/libopenstorage/openstorage v1.0.0
6868
github.com/lithammer/dedent v1.1.0
6969
github.com/lpabon/godbc v0.1.1 // indirect
@@ -81,9 +81,9 @@ require (
8181
github.com/opencontainers/selinux v1.5.2
8282
github.com/pkg/errors v0.9.1
8383
github.com/pmezard/go-difflib v1.0.0
84-
github.com/prometheus/client_golang v1.6.0
84+
github.com/prometheus/client_golang v1.7.1
8585
github.com/prometheus/client_model v0.2.0
86-
github.com/prometheus/common v0.9.1
86+
github.com/prometheus/common v0.10.0
8787
github.com/quobyte/api v0.1.2
8888
github.com/robfig/cron v1.1.0
8989
github.com/spf13/afero v1.2.2
@@ -275,7 +275,7 @@ replace (
275275
github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995
276276
github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e
277277
github.com/google/btree => github.com/google/btree v1.0.0
278-
github.com/google/cadvisor => github.com/google/cadvisor v0.36.1-0.20200623171404-8450c56c21bc
278+
github.com/google/cadvisor => github.com/google/cadvisor v0.37.0
279279
github.com/google/go-cmp => github.com/google/go-cmp v0.4.0
280280
github.com/google/gofuzz => github.com/google/gofuzz v1.1.0
281281
github.com/google/martian => github.com/google/martian v2.1.0+incompatible
@@ -306,7 +306,7 @@ replace (
306306
github.com/jimstudt/http-authentication => github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a
307307
github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
308308
github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0
309-
github.com/json-iterator/go => github.com/json-iterator/go v1.1.9
309+
github.com/json-iterator/go => github.com/json-iterator/go v1.1.10
310310
github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v0.9.1
311311
github.com/jtolds/gls => github.com/jtolds/gls v4.20.0+incompatible
312312
github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.2.0
@@ -370,10 +370,10 @@ replace (
370370
github.com/pkg/errors => github.com/pkg/errors v0.9.1
371371
github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0
372372
github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021
373-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.6.0
373+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
374374
github.com/prometheus/client_model => github.com/prometheus/client_model v0.2.0
375-
github.com/prometheus/common => github.com/prometheus/common v0.9.1
376-
github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.11
375+
github.com/prometheus/common => github.com/prometheus/common v0.10.0
376+
github.com/prometheus/procfs => github.com/prometheus/procfs v0.1.3
377377
github.com/quobyte/api => github.com/quobyte/api v0.1.2
378378
github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
379379
github.com/robfig/cron => github.com/robfig/cron v1.1.0

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZ
225225
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
226226
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
227227
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
228-
github.com/google/cadvisor v0.36.1-0.20200623171404-8450c56c21bc h1:il4pi2iOP5NRkBgnZH3n0GDqSCNEJ/QIRJrCAfU5h38=
229-
github.com/google/cadvisor v0.36.1-0.20200623171404-8450c56c21bc/go.mod h1:eYV7XF6ymgLvuBX38Kf/SELa+pqZ5HqqJTBHF+VUcVc=
228+
github.com/google/cadvisor v0.37.0 h1:t3txV4zNZZGTuwuA/Onm3HToPhg16GjigAHZHEVIz+c=
229+
github.com/google/cadvisor v0.37.0/go.mod h1:OhDE+goNVel0eGY8mR7Ifq1QUI1in5vJBIgIpcajK/I=
230230
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
231231
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
232232
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
@@ -281,8 +281,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5i
281281
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
282282
github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
283283
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
284-
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
285-
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
284+
github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
285+
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
286286
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
287287
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
288288
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -386,14 +386,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
386386
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
387387
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 h1:0XM1XL/OFFJjXsYXlG30spTkV/E9+gmd5GD1w2HE8xM=
388388
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
389-
github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=
390-
github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
389+
github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
390+
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
391391
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
392392
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
393-
github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=
394-
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
395-
github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
396-
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
393+
github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
394+
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
395+
github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
396+
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
397397
github.com/quobyte/api v0.1.2 h1:lPHLsuvtjFyk8WhC4uHoHRkScijIHcffTWBBP+YpzYo=
398398
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
399399
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=

‎pkg/kubelet/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ go_library(
145145
"//third_party/forked/golang/expansion:go_default_library",
146146
"//vendor/github.com/golang/groupcache/lru:go_default_library",
147147
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
148+
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
148149
"//vendor/k8s.io/klog/v2:go_default_library",
149150
"//vendor/k8s.io/utils/exec:go_default_library",
150151
"//vendor/k8s.io/utils/integer:go_default_library",

‎pkg/kubelet/cadvisor/cadvisor_unsupported.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ func (cu *cadvisorUnsupported) ContainerInfoV2(name string, options cadvisorapiv
5454
return nil, errUnsupported
5555
}
5656

57+
func (cu *cadvisorUnsupported) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
58+
return nil, errUnsupported
59+
}
60+
5761
func (cu *cadvisorUnsupported) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
5862
return nil, errUnsupported
5963
}

‎pkg/kubelet/cadvisor/cadvisor_windows.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ func (cu *cadvisorClient) ContainerInfoV2(name string, options cadvisorapiv2.Req
5858
return cu.winStatsClient.WinContainerInfos()
5959
}
6060

61+
func (cu *cadvisorClient) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
62+
return nil, nil
63+
}
64+
6165
func (cu *cadvisorClient) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
6266
return nil, nil
6367
}

‎pkg/kubelet/cadvisor/testing/cadvisor_fake.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ func (c *Fake) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions
5656
return map[string]cadvisorapiv2.ContainerInfo{}, nil
5757
}
5858

59+
// GetRequestedContainersInfo is a fake implementation if Interface.GetRequestedContainersInfo
60+
func (c *Fake) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
61+
return map[string]*cadvisorapi.ContainerInfo{}, nil
62+
}
63+
5964
// SubcontainerInfo is a fake implementation of Interface.SubcontainerInfo.
6065
func (c *Fake) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
6166
return map[string]*cadvisorapi.ContainerInfo{}, nil

‎pkg/kubelet/cadvisor/testing/cadvisor_mock.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ func (c *Mock) ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions
4949
return args.Get(0).(map[string]cadvisorapiv2.ContainerInfo), args.Error(1)
5050
}
5151

52+
// GetRequestedContainersInfo is a fake implementation if Interface.GetRequestedContainersInfo
53+
func (c *Mock) GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error) {
54+
args := c.Called(containerName, options)
55+
return args.Get(0).(map[string]*cadvisorapi.ContainerInfo), args.Error(1)
56+
}
57+
5258
// SubcontainerInfo is a mock implementation of Interface.SubcontainerInfo.
5359
func (c *Mock) SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error) {
5460
args := c.Called(name, req)

‎pkg/kubelet/cadvisor/types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ type Interface interface {
2828
DockerContainer(name string, req *cadvisorapi.ContainerInfoRequest) (cadvisorapi.ContainerInfo, error)
2929
ContainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (*cadvisorapi.ContainerInfo, error)
3030
ContainerInfoV2(name string, options cadvisorapiv2.RequestOptions) (map[string]cadvisorapiv2.ContainerInfo, error)
31+
GetRequestedContainersInfo(containerName string, options cadvisorapiv2.RequestOptions) (map[string]*cadvisorapi.ContainerInfo, error)
3132
SubcontainerInfo(name string, req *cadvisorapi.ContainerInfoRequest) (map[string]*cadvisorapi.ContainerInfo, error)
3233
MachineInfo() (*cadvisorapi.MachineInfo, error)
3334

‎pkg/kubelet/kubelet_getters.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"path/filepath"
2525

2626
cadvisorapiv1 "github.com/google/cadvisor/info/v1"
27+
cadvisorv2 "github.com/google/cadvisor/info/v2"
2728
"k8s.io/klog/v2"
2829
"k8s.io/utils/mount"
2930
utilpath "k8s.io/utils/path"
@@ -369,6 +370,11 @@ func (kl *Kubelet) podVolumeSubpathsDirExists(podUID types.UID) (bool, error) {
369370
return true, nil
370371
}
371372

373+
// GetRequestedContainersInfo returns container info.
374+
func (kl *Kubelet) GetRequestedContainersInfo(containerName string, options cadvisorv2.RequestOptions) (map[string]*cadvisorapiv1.ContainerInfo, error) {
375+
return kl.cadvisor.GetRequestedContainersInfo(containerName, options)
376+
}
377+
372378
// GetVersionInfo returns information about the version of cAdvisor in use.
373379
func (kl *Kubelet) GetVersionInfo() (*cadvisorapiv1.VersionInfo, error) {
374380
return kl.cadvisor.VersionInfo()

‎pkg/kubelet/server/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ go_library(
5353
"//vendor/github.com/emicklei/go-restful:go_default_library",
5454
"//vendor/github.com/google/cadvisor/container:go_default_library",
5555
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
56+
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
5657
"//vendor/github.com/google/cadvisor/metrics:go_default_library",
5758
"//vendor/google.golang.org/grpc:go_default_library",
5859
"//vendor/k8s.io/klog/v2:go_default_library",
@@ -91,6 +92,7 @@ go_test(
9192
"//staging/src/k8s.io/client-go/util/testing:go_default_library",
9293
"//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
9394
"//vendor/github.com/google/cadvisor/info/v1:go_default_library",
95+
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
9496
"//vendor/github.com/stretchr/testify/assert:go_default_library",
9597
"//vendor/github.com/stretchr/testify/require:go_default_library",
9698
"//vendor/golang.org/x/net/websocket:go_default_library",

0 commit comments

Comments
 (0)