Skip to content

Commit 98a1996

Browse files
haircommanderhaircommander
committed
UPSTREAM: <carry>: cherry-pick openshift/google-cadvisor#29 to fix OCPBUGS-48834
1 parent f868289 commit 98a1996

File tree

16 files changed

+54
-27
lines changed

16 files changed

+54
-27
lines changed

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ require (
245245
)
246246

247247
replace (
248-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
248+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
249249
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
250250
k8s.io/api => ./staging/src/k8s.io/api
251251
k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver

Diff for: ‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@ github.com/openshift/apiserver-library-go v0.0.0-20240917005942-67bd656b875a/go.
616616
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
617617
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
618618
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
619-
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2 h1:ls1C5cvJbA5CbOwbA4Nx/W+tRvXgKDc9XT81bg3sxCA=
620-
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
619+
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3 h1:U62Qx9Jhq2HZVq1rP+UvOxTEy2+tLEdYJfLZwqwSBGE=
620+
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
621621
github.com/openshift/library-go v0.0.0-20240528102242-9c194599a149 h1:7mdQKqnSJMoIl6gkxpu5LXwmRN9IWYWpzgusOn5pC6E=
622622
github.com/openshift/library-go v0.0.0-20240528102242-9c194599a149/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
623623
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI=

Diff for: ‎staging/src/k8s.io/api/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
)
3939

4040
replace (
41-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
41+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
4242
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
4343
k8s.io/api => ../api
4444
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/api/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎staging/src/k8s.io/apiextensions-apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ require (
130130
)
131131

132132
replace (
133-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
133+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
134134
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
135135
k8s.io/api => ../api
136136
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/apiextensions-apiserver/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎staging/src/k8s.io/apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ require (
127127
)
128128

129129
replace (
130-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
130+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
131131
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
132132
k8s.io/api => ../api
133133
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/apiserver/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎staging/src/k8s.io/component-base/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ require (
8282
)
8383

8484
replace (
85-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
85+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
8686
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
8787
k8s.io/api => ../api
8888
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/component-base/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎staging/src/k8s.io/component-helpers/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
)
5454

5555
replace (
56-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
56+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
5757
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
5858
k8s.io/api => ../api
5959
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/component-helpers/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎staging/src/k8s.io/kube-aggregator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ require (
114114
)
115115

116116
replace (
117-
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
117+
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
118118
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
119119
k8s.io/api => ../api
120120
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver

Diff for: ‎staging/src/k8s.io/kube-aggregator/go.sum

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/google/cadvisor/fs/fs.go

+37-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ github.com/golang/protobuf/ptypes/wrappers
276276
# github.com/google/btree v1.0.1
277277
## explicit; go 1.12
278278
github.com/google/btree
279-
# github.com/google/cadvisor v0.49.0 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
279+
# github.com/google/cadvisor v0.49.0 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
280280
## explicit; go 1.19
281281
github.com/google/cadvisor/cache/memory
282282
github.com/google/cadvisor/client/v2
@@ -1664,5 +1664,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
16641664
## explicit; go 1.12
16651665
sigs.k8s.io/yaml
16661666
# github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-1 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
1667-
# github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
1667+
# github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-3
16681668
# github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d

0 commit comments

Comments
 (0)