Skip to content

K
k3s
Unverified Commit f04c7624 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58978 from mtaufen/kc-kubeletconfigfile-step3

Automatic merge from submit-queue (batch tested with PRs 58777, 58978, 58977, 58775). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Removal of KubeletConfigFile feature gate: Step 3 (final) This PR completes the work started in https://github.com/kubernetes/kubernetes/pull/58760 by completely removing the KubeletConfigFile feature gate. We stopped setting the gate in test-infra in https://github.com/kubernetes/test-infra/pull/6490. ```release-note The alpha KubeletConfigFile feature gate has been removed, because it was redundant with the Kubelet's --config flag. It is no longer necessary to set this gate to use the flag. The --config flag is still considered alpha. ```
parents 85e435d3 63c93849
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
pkg/features/kube_features.go
View file @ f04c7624
...@@ -37,11 +37,6 @@ const ( ...@@ -37,11 +37,6 @@ const (
// alpha: v1.4 // alpha: v1.4
DynamicKubeletConfig utilfeature.Feature = "DynamicKubeletConfig" DynamicKubeletConfig utilfeature.Feature = "DynamicKubeletConfig"
// owner: @mtaufen
// alpha: v1.8
// This gate is now a no-op. It will be removed shortly.
KubeletConfigFile utilfeature.Feature = "KubeletConfigFile"
// owner: @pweil- // owner: @pweil-
// alpha: v1.5 // alpha: v1.5
// //
...@@ -242,7 +237,6 @@ func init() { ...@@ -242,7 +237,6 @@ func init() {
var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureSpec{
AppArmor: {Default: true, PreRelease: utilfeature.Beta}, AppArmor: {Default: true, PreRelease: utilfeature.Beta},
DynamicKubeletConfig: {Default: false, PreRelease: utilfeature.Alpha}, DynamicKubeletConfig: {Default: false, PreRelease: utilfeature.Alpha},
KubeletConfigFile: {Default: false, PreRelease: utilfeature.Alpha}, // KubeletConfigFile is now a no-op gate on the path to removal.
ExperimentalHostUserNamespaceDefaultingGate: {Default: false, PreRelease: utilfeature.Beta}, ExperimentalHostUserNamespaceDefaultingGate: {Default: false, PreRelease: utilfeature.Beta},
ExperimentalCriticalPodAnnotation: {Default: false, PreRelease: utilfeature.Alpha}, ExperimentalCriticalPodAnnotation: {Default: false, PreRelease: utilfeature.Alpha},
Accelerators: {Default: false, PreRelease: utilfeature.Alpha}, Accelerators: {Default: false, PreRelease: utilfeature.Alpha},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment