Skip to content

Commit 43dfe7f

Browse files
committed
ci: use templating for capx tests
1 parent 3640635 commit 43dfe7f

File tree

6 files changed

+32
-31
lines changed

6 files changed

+32
-31
lines changed

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ spec:
107107
cluster:
108108
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
109109
type: name
110-
image:
111-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
112-
type: name
110+
imageLookup:
111+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
112+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
113113
memorySize: 4Gi
114114
subnets:
115115
- name: ${NUTANIX_SUBNET_NAME}
@@ -147,9 +147,9 @@ spec:
147147
cluster:
148148
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
149149
type: name
150-
image:
151-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
152-
type: name
150+
imageLookup:
151+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
152+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
153153
memorySize: 4Gi
154154
subnets:
155155
- name: ${NUTANIX_SUBNET_NAME}

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ spec:
104104
cluster:
105105
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
106106
type: name
107-
image:
108-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
109-
type: name
107+
imageLookup:
108+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
109+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
110110
memorySize: 4Gi
111111
subnets:
112112
- name: ${NUTANIX_SUBNET_NAME}
@@ -144,9 +144,9 @@ spec:
144144
cluster:
145145
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
146146
type: name
147-
image:
148-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
149-
type: name
147+
imageLookup:
148+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
149+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
150150
memorySize: 4Gi
151151
subnets:
152152
- name: ${NUTANIX_SUBNET_NAME}

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ spec:
107107
cluster:
108108
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
109109
type: name
110-
image:
111-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
112-
type: name
110+
imageLookup:
111+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
112+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
113113
memorySize: 4Gi
114114
subnets:
115115
- name: ${NUTANIX_SUBNET_NAME}
@@ -147,9 +147,9 @@ spec:
147147
cluster:
148148
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
149149
type: name
150-
image:
151-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
152-
type: name
150+
imageLookup:
151+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
152+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
153153
memorySize: 4Gi
154154
subnets:
155155
- name: ${NUTANIX_SUBNET_NAME}

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ spec:
104104
cluster:
105105
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
106106
type: name
107-
image:
108-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
109-
type: name
107+
imageLookup:
108+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
109+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
110110
memorySize: 4Gi
111111
subnets:
112112
- name: ${NUTANIX_SUBNET_NAME}
@@ -144,9 +144,9 @@ spec:
144144
cluster:
145145
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
146146
type: name
147-
image:
148-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
149-
type: name
147+
imageLookup:
148+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
149+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
150150
memorySize: 4Gi
151151
subnets:
152152
- name: ${NUTANIX_SUBNET_NAME}

hack/examples/patches/nutanix/initialize-variables.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
cluster:
2929
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
3030
type: name
31-
image:
32-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
33-
type: name
31+
imageLookup:
32+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
33+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
3434
subnets:
3535
- name: ${NUTANIX_SUBNET_NAME}
3636
type: name
@@ -46,9 +46,9 @@
4646
cluster:
4747
name: ${NUTANIX_PRISM_ELEMENT_CLUSTER_NAME}
4848
type: name
49-
image:
50-
name: ${NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME}
51-
type: name
49+
imageLookup:
50+
baseOS: ${NUTANIX_MACHINE_TEMPLATE_BASE_OS}
51+
format: ${NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT}
5252
memorySize: 4Gi
5353
subnets:
5454
- name: ${NUTANIX_SUBNET_NAME}

test/e2e/config/caren.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ variables:
201201
# # Name of the Prism Element cluster.
202202
# NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ""
203203
# # Name of the OS image pre-uploaded in PC.
204-
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.30.5-20240930171619
204+
NUTANIX_MACHINE_TEMPLATE_LOOKUP_FORMAT: "nkp-{{.BaseOS}}-release-{{.K8sVersion}}-*"
205+
NUTANIX_MACHINE_TEMPLATE_BASE_OS: "rocky-9.4"
205206
# # Name of the subnet to be assigned to the VMs.
206207
# NUTANIX_SUBNET_NAME: ""
207208
# # Name of the storage container to CSI driver

0 commit comments

Comments
 (0)