github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

typo/api change in cadvisor / updated unwanted-dependencies.json

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2023-10-31 11:09:36 -04:00
parent 8b9fc325e2
commit bd233a2aa5
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hack/unwanted-dependencies.json
View File

@ -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",

2
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -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),
}