Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP Revert "UPSTREAM: <carry>: bump cadvisor version to fix missing netwo… #2084

Closed
wants to merge 1 commit into from
Closed

WIP Revert "UPSTREAM: <carry>: bump cadvisor version to fix missing netwo… #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,8 @@ github.com/openshift/apiserver-library-go v0.0.0-20240828192036-4d55b6dd978f/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/google-cadvisor v0.49.0-openshift-4.17-1 h1:Hmw0IOL6YHveXb2OgRn7bxTFzc9tQy28O66+FFuwdw8=
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-1/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: 0 additions & 2 deletions go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,3 @@ use (
./staging/src/k8s.io/sample-cli-plugin
./staging/src/k8s.io/sample-controller
)

replace github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-1 => github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2
2 changes: 1 addition & 1 deletion staging/src/k8s.io/api/go.mod
View file
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
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
Open in desktop

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

14 changes: 11 additions & 3 deletions vendor/github.com/google/cadvisor/container/crio/factory.go
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions vendor/modules.txt
View file
Open in desktop
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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
## explicit; go 1.19
github.com/google/cadvisor/cache/memory
github.com/google/cadvisor/client/v2
Expand Down Expand Up @@ -1662,6 +1662,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## 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/openshift/google-cadvisor v0.49.0-openshift-4.17-1
# github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d