From ad46b4d5bd741ee51ef5481baa8d957d917fbcbe Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 28 Nov 2021 19:21:35 -0800 Subject: [PATCH] Revert "Open nodeport to IPv6 in e2e tests" This reverts commit 064fd9215cb59baefb27a4e2fb7ff0dde18adcd2. --- docs/contributing/testing.md | 2 +- tests/e2e/kubetest2-kops/deployer/up.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/contributing/testing.md b/docs/contributing/testing.md index 068242468f..f9cf71acf6 100644 --- a/docs/contributing/testing.md +++ b/docs/contributing/testing.md @@ -86,7 +86,7 @@ kubetest2 kops \ If you don't specify any additional flags, the kOps deployer Go module will create a kubernetes cluster using the following defaults. ```shell -kops create cluster --name my.testcluster.com --admin-access --cloud aws --kubernetes-version v1.20.2 --master-count 1 --master-volume-size 48 --node-count 4 --node-volume-size 48 --override cluster.spec.nodePortAccess=0.0.0.0/0 --override cluster.spec.nodePortAccess=::/0 --ssh-public-key /home/ubuntu/.ssh/id_rsa.pub --yes --zones --master-size c5.large --networking calico +kops create cluster --name my.testcluster.com --admin-access --cloud aws --kubernetes-version v1.20.2 --master-count 1 --master-volume-size 48 --node-count 4 --node-volume-size 48 --override cluster.spec.nodePortAccess=0.0.0.0/0 --ssh-public-key /home/ubuntu/.ssh/id_rsa.pub --yes --zones --master-size c5.large --networking calico ``` For the `--zones` flag, the kOps deployer will select a random zone based on the `--cloud-provider` flag, for `aws` the full list of AWS zones can be found [here](https://github.com/kubernetes/kops/blob/master/tests/e2e/kubetest2-kops/aws/zones.go) and for `gce` the full list of GCE zones can be found [here](https://github.com/kubernetes/kops/blob/master/tests/e2e/kubetest2-kops/gce/zones.go). diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go index 473ba84f6e..e6ccdae4fc 100644 --- a/tests/e2e/kubetest2-kops/deployer/up.go +++ b/tests/e2e/kubetest2-kops/deployer/up.go @@ -114,7 +114,6 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e "--kubernetes-version", d.KubernetesVersion, "--ssh-public-key", d.SSHPublicKeyPath, "--override", "cluster.spec.nodePortAccess=0.0.0.0/0", - "--override", "cluster.spec.nodePortAccess=::/0", } if yes { args = append(args, "--yes")