github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99687 from pacoxu/dual-stack/follow-up-1

Browse Source 
cleanup: disable dual stack for some manifest UT
This commit is contained in:
Kubernetes Prow Robot 2021-03-04 00:29:23 -08:00 committed by GitHub
commit 15213128e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/phases/controlplane/manifests_test.go
View File

@ -598,6 +598,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
KubernetesVersion: cpVersion, KubernetesVersion: cpVersion,
CertificatesDir: testCertsDir, CertificatesDir: testCertsDir,
ClusterName: "some-other-cluster-name", ClusterName: "some-other-cluster-name",
FeatureGates: map[string]bool{features.IPv6DualStack: false},
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
@ -615,6 +616,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + testCertsDir + "/ca.crt", "--client-ca-file=" + testCertsDir + "/ca.crt",
"--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt",
"--feature-gates=IPv6DualStack=false",
"--cluster-name=some-other-cluster-name", "--cluster-name=some-other-cluster-name",
}, },
}, },
@ -679,6 +681,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
CertificatesDir: testCertsDir, CertificatesDir: testCertsDir,
KubernetesVersion: cpVersion, KubernetesVersion: cpVersion,
FeatureGates: map[string]bool{features.IPv6DualStack: false},
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
@ -696,6 +699,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + testCertsDir + "/ca.crt", "--client-ca-file=" + testCertsDir + "/ca.crt",
"--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt",
"--feature-gates=IPv6DualStack=false",
"--allocate-node-cidrs=true", "--allocate-node-cidrs=true",
"--cluster-cidr=10.0.1.15/16", "--cluster-cidr=10.0.1.15/16",
"--service-cluster-ip-range=172.20.0.0/24", "--service-cluster-ip-range=172.20.0.0/24",
@ -846,7 +850,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
CertificatesDir: testCertsDir, CertificatesDir: testCertsDir,
KubernetesVersion: cpVersion, KubernetesVersion: cpVersion,
FeatureGates: map[string]bool{features.IPv6DualStack: true},
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
@ -864,7 +867,6 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + testCertsDir + "/ca.crt", "--client-ca-file=" + testCertsDir + "/ca.crt",
"--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt", "--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt",
"--feature-gates=IPv6DualStack=true",
"--allocate-node-cidrs=true", "--allocate-node-cidrs=true",
"--cluster-cidr=10.0.1.15/16,2001:db8::/64", "--cluster-cidr=10.0.1.15/16,2001:db8::/64",
"--node-cidr-mask-size-ipv4=20", "--node-cidr-mask-size-ipv4=20",