Skip to content

Commit 3e0cdaf

Browse files
lentzi90lentzi90
committed
E2E: Image refactor
This makes the images configurable through the e2e_conf.yaml. The images are applied together with the cluster-template, instead of in the JustBefore code. Signed-off-by: Lennart Jern <[email protected]>
1 parent 6565445 commit 3e0cdaf

File tree

14 files changed

+90
-293
lines changed

14 files changed

+90
-293
lines changed

‎test/e2e/data/e2e_conf.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@ variables:
173173
CCM: "../../data/ccm/cloud-controller-manager.yaml"
174174
EXP_CLUSTER_RESOURCE_SET: "true"
175175
OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.6.1-x86_64-disk"
176+
OPENSTACK_BASTION_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img
177+
OPENSTACK_BASTION_IMAGE_HASH: 0c839612eb3f2469420f2ccae990827f
178+
OPENSTACK_BASTION_IMAGE_HASH_ALGORITHM: "md5"
176179
OPENSTACK_BASTION_MACHINE_FLAVOR: "m1.tiny"
177180
OPENSTACK_BASTION_MACHINE_FLAVOR_ALT: "m1.tiny.alt"
178181
OPENSTACK_CLOUD: "capo-e2e"
@@ -184,6 +187,7 @@ variables:
184187
OPENSTACK_FAILURE_DOMAIN: "testaz1"
185188
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
186189
OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-v1.31.2"
190+
OPENSTACK_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-11-21/ubuntu-2404-kube-v1.31.2.img
187191
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.30.1"
188192
OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
189193
OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
@@ -198,8 +202,10 @@ variables:
198202
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
199203
# The Flatcar image produced by the image-builder
200204
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4152.2.0-kube-v1.31.2"
205+
OPENSTACK_FLATCAR_IMAGE_URL: "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-4152.2.0-kube-v1.31.2.img"
201206
# A plain Flatcar from the Flatcar releases server
202207
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
208+
FLATCAR_IMAGE_URL: https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img
203209

204210
intervals:
205211
conformance/wait-control-plane: ["30m", "10s"]

‎test/e2e/data/kustomize/common-patches/images-without-ref/images.yaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
---
21
apiVersion: openstack.k-orc.cloud/v1alpha1
32
kind: Image
43
metadata:
54
name: node-image
65
spec:
7-
import:
8-
filter:
9-
name: ${OPENSTACK_IMAGE_NAME}
10-
managementPolicy: unmanaged
6+
resource:
7+
name: ${OPENSTACK_IMAGE_NAME}
8+
content:
9+
containerFormat: bare
10+
diskFormat: qcow2
11+
download:
12+
url: ${OPENSTACK_IMAGE_URL}
13+
managementPolicy: managed
14+
managedOptions:
15+
onDelete: detach
1116
cloudCredentialsRef:
1217
secretName: ${CLUSTER_NAME}-cloud-config
1318
cloudName: ${OPENSTACK_CLOUD}
@@ -17,10 +22,19 @@ kind: Image
1722
metadata:
1823
name: bastion-image
1924
spec:
20-
import:
21-
filter:
22-
name: ${OPENSTACK_BASTION_IMAGE_NAME}
23-
managementPolicy: unmanaged
25+
resource:
26+
name: ${OPENSTACK_BASTION_IMAGE_NAME}
27+
content:
28+
containerFormat: bare
29+
diskFormat: qcow2
30+
download:
31+
url: ${OPENSTACK_BASTION_IMAGE_URL}
32+
hash:
33+
algorithm: ${OPENSTACK_BASTION_IMAGE_HASH_ALGORITHM}
34+
value: ${OPENSTACK_BASTION_IMAGE_HASH}
35+
managementPolicy: managed
36+
managedOptions:
37+
onDelete: detach
2438
cloudCredentialsRef:
2539
secretName: ${CLUSTER_NAME}-cloud-config
26-
cloudName: ${OPENSTACK_CLOUD}
40+
cloudName: ${OPENSTACK_CLOUD}

‎test/e2e/data/kustomize/common-patches/images/images.yaml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
---
21
apiVersion: openstack.k-orc.cloud/v1alpha1
32
kind: Image
43
metadata:
54
name: node-image
65
spec:
7-
import:
8-
filter:
9-
name: ${OPENSTACK_IMAGE_NAME}
10-
managementPolicy: unmanaged
6+
resource:
7+
name: ${OPENSTACK_IMAGE_NAME}
8+
content:
9+
containerFormat: bare
10+
diskFormat: qcow2
11+
download:
12+
url: ${OPENSTACK_IMAGE_URL}
13+
managementPolicy: managed
14+
managedOptions:
15+
onDelete: detach
1116
cloudCredentialsRef:
1217
secretName: ${CLUSTER_NAME}-cloud-config
1318
cloudName: ${OPENSTACK_CLOUD}
@@ -17,10 +22,19 @@ kind: Image
1722
metadata:
1823
name: bastion-image
1924
spec:
20-
import:
21-
filter:
22-
name: ${OPENSTACK_BASTION_IMAGE_NAME}
23-
managementPolicy: unmanaged
25+
resource:
26+
name: ${OPENSTACK_BASTION_IMAGE_NAME}
27+
content:
28+
containerFormat: bare
29+
diskFormat: qcow2
30+
download:
31+
url: ${OPENSTACK_BASTION_IMAGE_URL}
32+
hash:
33+
algorithm: ${OPENSTACK_BASTION_IMAGE_HASH_ALGORITHM}
34+
value: ${OPENSTACK_BASTION_IMAGE_HASH}
35+
managementPolicy: managed
36+
managedOptions:
37+
onDelete: detach
2438
cloudCredentialsRef:
2539
secretName: ${CLUSTER_NAME}-cloud-config
26-
cloudName: ${OPENSTACK_CLOUD}
40+
cloudName: ${OPENSTACK_CLOUD}

‎test/e2e/data/kustomize/flatcar-sysext/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
resources:
32
- ../../../../../kustomize/v1beta1/flatcar-sysext
43

@@ -17,5 +16,8 @@ patches:
1716
name: node-image
1817
patch: |-
1918
- op: replace
20-
path: /spec/import/filter/name
19+
path: /spec/resource/name
2120
value: ${FLATCAR_IMAGE_NAME}
21+
- op: replace
22+
path: /spec/resource/content/download/url
23+
value: ${FLATCAR_IMAGE_URL}

‎test/e2e/data/kustomize/flatcar/kustomization.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@ patches:
1919
name: node-image
2020
patch: |-
2121
- op: replace
22-
path: /spec/import/filter/name
22+
path: /spec/resource/name
2323
value: ${OPENSTACK_FLATCAR_IMAGE_NAME}
24+
- op: replace
25+
path: /spec/resource/content/download/url
26+
value: ${OPENSTACK_FLATCAR_IMAGE_URL}

‎test/e2e/data/kustomize/k8s-upgrade/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../default
5+
- upgrade-from-images.yaml
56
- upgrade-from-template.yaml
67
- upgrade-to-template.yaml
78

‎test/e2e/data/kustomize/k8s-upgrade/upgrade-from-images.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
apiVersion: openstack.k-orc.cloud/v1alpha1
2+
kind: Image
3+
metadata:
4+
name: node-image-upgrade-from
5+
spec:
6+
import:
7+
filter:
8+
name: ${OPENSTACK_IMAGE_NAME_UPGRADE_FROM}
9+
managementPolicy: unmanaged
10+
cloudCredentialsRef:
11+
secretName: ${CLUSTER_NAME}-cloud-config
12+
cloudName: ${OPENSTACK_CLOUD}
13+
---
14+
apiVersion: openstack.k-orc.cloud/v1alpha1
15+
kind: Image
16+
metadata:
17+
name: bastion-image
18+
spec:
19+
import:
20+
filter:
21+
name: ${OPENSTACK_BASTION_IMAGE_NAME}
22+
managementPolicy: unmanaged
23+
cloudCredentialsRef:
24+
secretName: ${CLUSTER_NAME}-cloud-config
25+
cloudName: ${OPENSTACK_CLOUD}

0 commit comments

Comments
 (0)