Merge pull request #52451 from yujuhong/enable-cri-stats

pkg/kubelet/cadvisor/helpers_linux.go

@@ -40,6 +40,9 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) {
 	case "rkt":
 		return cadvisorfs.LabelRktImages, nil
 	case "remote":
+		// This is a temporary workaround to get stats for cri-o from cadvisor
+		// and should be removed.
+		// Related to https://github.com/kubernetes/kubernetes/issues/51798
 		if i.runtimeEndpoint == "/var/run/crio.sock" {
 			return cadvisorfs.LabelCrioImages, nil
 		}

pkg/kubelet/kubelet.go

@@ -26,6 +26,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	goruntime "runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -649,12 +650,30 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 		}
 		klet.containerRuntime = runtime
 		klet.runner = runtime
-		klet.StatsProvider = stats.NewCadvisorStatsProvider(
-			klet.cadvisor,
-			klet.resourceAnalyzer,
-			klet.podManager,
-			klet.runtimeCache,
-			klet.containerRuntime)
+
+		// CRI integrations should get container metrics via CRI. Docker
+		// uses the built-in cadvisor to gather such metrics on Linux for
+		// historical reasons.
+		// cri-o relies on cadvisor as a temporary workaround. The code should
+		// be removed. Related issue:
+		// https://github.com/kubernetes/kubernetes/issues/51798
+		if (kubeCfg.ContainerRuntime == kubetypes.DockerContainerRuntime &&
+			goruntime.GOOS == "linux") || kubeCfg.RemoteRuntimeEndpoint == "/var/run/crio.sock" {
+			klet.StatsProvider = stats.NewCadvisorStatsProvider(
+				klet.cadvisor,
+				klet.resourceAnalyzer,
+				klet.podManager,
+				klet.runtimeCache,
+				klet.containerRuntime)
+		} else {
+			klet.StatsProvider = stats.NewCRIStatsProvider(
+				klet.cadvisor,
+				klet.resourceAnalyzer,
+				klet.podManager,
+				klet.runtimeCache,
+				runtimeService,
+				imageService)
+		}
 	} else {
 		// rkt uses the legacy, non-CRI, integration. Configure it the old way.
 		// TODO: Include hairpin mode settings in rkt?