From cd85d4b3fb0a7c07ba0a6a5b511627eb7c1d85e4 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 10 Jun 2021 15:23:27 -0400 Subject: [PATCH] features: add podAndContainerStatsFromCRI to allow users to specify whether the Kubelet should pull pod and container stats strictly from the CRI, rather than a mixture of CRI and cAdvsior Signed-off-by: Peter Hunt --- pkg/features/kube_features.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 337963f182a..26cf549dbfd 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -791,6 +791,14 @@ const ( // node affinity, selector and tolerations. This is allowed only for suspended jobs // that have never been unsuspended before. JobMutableNodeSchedulingDirectives featuregate.Feature = "JobMutableNodeSchedulingDirectives" + + // owner: @haircommander + // kep: http://kep.k8s.io/2364 + // alpha: v1.23 + // + // Configures the Kubelet to use the CRI to populate pod and container stats, instead of supplimenting with stats from cAdvisor. + // Requires the CRI implementation supports supplying the required stats. + PodAndContainerStatsFromCRI featuregate.Feature = "PodAndContainerStatsFromCRI" ) func init() { @@ -907,6 +915,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS CPUManagerPolicyBetaOptions: {Default: true, PreRelease: featuregate.Beta}, JobMutableNodeSchedulingDirectives: {Default: true, PreRelease: featuregate.Beta}, IdentifyPodOS: {Default: false, PreRelease: featuregate.Alpha}, + PodAndContainerStatsFromCRI: {Default: false, PreRelease: featuregate.Alpha}, // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: