Merge pull request kubernetes#76912 from tallclair/cloudinfo

Reregister cAdvisor cloud info providers in Kubelet

Author: k8s-ci-robot

pkg/kubelet/cadvisor/BUILD

@@ -37,6 +37,9 @@ go_library(
             "//vendor/github.com/google/cadvisor/container/systemd/install:go_default_library",
             "//vendor/github.com/google/cadvisor/fs:go_default_library",
             "//vendor/github.com/google/cadvisor/manager:go_default_library",
+            "//vendor/github.com/google/cadvisor/utils/cloudinfo/aws:go_default_library",
+            "//vendor/github.com/google/cadvisor/utils/cloudinfo/azure:go_default_library",
+            "//vendor/github.com/google/cadvisor/utils/cloudinfo/gce:go_default_library",
             "//vendor/github.com/google/cadvisor/utils/sysfs:go_default_library",
             "//vendor/k8s.io/klog:go_default_library",
         ],

pkg/kubelet/cadvisor/cadvisor_linux.go

@@ -26,11 +26,18 @@ import (
 	"path"
 	"time"
 
+	// Register supported container handlers.
 	_ "github.com/google/cadvisor/container/containerd/install"
 	_ "github.com/google/cadvisor/container/crio/install"
 	_ "github.com/google/cadvisor/container/docker/install"
 	_ "github.com/google/cadvisor/container/systemd/install"
 
+	// Register cloud info providers.
+	// TODO(#76660): Remove this once the cAdvisor endpoints are removed.
+	_ "github.com/google/cadvisor/utils/cloudinfo/aws"
+	_ "github.com/google/cadvisor/utils/cloudinfo/azure"
+	_ "github.com/google/cadvisor/utils/cloudinfo/gce"
+
 	"github.com/google/cadvisor/cache/memory"
 	cadvisormetrics "github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/events"

vendor/github.com/google/cadvisor/utils/cloudinfo/BUILD

@@ -445,6 +445,9 @@ github.com/google/cadvisor/storage
 github.com/google/cadvisor/summary
 github.com/google/cadvisor/utils
 github.com/google/cadvisor/utils/cloudinfo
+github.com/google/cadvisor/utils/cloudinfo/aws
+github.com/google/cadvisor/utils/cloudinfo/azure
+github.com/google/cadvisor/utils/cloudinfo/gce
 github.com/google/cadvisor/utils/cpuload
 github.com/google/cadvisor/utils/cpuload/netlink
 github.com/google/cadvisor/utils/docker