Merge pull request #118770 from marquiz/devel/cgroup-driver-autoconfig
kubelet: get cgroup driver config from CRI
This commit is contained in:
@@ -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
|
||||
//
|
||||
@@ -1014,6 +1025,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
|
||||
|
Reference in New Issue
Block a user