From 37330a13924fcdf0d666974e0cda178a8a1800c1 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 16 Jun 2023 11:32:36 +0300 Subject: [PATCH] Add KubeletCgroupDriverFromCRI feature gate --- pkg/features/kube_features.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 75d640c2e44..0c787641fc5 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -416,6 +416,17 @@ const ( // yet. JobTrackingWithFinalizers featuregate.Feature = "JobTrackingWithFinalizers" + // owner: @marquiz + // kep: http://kep.k8s.io/4033 + // alpha: v1.28 + // + // Enable detection of the kubelet cgroup driver configuration option from + // the CRI. The CRI runtime also needs to support this feature in which + // case the kubelet will ignore the cgroupDriver (--cgroup-driver) + // configuration option. If runtime doesn't support it, the kubelet will + // fallback to using it's cgroupDriver option. + KubeletCgroupDriverFromCRI featuregate.Feature = "KubeletCgroupDriverFromCRI" + // owner: @AkihiroSuda // alpha: v1.22 // @@ -1007,6 +1018,8 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS JobTrackingWithFinalizers: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28 + KubeletCgroupDriverFromCRI: {Default: false, PreRelease: featuregate.Alpha}, + KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, KubeletPodResources: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.28, remove in 1.30