github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #129589 from neolit123/1.33-remove-etcd-learner-fg

Browse Source 
kubeadm: remove the GA EtcdLearnerMode FG
This commit is contained in:
Kubernetes Prow Robot 2025-01-13 21:02:31 -08:00 committed by GitHub
commit a318576817
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/features/features.go
View File

@ -34,8 +34,6 @@ const (
PublicKeysECDSA = "PublicKeysECDSA" PublicKeysECDSA = "PublicKeysECDSA"
// RootlessControlPlane is expected to be in alpha in v1.22 // RootlessControlPlane is expected to be in alpha in v1.22
RootlessControlPlane = "RootlessControlPlane" RootlessControlPlane = "RootlessControlPlane"
// EtcdLearnerMode is expected to be in alpha in v1.27, beta in v1.29, ga in v1.32
EtcdLearnerMode = "EtcdLearnerMode"
// WaitForAllControlPlaneComponents is expected to be alpha in v1.30 // WaitForAllControlPlaneComponents is expected to be alpha in v1.30
WaitForAllControlPlaneComponents = "WaitForAllControlPlaneComponents" WaitForAllControlPlaneComponents = "WaitForAllControlPlaneComponents"
// ControlPlaneKubeletLocalMode is expected to be in alpha in v1.31, beta in v1.32 // ControlPlaneKubeletLocalMode is expected to be in alpha in v1.31, beta in v1.32
@ -55,7 +53,6 @@ var InitFeatureGates = FeatureList{
DeprecationMessage: "Deprecated in favor of the core kubelet feature UserNamespacesSupport which is beta since 1.30." + 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.", " Once UserNamespacesSupport graduates to GA, kubeadm will start using it and RootlessControlPlane will be removed.",
}, },
EtcdLearnerMode: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.GA, LockToDefault: true}},
WaitForAllControlPlaneComponents: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, WaitForAllControlPlaneComponents: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},
ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, ControlPlaneKubeletLocalMode: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},
NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, NodeLocalCRISocket: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},

6
cmd/kubeadm/app/phases/etcd/local.go
View File

@ -155,11 +155,7 @@ func CreateStackedEtcdStaticPodManifestFile(client clientset.Interface, manifest
return err return err
} }
klog.V(1).Infof("[etcd] Adding etcd member: %s", etcdPeerAddress) klog.V(1).Infof("[etcd] Adding etcd member: %s", etcdPeerAddress)
if features.Enabled(cfg.FeatureGates, features.EtcdLearnerMode) {
cluster, err = etcdClient.AddMemberAsLearner(nodeName, etcdPeerAddress) cluster, err = etcdClient.AddMemberAsLearner(nodeName, etcdPeerAddress)
} else {
cluster, err = etcdClient.AddMember(nodeName, etcdPeerAddress)
}
if err != nil { if err != nil {
return err return err
} }
@ -178,7 +174,6 @@ func CreateStackedEtcdStaticPodManifestFile(client clientset.Interface, manifest
return nil return nil
} }
if features.Enabled(cfg.FeatureGates, features.EtcdLearnerMode) {
learnerID, err := etcdClient.GetMemberID(etcdPeerAddress) learnerID, err := etcdClient.GetMemberID(etcdPeerAddress)
if err != nil { if err != nil {
return err return err
@ -187,7 +182,6 @@ func CreateStackedEtcdStaticPodManifestFile(client clientset.Interface, manifest
if err != nil { if err != nil {
return err return err
} }
}
fmt.Printf("[etcd] Waiting for the new etcd member to join the cluster. This can take up to %v\n", etcdHealthyCheckInterval*etcdHealthyCheckRetries) fmt.Printf("[etcd] Waiting for the new etcd member to join the cluster. This can take up to %v\n", etcdHealthyCheckInterval*etcdHealthyCheckRetries)
if _, err := etcdClient.WaitForClusterAvailable(etcdHealthyCheckRetries, etcdHealthyCheckInterval); err != nil { if _, err := etcdClient.WaitForClusterAvailable(etcdHealthyCheckRetries, etcdHealthyCheckInterval); err != nil {