From 496deb6df9a56f2cb2cc15620e3b0f9dea04da09 Mon Sep 17 00:00:00 2001 From: pacoxu Date: Wed, 3 Mar 2021 15:52:14 +0800 Subject: [PATCH] cleanup: disable dual stack for some manifest UT --- cmd/kubeadm/app/phases/controlplane/manifests_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index ee45269e9e6..61bb33e95fa 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -598,6 +598,7 @@ func TestGetControllerManagerCommand(t *testing.T) { KubernetesVersion: cpVersion, CertificatesDir: testCertsDir, ClusterName: "some-other-cluster-name", + FeatureGates: map[string]bool{features.IPv6DualStack: false}, }, expected: []string{ "kube-controller-manager", @@ -615,6 +616,7 @@ func TestGetControllerManagerCommand(t *testing.T) { "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--client-ca-file=" + testCertsDir + "/ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", + "--feature-gates=IPv6DualStack=false", "--cluster-name=some-other-cluster-name", }, }, @@ -679,6 +681,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, CertificatesDir: testCertsDir, KubernetesVersion: cpVersion, + FeatureGates: map[string]bool{features.IPv6DualStack: false}, }, expected: []string{ "kube-controller-manager", @@ -696,6 +699,7 @@ func TestGetControllerManagerCommand(t *testing.T) { "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--client-ca-file=" + testCertsDir + "/ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", + "--feature-gates=IPv6DualStack=false", "--allocate-node-cidrs=true", "--cluster-cidr=10.0.1.15/16", "--service-cluster-ip-range=172.20.0.0/24", @@ -811,7 +815,6 @@ func TestGetControllerManagerCommand(t *testing.T) { }, CertificatesDir: testCertsDir, KubernetesVersion: cpVersion, - FeatureGates: map[string]bool{features.IPv6DualStack: true}, }, expected: []string{ "kube-controller-manager", @@ -829,7 +832,6 @@ func TestGetControllerManagerCommand(t *testing.T) { "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--client-ca-file=" + testCertsDir + "/ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", - "--feature-gates=IPv6DualStack=true", "--allocate-node-cidrs=true", "--cluster-cidr=10.0.1.15/16,2001:db8::/64", "--node-cidr-mask-size-ipv4=20",