github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

remove the kubeadm feature gate.

Browse Source
This commit is contained in:
calvin 2021-11-24 17:16:14 +08:00
parent e53cf07724
commit d591b62b4a
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/componentconfigs/kubeproxy.go
View File

@ -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 // 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 // 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 { if kp.config.FeatureGates == nil {
kp.config.FeatureGates = map[string]bool{} kp.config.FeatureGates = map[string]bool{}
} }

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

@ -29,8 +29,6 @@ import (
) )
const ( const (
// IPv6DualStack is expected to be beta in v1.21
IPv6DualStack = "IPv6DualStack"
// PublicKeysECDSA is expected to be alpha in v1.19 // PublicKeysECDSA is expected to be alpha in v1.19
PublicKeysECDSA = "PublicKeysECDSA" PublicKeysECDSA = "PublicKeysECDSA"
// RootlessControlPlane is expected to be in alpha in v1.22 // 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 // InitFeatureGates are the default feature gates for the init command
var InitFeatureGates = FeatureList{ 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}}, PublicKeysECDSA: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},
RootlessControlPlane: {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}}, UnversionedKubeletConfigMap: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}},

4
cmd/kubeadm/test/cmd/init_test.go
View File

@ -264,10 +264,6 @@ func TestCmdInitFeatureGates(t *testing.T) {
name: "no feature gates passed", name: "no feature gates passed",
args: "", args: "",
}, },
{
name: "feature gate IPv6DualStack=true",
args: "--feature-gates=IPv6DualStack=true",
},
{ {
name: "feature gate PublicKeysECDSA=true", name: "feature gate PublicKeysECDSA=true",
args: "--feature-gates=PublicKeysECDSA=true", args: "--feature-gates=PublicKeysECDSA=true",

2
test/e2e_kubeadm/networking_test.go
View File

@ -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.Context("podSubnet", func() {
ginkgo.It("should be properly configured if specified in kubeadm-config", func() { ginkgo.It("should be properly configured if specified in kubeadm-config", func() {
if !dualStack { if !dualStack {