Skip to content

Commit 163253b

Browse files
author
Joshua Reed
committed
Cleanup e2e stuff a bit further.
1 parent 7f7d110 commit 163253b

23 files changed

+131
-122
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
214214

215215
##@ End-to-End Testing
216216

217-
CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/*/cluster-template*/* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
217+
CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta2/*/cluster-template*/* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
218218
CLUSTER_TEMPLATES_OUTPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack -type d -name "cluster-template*" -exec echo {}.yaml \;)
219219
.PHONY: e2e-cluster-templates
220220
e2e-cluster-templates: $(CLUSTER_TEMPLATES_OUTPUT_FILES) ## Generate cluster template files for e2e testing.
@@ -226,6 +226,7 @@ e2e-essentials: bin/ginkgo_v1 e2e-cluster-templates kind-cluster ## Fulfill esse
226226

227227
JOB ?= .*
228228
run-e2e: e2e-essentials ## Run e2e testing. JOB is an optional REGEXP to select certainn test cases to run. e.g. JOB=PR-Blocking, JOB=Conformance
229+
kubectl apply -f cloud-config.yaml && \
229230
cd test/e2e && \
230231
ginkgo_v1 -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -nodes=1 -noColor=false ./... -- \
231232
-e2e.artifacts-folder=${PROJECT_DIR}/_artifacts \

‎test/e2e/config/cloudstack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ variables:
112112
IP_FAMILY: "IPv4"
113113
NODE_DRAIN_TIMEOUT: "60s"
114114

115-
CLOUDSTACK_FD1_NAME: "FD1"
116-
CLOUDSTACK_FD1_SECRET_NAME: "Secret1"
115+
CLOUDSTACK_FD1_NAME: "fd1"
116+
CLOUDSTACK_FD1_SECRET_NAME: "secret1"
117117
CLOUDSTACK_ZONE_NAME: zone1
118118
CLOUDSTACK_INVALID_ZONE_NAME: zoneXXXX
119119
CLOUDSTACK_INVALID_NETWORK_NAME: networkXXXX

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ spec:
2828
port: 6443
2929
failureDomains:
3030
- name: ${CLOUDSTACK_FD1_NAME}
31+
acsendpoint:
32+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
33+
namespace: default
3134
zone:
3235
name : ${CLOUDSTACK_ZONE_NAME}
3336
network:
3437
name: ${CLOUDSTACK_NETWORK_NAME}
35-
acsendpoint:
36-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
37-
namespace: default
3838
---
3939
kind: KubeadmControlPlane
4040
apiVersion: controlplane.cluster.x-k8s.io/v1beta1

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-affinity-group-anti.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
joinConfiguration:
99
nodeRegistration:
1010
kubeletExtraArgs:
11-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
11+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
name: '{{ local_hostname }}'
1313
preKubeadmCommands:
1414
- swapoff -a
@@ -66,12 +66,12 @@ spec:
6666
initConfiguration:
6767
nodeRegistration:
6868
kubeletExtraArgs:
69-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
69+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7070
name: '{{ local_hostname }}'
7171
joinConfiguration:
7272
nodeRegistration:
7373
kubeletExtraArgs:
74-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
74+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7575
name: '{{ local_hostname }}'
7676
preKubeadmCommands:
7777
- swapoff -a
@@ -93,10 +93,10 @@ spec:
9393
port: 6443
9494
failureDomains:
9595
- name: ${CLOUDSTACK_FD1_NAME}
96+
acsendpoint:
97+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
98+
namespace: default
9699
zone:
97-
acsendpoint:
98-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
99-
namespace: default
100100
name: ${CLOUDSTACK_ZONE_NAME}
101101
network:
102102
name: ${CLOUDSTACK_NETWORK_NAME}

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-affinity-group-pro.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
joinConfiguration:
99
nodeRegistration:
1010
kubeletExtraArgs:
11-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
11+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
name: '{{ local_hostname }}'
1313
preKubeadmCommands:
1414
- swapoff -a
@@ -66,12 +66,12 @@ spec:
6666
initConfiguration:
6767
nodeRegistration:
6868
kubeletExtraArgs:
69-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
69+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7070
name: '{{ local_hostname }}'
7171
joinConfiguration:
7272
nodeRegistration:
7373
kubeletExtraArgs:
74-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
74+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7575
name: '{{ local_hostname }}'
7676
preKubeadmCommands:
7777
- swapoff -a
@@ -93,10 +93,10 @@ spec:
9393
port: 6443
9494
failureDomains:
9595
- name: ${CLOUDSTACK_FD1_NAME}
96+
acsendpoint:
97+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
98+
namespace: default
9699
zone:
97-
acsendpoint:
98-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
99-
namespace: default
100100
name: ${CLOUDSTACK_ZONE_NAME}
101101
network:
102102
name: ${CLOUDSTACK_NETWORK_NAME}

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
joinConfiguration:
2323
nodeRegistration:
2424
kubeletExtraArgs:
25-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
25+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
2626
name: '{{ local_hostname }}'
2727
mounts:
2828
- - LABEL=${CLOUDSTACK_DISK_OFFERING_LABEL}
@@ -97,12 +97,12 @@ spec:
9797
initConfiguration:
9898
nodeRegistration:
9999
kubeletExtraArgs:
100-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
100+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
101101
name: '{{ local_hostname }}'
102102
joinConfiguration:
103103
nodeRegistration:
104104
kubeletExtraArgs:
105-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
105+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
106106
name: '{{ local_hostname }}'
107107
mounts:
108108
- - LABEL=${CLOUDSTACK_DISK_OFFERING_LABEL}
@@ -127,10 +127,10 @@ spec:
127127
port: 6443
128128
failureDomains:
129129
- name: ${CLOUDSTACK_FD1_NAME}
130+
acsendpoint:
131+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
132+
namespace: default
130133
zone:
131-
acsendpoint:
132-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
133-
namespace: default
134134
name: ${CLOUDSTACK_ZONE_NAME}
135135
network:
136136
name: ${CLOUDSTACK_NETWORK_NAME}

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/cluster-with-disk-offering.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ spec:
88
nodeRegistration:
99
name: '{{ local_hostname }}'
1010
kubeletExtraArgs:
11-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
11+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
clusterConfiguration:
1313
imageRepository: k8s.gcr.io
1414
joinConfiguration:
1515
nodeRegistration:
1616
name: '{{ local_hostname }}'
1717
kubeletExtraArgs:
18-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
18+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1919
preKubeadmCommands:
2020
- swapoff -a
2121
diskSetup:

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-disk-offering/md.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
nodeRegistration:
4848
name: '{{ local_hostname }}'
4949
kubeletExtraArgs:
50-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
50+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
5151
preKubeadmCommands:
5252
- swapoff -a
5353
diskSetup:

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-insufficient-compute-resources-for-upgrade.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
joinConfiguration:
99
nodeRegistration:
1010
kubeletExtraArgs:
11-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
11+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
name: '{{ local_hostname }}'
1313
preKubeadmCommands:
1414
- swapoff -a
@@ -66,12 +66,12 @@ spec:
6666
initConfiguration:
6767
nodeRegistration:
6868
kubeletExtraArgs:
69-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
69+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7070
name: '{{ local_hostname }}'
7171
joinConfiguration:
7272
nodeRegistration:
7373
kubeletExtraArgs:
74-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
74+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7575
name: '{{ local_hostname }}'
7676
preKubeadmCommands:
7777
- swapoff -a
@@ -119,10 +119,10 @@ spec:
119119
port: 6443
120120
failureDomains:
121121
- name: ${CLOUDSTACK_FD1_NAME}
122+
acsendpoint:
123+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
124+
namespace: default
122125
zone:
123-
acsendpoint:
124-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
125-
namespace: default
126126
name: ${CLOUDSTACK_ZONE_NAME}
127127
network:
128128
name: ${CLOUDSTACK_NETWORK_NAME}

‎test/e2e/data/infrastructure-cloudstack/v1beta2/cluster-template-insufficient-compute-resources.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
joinConfiguration:
99
nodeRegistration:
1010
kubeletExtraArgs:
11-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
11+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
1212
name: '{{ local_hostname }}'
1313
preKubeadmCommands:
1414
- swapoff -a
@@ -66,12 +66,12 @@ spec:
6666
initConfiguration:
6767
nodeRegistration:
6868
kubeletExtraArgs:
69-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
69+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7070
name: '{{ local_hostname }}'
7171
joinConfiguration:
7272
nodeRegistration:
7373
kubeletExtraArgs:
74-
provider-id: cloudstack:///'{{ ds.meta_data.instance_id }}'
74+
provider-id: "cloudstack:///'{{ ds.meta_data.instance_id }}'"
7575
name: '{{ local_hostname }}'
7676
preKubeadmCommands:
7777
- swapoff -a
@@ -93,10 +93,10 @@ spec:
9393
port: 6443
9494
failureDomains:
9595
- name: ${CLOUDSTACK_FD1_NAME}
96+
acsendpoint:
97+
name: ${CLOUDSTACK_FD1_SECRET_NAME}
98+
namespace: default
9699
zone:
97-
acsendpoint:
98-
name: ${CLOUDSTACK_FD1_SECRET_NAME}
99-
namespace: default
100100
name: ${CLOUDSTACK_ZONE_NAME}
101101
network:
102102
name: ${CLOUDSTACK_NETWORK_NAME}

0 commit comments

Comments
 (0)