upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #135773 from neolit123/1.36-remove-ControlPlaneKubeletLocalMode

Browse source 
kubeadm: remove the FG ControlPlaneKubeletLocalMode
This commit is contained in:
Kubernetes Prow Robot 2025-12-18 02:10:54 -08:00 committed by GitHub
commit 9618ffd46f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go
View file

@ -72,7 +72,6 @@ func NewControlPlaneJoinPhase() workflow.Phase {
RunAllSiblings: true,
ArgsValidator: cobra.NoArgs,
},
newEtcdLocalSubphase(),
newMarkControlPlaneSubphase(),
},
}
@ -90,22 +89,6 @@ func NewEtcdJoinPhase() workflow.Phase {
}
}
// TODO: Deprecated. Remove once ControlPlaneKubeletLocalMode is removed in 1.36.
// https://github.com/kubernetes/kubeadm/issues/2271
func newEtcdLocalSubphase() workflow.Phase {
return workflow.Phase{
Name: "etcd",
Short: "[DEPRECATED] Add a new local etcd member. Deprecated in favor of 'etcd-join' and will be removed in 1.36",
Run: runEtcdPhase,
InheritFlags: getControlPlaneJoinPhaseFlags("etcd"),
ArgsValidator: cobra.NoArgs,
Hidden: true,
RunIf: func(c workflow.RunData) (bool, error) {
return false, nil
},
}
}
func newMarkControlPlaneSubphase() workflow.Phase {
return workflow.Phase{
Name: "mark-control-plane",

6
cmd/kubeadm/app/features/features.go
View file

@ -34,9 +34,6 @@ import (
// of code conflicts because changes are more likely to be scattered
// across the file.
const (
// ControlPlaneKubeletLocalMode is expected to be in alpha in v1.31, beta in v1.33
ControlPlaneKubeletLocalMode = "ControlPlaneKubeletLocalMode"
// NodeLocalCRISocket is expected to be in alpha in v1.32, beta in v1.34, ga in v1.36
NodeLocalCRISocket = "NodeLocalCRISocket"
@ -58,8 +55,7 @@ var InitFeatureGates = FeatureList{
DeprecationMessage: "Deprecated in favor of the core kubelet feature UserNamespacesSupport which is beta since 1.30." +
" Once UserNamespacesSupport graduates to GA, kubeadm will start using it and RootlessControlPlane will be removed.",
},
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.GA, LockToDefault: true}},
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}},
}
// Feature represents a feature being gated