Skip to content

Commit 0bb0402

Browse files
authored
Merge pull request kubernetes#134781 from neolit123/1.35-removete-WaitForAllControlPlaneComponents-fg
kubeadm: remove the GA WaitForAllControlPlaneComponents FG
2 parents 87a2b71 + c49bdda commit 0bb0402

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cmd/kubeadm/app/features/features.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ const (
4545

4646
// RootlessControlPlane is expected to be in alpha in v1.22
4747
RootlessControlPlane = "RootlessControlPlane"
48-
49-
// WaitForAllControlPlaneComponents is expected to be alpha in v1.30
50-
WaitForAllControlPlaneComponents = "WaitForAllControlPlaneComponents"
5148
)
5249

5350
// InitFeatureGates are the default feature gates for the init command
@@ -61,9 +58,8 @@ var InitFeatureGates = FeatureList{
6158
DeprecationMessage: "Deprecated in favor of the core kubelet feature UserNamespacesSupport which is beta since 1.30." +
6259
" Once UserNamespacesSupport graduates to GA, kubeadm will start using it and RootlessControlPlane will be removed.",
6360
},
64-
WaitForAllControlPlaneComponents: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.GA, LockToDefault: true}},
65-
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.GA, LockToDefault: true}},
66-
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
61+
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.GA, LockToDefault: true}},
62+
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
6763
}
6864

6965
// Feature represents a feature being gated

0 commit comments

Comments
 (0)