Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm: cleanup the feature gate of dual-stack. #106648

Merged
merged 1 commit into from
Dec 16, 2021
Merged

kubeadm: cleanup the feature gate of dual-stack. #106648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/componentconfigs/kubeproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
}
Expand Down
3 changes: 0 additions & 3 deletions cmd/kubeadm/app/features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}},
Expand Down
4 changes: 0 additions & 4 deletions cmd/kubeadm/test/cmd/init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_kubeadm/networking_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down