From bd233a2aa556c03ad427e94f140d7c631b3ede87 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 31 Oct 2023 11:09:36 -0400 Subject: [PATCH] typo/api change in cadvisor / updated unwanted-dependencies.json Signed-off-by: Davanum Srinivas --- hack/unwanted-dependencies.json | 21 ++------------------- pkg/kubelet/cadvisor/cadvisor_linux.go | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/hack/unwanted-dependencies.json b/hack/unwanted-dependencies.json index 62635aae420..4ca51c7e78f 100644 --- a/hack/unwanted-dependencies.json +++ b/hack/unwanted-dependencies.json @@ -76,15 +76,14 @@ "unwantedReferences": { "cloud.google.com/go": [ "cloud.google.com/go/compute", - "github.com/google/cadvisor", "google.golang.org/genproto" ], "cloud.google.com/go/bigquery": [ - "cloud.google.com/go/storage", "google.golang.org/genproto" ], "cloud.google.com/go/compute": [ "cloud.google.com/go/compute/metadata", + "github.com/google/cadvisor", "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc", "golang.org/x/oauth2", "google.golang.org/genproto", @@ -93,9 +92,6 @@ "cloud.google.com/go/firestore": [ "google.golang.org/genproto" ], - "cloud.google.com/go/storage": [ - "cloud.google.com/go" - ], "github.com/GoogleCloudPlatform/k8s-cloud-provider": [ "k8s.io/kubernetes", "k8s.io/legacy-cloud-providers" @@ -111,7 +107,6 @@ "github.com/containerd/cgroups", "github.com/containerd/ttrpc", "github.com/containerd/typeurl", - "github.com/gogo/googleapis", "github.com/google/cadvisor", "github.com/grpc-ecosystem/go-grpc-middleware", "go.etcd.io/etcd/api/v3", @@ -148,10 +143,7 @@ "google.golang.org/api" ], "github.com/googleapis/gax-go/v2": [ - "cloud.google.com/go", - "cloud.google.com/go/bigquery", - "cloud.google.com/go/compute", - "cloud.google.com/go/storage" + "cloud.google.com/go/compute" ], "github.com/gregjones/httpcache": [ "k8s.io/client-go" @@ -182,7 +174,6 @@ ], "github.com/pkg/errors": [ "github.com/Microsoft/hcsshim", - "github.com/aws/aws-sdk-go", "github.com/containerd/continuity", "github.com/containerd/fifo", "github.com/containerd/go-runc", @@ -202,7 +193,6 @@ "k8s.io/legacy-cloud-providers" ], "go.opencensus.io": [ - "cloud.google.com/go", "cloud.google.com/go/compute", "github.com/Microsoft/hcsshim", "google.golang.org/api" @@ -212,10 +202,7 @@ "github.com/google/cel-go" ], "google.golang.org/api": [ - "cloud.google.com/go", - "cloud.google.com/go/bigquery", "cloud.google.com/go/compute", - "cloud.google.com/go/storage", "github.com/GoogleCloudPlatform/k8s-cloud-provider", "github.com/googleapis/gax-go/v2", "k8s.io/kubernetes", @@ -232,13 +219,9 @@ "google.golang.org/grpc" ], "google.golang.org/genproto": [ - "cloud.google.com/go", - "cloud.google.com/go/bigquery", "cloud.google.com/go/compute", - "cloud.google.com/go/storage", "github.com/container-storage-interface/spec", "github.com/containerd/ttrpc", - "github.com/google/cadvisor", "github.com/googleapis/gax-go/v2", "github.com/grpc-ecosystem/go-grpc-middleware", "github.com/grpc-ecosystem/grpc-gateway", diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 2c93cfa936f..4c9dc55cee4 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -97,7 +97,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [ } duration := maxHousekeepingInterval - housekeepingConfig := manager.HouskeepingConfig{ + housekeepingConfig := manager.HousekeepingConfig{ Interval: &duration, AllowDynamic: pointer.Bool(allowDynamicHousekeeping), }