Skip to content

Commit

Permalink
UPSTREAM: <carry>: WIP: cherry-pick openshift/google-cadvisor#29 to f…
Browse files Browse the repository at this point in the history 
…ix OCPBUGS-48834

Signed-off-by: Peter Hunt <pehunt@redhat.com>
  • Loading branch information
@haircommander
haircommander committed Feb 12, 2025
1 parent f868289 commit 2f296eb
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 27 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ./staging/src/k8s.io/api
k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander h1:Ta52OvryJSffcZq6NFkuBYbQutDAl+rmYOSWjOdnrGc=
github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
Expand Down Expand Up @@ -616,8 +618,6 @@ github.com/openshift/apiserver-library-go v0.0.0-20240917005942-67bd656b875a/go.
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2 h1:ls1C5cvJbA5CbOwbA4Nx/W+tRvXgKDc9XT81bg3sxCA=
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
github.com/openshift/library-go v0.0.0-20240528102242-9c194599a149 h1:7mdQKqnSJMoIl6gkxpu5LXwmRN9IWYWpzgusOn5pC6E=
github.com/openshift/library-go v0.0.0-20240528102242-9c194599a149/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI=
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/api/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiextensions-apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiextensions-apiserver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-base/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-base/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-helpers/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-helpers/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-aggregator/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ require (
)

replace (
github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d
k8s.io/api => ../api
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/kube-aggregator/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 37 additions & 10 deletions vendor/github.com/google/cadvisor/fs/fs.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ github.com/golang/protobuf/ptypes/wrappers
# github.com/google/btree v1.0.1
## explicit; go 1.12
github.com/google/btree
# github.com/google/cadvisor v0.49.0 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
# github.com/google/cadvisor v0.49.0 => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
## explicit; go 1.19
github.com/google/cadvisor/cache/memory
github.com/google/cadvisor/client/v2
Expand Down Expand Up @@ -1664,5 +1664,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-1 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
# github.com/google/cadvisor => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
# github.com/google/cadvisor => github.com/haircommander/cadvisor v0.49.0-openshift-4.17-3-haircommander
# github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d

0 comments on commit 2f296eb

Please sign in to comment.