Skip to content

Commit 6ed691d

Browse files
committed
Do not specify IP address for tests with isolated network
1 parent e1e449e commit 6ed691d

File tree

10 files changed

+13
-17
lines changed

10 files changed

+13
-17
lines changed

test/e2e/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ The first step to running the e2e tests is setting up the required environment v
2727
| `CLOUDSTACK_ZONE_NAME` | The zone name | `zone1` |
2828
| `CLOUDSTACK_NETWORK_NAME` | The network name. If not exisiting an isolated network with the name is created. | `Shared1` |
2929
| `CLUSTER_ENDPOINT_IP` | The cluster endpoint IP | `172.16.2.199` |
30-
| `CLUSTER_ENDPOINT_PORT` | The cluster endpoint port | `6443` |
3130
| `CLUSTER_ENDPOINT_IP_2` | The cluster endpoint IP for a second cluster | `172.16.2.199` |
32-
| `CLUSTER_ENDPOINT_PORT_2` | The cluster endpoint port for a second cluster | `6444` |
3331
| `CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING` | The machine offering for the control plane VM instances | `Large Instance` |
3432
| `CLOUDSTACK_WORKER_MACHINE_OFFERING` | The machine offering for the worker node VM instances | `Medium Instance` |
3533
| `CLOUDSTACK_TEMPLATE_NAME` | The machine template for both control plane and worke node VM instances | `kube-v1.20.10/ubuntu-2004` |

test/e2e/config/cloudstack.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ variables:
121121
CLOUDSTACK_SHARED_NETWORK_NAME: Shared1
122122
CLUSTER_ENDPOINT_IP: 172.16.2.199
123123
CLUSTER_ENDPOINT_IP_2: 172.16.2.198
124-
CLUSTER_ENDPOINT_PORT: 6443
125-
CLUSTER_ENDPOINT_PORT_2: 6443
126124
CLOUDSTACK_CONTROL_PLANE_MACHINE_OFFERING: "Large Instance"
127125
CLOUDSTACK_INVALID_CONTROL_PLANE_MACHINE_OFFERING: "OfferingXXXX"
128126
CLOUDSTACK_EXTREMELY_LARGE_CONTROL_PLANE_MACHINE_OFFERING: "Extremely Large Instance"

test/e2e/data/infrastructure-cloudstack/v1beta1/bases/cluster-with-kcp.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ spec:
2828
network:
2929
name: ${CLOUDSTACK_NETWORK_NAME}
3030
controlPlaneEndpoint:
31-
host: ${CLUSTER_ENDPOINT_IP}
32-
port: ${CLUSTER_ENDPOINT_PORT}
31+
host: ""
32+
port: 6443
3333
---
3434
kind: KubeadmControlPlane
3535
apiVersion: controlplane.cluster.x-k8s.io/v1beta1

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-account/cloudstack-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
account: ${CLOUDSTACK_INVALID_ACCOUNT_NAME}
1111
domain: ${CLOUDSTACK_DOMAIN_NAME}
1212
controlPlaneEndpoint:
13-
host: ${CLUSTER_ENDPOINT_IP}
14-
port: ${CLUSTER_ENDPOINT_PORT}
13+
host: ""
14+
port: 6443

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-domain/cloudstack-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
account: ${CLOUDSTACK_ACCOUNT_NAME}
1111
domain: ${CLOUDSTACK_INVALID_DOMAIN_NAME}
1212
controlPlaneEndpoint:
13-
host: ${CLUSTER_ENDPOINT_IP}
14-
port: ${CLUSTER_ENDPOINT_PORT}
13+
host: ""
14+
port: 6443

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-invalid-zone/cloudstack-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
network:
99
name: ${CLOUDSTACK_NETWORK_NAME}
1010
controlPlaneEndpoint:
11-
host: ${CLUSTER_ENDPOINT_IP}
12-
port: ${CLUSTER_ENDPOINT_PORT}
11+
host: ""
12+
port: 6443

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-resource-cleanup/cloudstack-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spec:
99
name: ${CLOUDSTACK_NEW_NETWORK_NAME}
1010
controlPlaneEndpoint:
1111
host: ""
12-
port: ${CLUSTER_ENDPOINT_PORT}
12+
port: 6443

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-second-cluster/cloudstack-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ spec:
1111
domain: ${CLOUDSTACK_DOMAIN_NAME}
1212
controlPlaneEndpoint:
1313
host: ${CLUSTER_ENDPOINT_IP_2}
14-
port: ${CLUSTER_ENDPOINT_PORT_2}
14+
port: 6443

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-shared-network-kubevip/cluster-with-shared-network-and-kubevip.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
name: ${CLOUDSTACK_SHARED_NETWORK_NAME}
3030
controlPlaneEndpoint:
3131
host: ${CLUSTER_ENDPOINT_IP}
32-
port: ${CLUSTER_ENDPOINT_PORT}
32+
port: 6443
3333
---
3434
kind: KubeadmControlPlane
3535
apiVersion: controlplane.cluster.x-k8s.io/v1beta1

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-subdomain/cloudstack-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
account: ${CLOUDSTACK_SUBDOMAIN_ACCOUNT_NAME}
1111
domain: ${CLOUDSTACK_SUBDOMAIN_PATH}
1212
controlPlaneEndpoint:
13-
host: ${CLUSTER_ENDPOINT_IP}
14-
port: ${CLUSTER_ENDPOINT_PORT}
13+
host: ""
14+
port: 6443

0 commit comments

Comments
 (0)