From d591b62b4aedf993942157a7c99b9cf2ddf8cca7 Mon Sep 17 00:00:00 2001 From: calvin Date: Wed, 24 Nov 2021 17:16:14 +0800 Subject: [PATCH] remove the kubeadm feature gate. --- cmd/kubeadm/app/componentconfigs/kubeproxy.go | 2 +- cmd/kubeadm/app/features/features.go | 3 --- cmd/kubeadm/test/cmd/init_test.go | 4 ---- test/e2e_kubeadm/networking_test.go | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmd/kubeadm/app/componentconfigs/kubeproxy.go b/cmd/kubeadm/app/componentconfigs/kubeproxy.go index f1eda80c7d5..d4cfe6ab5bb 100644 --- a/cmd/kubeadm/app/componentconfigs/kubeproxy.go +++ b/cmd/kubeadm/app/componentconfigs/kubeproxy.go @@ -94,7 +94,7 @@ func (kp *kubeProxyConfig) Default(cfg *kubeadmapi.ClusterConfiguration, localAP // The below code is necessary because while KubeProxy may be defined, the user may not // have defined any feature-gates, thus FeatureGates will be nil and the later insertion - // of any feature-gates (e.g. IPv6DualStack) will cause a panic. + // of any feature-gates will cause a panic. if kp.config.FeatureGates == nil { kp.config.FeatureGates = map[string]bool{} } diff --git a/cmd/kubeadm/app/features/features.go b/cmd/kubeadm/app/features/features.go index d98c264bb4a..a52ecf928b3 100644 --- a/cmd/kubeadm/app/features/features.go +++ b/cmd/kubeadm/app/features/features.go @@ -29,8 +29,6 @@ import ( ) const ( - // IPv6DualStack is expected to be beta in v1.21 - IPv6DualStack = "IPv6DualStack" // PublicKeysECDSA is expected to be alpha in v1.19 PublicKeysECDSA = "PublicKeysECDSA" // RootlessControlPlane is expected to be in alpha in v1.22 @@ -41,7 +39,6 @@ const ( // InitFeatureGates are the default feature gates for the init command var InitFeatureGates = FeatureList{ - IPv6DualStack: {FeatureSpec: featuregate.FeatureSpec{Default: true, LockToDefault: true, PreRelease: featuregate.GA}, HiddenInHelpText: true}, PublicKeysECDSA: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, RootlessControlPlane: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, UnversionedKubeletConfigMap: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, diff --git a/cmd/kubeadm/test/cmd/init_test.go b/cmd/kubeadm/test/cmd/init_test.go index 40a5f2794f0..8468c9dcf41 100644 --- a/cmd/kubeadm/test/cmd/init_test.go +++ b/cmd/kubeadm/test/cmd/init_test.go @@ -264,10 +264,6 @@ func TestCmdInitFeatureGates(t *testing.T) { name: "no feature gates passed", args: "", }, - { - name: "feature gate IPv6DualStack=true", - args: "--feature-gates=IPv6DualStack=true", - }, { name: "feature gate PublicKeysECDSA=true", args: "--feature-gates=PublicKeysECDSA=true", diff --git a/test/e2e_kubeadm/networking_test.go b/test/e2e_kubeadm/networking_test.go index 3dd08c5af9c..9810a9aa7bf 100644 --- a/test/e2e_kubeadm/networking_test.go +++ b/test/e2e_kubeadm/networking_test.go @@ -122,7 +122,7 @@ var _ = Describe("networking [setup-networking]", func() { }) }) }) - ginkgo.Context("dual-stack [Feature:IPv6DualStack]", func() { + ginkgo.Context("dual-stack", func() { ginkgo.Context("podSubnet", func() { ginkgo.It("should be properly configured if specified in kubeadm-config", func() { if !dualStack {