From 751ad37a05a5c2b87703c2cd7f12bc0abd67bb6f Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Tue, 28 Sep 2021 11:58:46 +0800 Subject: [PATCH] kubeadm: cleanup remove some empty feature gate for dual-stack --- .../kubeadm/validation/validation_test.go | 20 +++------------ .../app/componentconfigs/kubelet_test.go | 1 - cmd/kubeadm/app/constants/constants.go | 2 +- .../app/phases/controlplane/manifests_test.go | 25 +++++++++++++++++++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go index 2aad26f175b..2d0063a5739 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go @@ -28,7 +28,6 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/features" ) func TestValidateToken(t *testing.T) { @@ -1115,17 +1114,14 @@ func TestGetClusterNodeMask(t *testing.T) { expectedError bool }{ { - name: "dual ipv4 default mask", - cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, - }, + name: "dual ipv4 default mask", + cfg: &kubeadmapi.ClusterConfiguration{}, isIPv6: false, expectedMask: 24, }, { name: "dual ipv4 custom mask", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size": "21", "node-cidr-mask-size-ipv4": "23"}, }, @@ -1134,17 +1130,14 @@ func TestGetClusterNodeMask(t *testing.T) { expectedMask: 23, }, { - name: "dual ipv6 default mask", - cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, - }, + name: "dual ipv6 default mask", + cfg: &kubeadmapi.ClusterConfiguration{}, isIPv6: true, expectedMask: 64, }, { name: "dual ipv6 custom mask", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size-ipv6": "83"}, }, @@ -1155,7 +1148,6 @@ func TestGetClusterNodeMask(t *testing.T) { { name: "dual ipv4 custom mask", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size-ipv4": "23"}, }, @@ -1166,7 +1158,6 @@ func TestGetClusterNodeMask(t *testing.T) { { name: "dual ipv4 wrong mask", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size-ipv4": "aa"}, }, @@ -1177,7 +1168,6 @@ func TestGetClusterNodeMask(t *testing.T) { { name: "dual ipv6 default mask and legacy flag", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size": "23"}, }, @@ -1188,7 +1178,6 @@ func TestGetClusterNodeMask(t *testing.T) { { name: "dual ipv6 custom mask and legacy flag", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size": "23", "node-cidr-mask-size-ipv6": "83"}, }, @@ -1199,7 +1188,6 @@ func TestGetClusterNodeMask(t *testing.T) { { name: "dual ipv6 custom mask and wrong flag", cfg: &kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{features.IPv6DualStack: true}, ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{"node-cidr-mask-size": "23", "node-cidr-mask-size-ipv6": "a83"}, }, diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_test.go index ebf31e6357c..a5000b15150 100644 --- a/cmd/kubeadm/app/componentconfigs/kubelet_test.go +++ b/cmd/kubeadm/app/componentconfigs/kubelet_test.go @@ -127,7 +127,6 @@ func TestKubeletDefault(t *testing.T) { { name: "Service subnet, enabled dual stack defaulting works", clusterCfg: kubeadmapi.ClusterConfiguration{ - FeatureGates: map[string]bool{}, Networking: kubeadmapi.Networking{ ServiceSubnet: "192.168.0.0/16", }, diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 7091d3bd179..c08fd4ba6d8 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -653,7 +653,7 @@ func GetKubernetesServiceCIDR(svcSubnetList string) (*net.IPNet, error) { return nil, errors.Wrapf(err, "unable to parse ServiceSubnet %v", svcSubnetList) } if len(svcSubnets) == 0 { - return nil, errors.New("received empty ServiceSubnet for dual-stack") + return nil, errors.New("received empty ServiceSubnet") } return svcSubnets[0], nil } diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index 0075ac87ede..d941df32fe2 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -539,6 +539,31 @@ func TestGetControllerManagerCommand(t *testing.T) { cfg *kubeadmapi.ClusterConfiguration expected []string }{ + { + name: "custom cluster name for " + cpVersion, + cfg: &kubeadmapi.ClusterConfiguration{ + KubernetesVersion: cpVersion, + CertificatesDir: testCertsDir, + ClusterName: "some-other-cluster-name", + }, + expected: []string{ + "kube-controller-manager", + "--bind-address=127.0.0.1", + "--leader-elect=true", + "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", + "--root-ca-file=" + testCertsDir + "/ca.crt", + "--service-account-private-key-file=" + testCertsDir + "/sa.key", + "--cluster-signing-cert-file=" + testCertsDir + "/ca.crt", + "--cluster-signing-key-file=" + testCertsDir + "/ca.key", + "--use-service-account-credentials=true", + "--controllers=*,bootstrapsigner,tokencleaner", + "--authentication-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", + "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", + "--client-ca-file=" + testCertsDir + "/ca.crt", + "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", + "--cluster-name=some-other-cluster-name", + }, + }, { name: "custom certs dir for " + cpVersion, cfg: &kubeadmapi.ClusterConfiguration{