Skip to content

Commit 462b967

Browse files
committed
[DNM] testing cadvisor changes
This is just to run e2e tests with cAdvisor from google/cadvisor#3302 Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 6442024 commit 462b967

File tree

15 files changed

+86
-85
lines changed

15 files changed

+86
-85
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
3838
github.com/golang/mock v1.6.0
3939
github.com/golang/protobuf v1.5.3
40-
github.com/google/cadvisor v0.47.1
40+
github.com/google/cadvisor v0.47.1-0.20230509172039-eac1257f76a4
4141
github.com/google/cel-go v0.12.6
4242
github.com/google/gnostic v0.5.7-v3refs
4343
github.com/google/go-cmp v0.5.9
@@ -243,6 +243,7 @@ require (
243243
)
244244

245245
replace (
246+
github.com/google/cadvisor => github.com/kolyshkin/cadvisor v0.47.1-0.20230509172039-eac1257f76a4
246247
k8s.io/api => ./staging/src/k8s.io/api
247248
k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver
248249
k8s.io/apimachinery => ./staging/src/k8s.io/apimachinery

go.sum

Lines changed: 2 additions & 37 deletions
Large diffs are not rendered by default.

hack/unwanted-dependencies.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
"github.com/containerd/cgroups",
5555
"github.com/containerd/ttrpc",
5656
"github.com/containerd/typeurl",
57-
"github.com/gogo/googleapis",
5857
"github.com/google/cadvisor",
5958
"github.com/grpc-ecosystem/go-grpc-middleware",
6059
"go.etcd.io/etcd/api/v3",
@@ -81,7 +80,6 @@
8180
],
8281
"github.com/pkg/errors": [
8382
"github.com/Microsoft/hcsshim",
84-
"github.com/aws/aws-sdk-go",
8583
"github.com/containerd/continuity",
8684
"github.com/containerd/fifo",
8785
"github.com/containerd/go-runc",

staging/src/k8s.io/code-generator/examples/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ replace (
5555
k8s.io/apimachinery => ../../apimachinery
5656
k8s.io/client-go => ../../client-go
5757
)
58+
59+
replace github.com/google/cadvisor => github.com/kolyshkin/cadvisor v0.47.1-0.20230509172039-eac1257f76a4

staging/src/k8s.io/kms/internal/plugins/mock/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ replace (
2727
k8s.io/client-go => ../../../../client-go
2828
k8s.io/kms => ../../../../kms
2929
)
30+
31+
replace github.com/google/cadvisor => github.com/kolyshkin/cadvisor v0.47.1-0.20230509172039-eac1257f76a4

vendor/github.com/google/cadvisor/container/common/helpers.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/cadvisor/container/containerd/client.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/cadvisor/container/containerd/handler.go

Lines changed: 11 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/cadvisor/container/crio/handler.go

Lines changed: 19 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/cadvisor/container/factory.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)