Skip to content

Commit 31ee7f1

Browse files
chrischdisbueringer
chrischdi
and
sbueringer
authoredAug 14, 2024··
✨ Bump e2e tests to kubernetes v1.31.0 (#3154)
* Bump e2e tests to kubernetes v1.31.0 * revert to CPI v1.31.0-rc.1 * fix flatcar image --------- Co-authored-by: Stefan Bueringer <buringerst@vmware.com>
·
v1.13.0-beta.0templates/v1.31.0
1 parent 4f8d638 commit 31ee7f1

File tree

13 files changed

+185
-224
lines changed

13 files changed

+185
-224
lines changed
 

‎internal/test/helpers/vcsim/model.go

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ var (
3838
"ubuntu-2204-kube-v1.28.0",
3939
"ubuntu-2204-kube-v1.29.0",
4040
"ubuntu-2204-kube-v1.30.0",
41+
"ubuntu-2204-kube-v1.31.0",
4142
}
4243
)
4344

‎packaging/flavorgen/cloudprovider/cpi/cpi.yaml

+20-26
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,25 @@ spec:
131131
vsphere-cpi-infra: daemonset
132132
spec:
133133
tolerations:
134-
- key: node.cloudprovider.kubernetes.io/uninitialized
135-
value: "true"
136-
effect: NoSchedule
137-
- key: node-role.kubernetes.io/master
138-
effect: NoSchedule
139-
operator: Exists
140-
- key: node-role.kubernetes.io/control-plane
141-
effect: NoSchedule
142-
operator: Exists
143-
- key: node.kubernetes.io/not-ready
144-
effect: NoSchedule
145-
operator: Exists
146-
- key: CriticalAddonsOnly
147-
effect: NoExecute
148-
operator: Exists
134+
- effect: NoSchedule
135+
key: node.cloudprovider.kubernetes.io/uninitialized
136+
value: "true"
137+
- effect: NoSchedule
138+
key: node-role.kubernetes.io/control-plane
139+
operator: Exists
140+
- effect: NoSchedule
141+
key: node.kubernetes.io/not-ready
142+
operator: Exists
143+
- effect: NoExecute
144+
key: CriticalAddonsOnly
145+
operator: Exists
146+
affinity:
147+
nodeAffinity:
148+
requiredDuringSchedulingIgnoredDuringExecution:
149+
nodeSelectorTerms:
150+
- matchExpressions:
151+
- key: node-role.kubernetes.io/control-plane
152+
operator: Exists
149153
securityContext:
150154
fsGroup: 1001
151155
runAsUser: 1001
@@ -155,7 +159,7 @@ spec:
155159
priorityClassName: system-node-critical
156160
containers:
157161
- name: vsphere-cpi
158-
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0-rc.0
162+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.31.0
159163
imagePullPolicy: IfNotPresent
160164
args:
161165
- --cloud-provider=vsphere
@@ -169,16 +173,6 @@ spec:
169173
- name: vsphere-config-volume
170174
configMap:
171175
name: cloud-config
172-
affinity:
173-
nodeAffinity:
174-
requiredDuringSchedulingIgnoredDuringExecution:
175-
nodeSelectorTerms:
176-
- matchExpressions:
177-
- key: node-role.kubernetes.io/control-plane
178-
operator: Exists
179-
- matchExpressions:
180-
- key: node-role.kubernetes.io/master
181-
operator: Exists
182176
---
183177
# Source: vsphere-cpi/templates/role-binding.yaml
184178
apiVersion: v1

‎templates/cluster-template-external-loadbalancer.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1258,21 +1258,25 @@ data:
12581258
vsphere-cpi-infra: daemonset
12591259
spec:
12601260
tolerations:
1261-
- key: node.cloudprovider.kubernetes.io/uninitialized
1262-
value: "true"
1263-
effect: NoSchedule
1264-
- key: node-role.kubernetes.io/master
1265-
effect: NoSchedule
1266-
operator: Exists
1267-
- key: node-role.kubernetes.io/control-plane
1268-
effect: NoSchedule
1269-
operator: Exists
1270-
- key: node.kubernetes.io/not-ready
1271-
effect: NoSchedule
1272-
operator: Exists
1273-
- key: CriticalAddonsOnly
1274-
effect: NoExecute
1275-
operator: Exists
1261+
- effect: NoSchedule
1262+
key: node.cloudprovider.kubernetes.io/uninitialized
1263+
value: "true"
1264+
- effect: NoSchedule
1265+
key: node-role.kubernetes.io/control-plane
1266+
operator: Exists
1267+
- effect: NoSchedule
1268+
key: node.kubernetes.io/not-ready
1269+
operator: Exists
1270+
- effect: NoExecute
1271+
key: CriticalAddonsOnly
1272+
operator: Exists
1273+
affinity:
1274+
nodeAffinity:
1275+
requiredDuringSchedulingIgnoredDuringExecution:
1276+
nodeSelectorTerms:
1277+
- matchExpressions:
1278+
- key: node-role.kubernetes.io/control-plane
1279+
operator: Exists
12761280
securityContext:
12771281
fsGroup: 1001
12781282
runAsUser: 1001
@@ -1296,16 +1300,6 @@ data:
12961300
- name: vsphere-config-volume
12971301
configMap:
12981302
name: cloud-config
1299-
affinity:
1300-
nodeAffinity:
1301-
requiredDuringSchedulingIgnoredDuringExecution:
1302-
nodeSelectorTerms:
1303-
- matchExpressions:
1304-
- key: node-role.kubernetes.io/control-plane
1305-
operator: Exists
1306-
- matchExpressions:
1307-
- key: node-role.kubernetes.io/master
1308-
operator: Exists
13091303
---
13101304
apiVersion: rbac.authorization.k8s.io/v1
13111305
kind: RoleBinding

‎templates/cluster-template-ignition.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1478,21 +1478,25 @@ data:
14781478
vsphere-cpi-infra: daemonset
14791479
spec:
14801480
tolerations:
1481-
- key: node.cloudprovider.kubernetes.io/uninitialized
1482-
value: "true"
1483-
effect: NoSchedule
1484-
- key: node-role.kubernetes.io/master
1485-
effect: NoSchedule
1486-
operator: Exists
1487-
- key: node-role.kubernetes.io/control-plane
1488-
effect: NoSchedule
1489-
operator: Exists
1490-
- key: node.kubernetes.io/not-ready
1491-
effect: NoSchedule
1492-
operator: Exists
1493-
- key: CriticalAddonsOnly
1494-
effect: NoExecute
1495-
operator: Exists
1481+
- effect: NoSchedule
1482+
key: node.cloudprovider.kubernetes.io/uninitialized
1483+
value: "true"
1484+
- effect: NoSchedule
1485+
key: node-role.kubernetes.io/control-plane
1486+
operator: Exists
1487+
- effect: NoSchedule
1488+
key: node.kubernetes.io/not-ready
1489+
operator: Exists
1490+
- effect: NoExecute
1491+
key: CriticalAddonsOnly
1492+
operator: Exists
1493+
affinity:
1494+
nodeAffinity:
1495+
requiredDuringSchedulingIgnoredDuringExecution:
1496+
nodeSelectorTerms:
1497+
- matchExpressions:
1498+
- key: node-role.kubernetes.io/control-plane
1499+
operator: Exists
14961500
securityContext:
14971501
fsGroup: 1001
14981502
runAsUser: 1001
@@ -1516,16 +1520,6 @@ data:
15161520
- name: vsphere-config-volume
15171521
configMap:
15181522
name: cloud-config
1519-
affinity:
1520-
nodeAffinity:
1521-
requiredDuringSchedulingIgnoredDuringExecution:
1522-
nodeSelectorTerms:
1523-
- matchExpressions:
1524-
- key: node-role.kubernetes.io/control-plane
1525-
operator: Exists
1526-
- matchExpressions:
1527-
- key: node-role.kubernetes.io/master
1528-
operator: Exists
15291523
---
15301524
apiVersion: rbac.authorization.k8s.io/v1
15311525
kind: RoleBinding

‎templates/cluster-template-node-ipam.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1393,21 +1393,25 @@ data:
13931393
vsphere-cpi-infra: daemonset
13941394
spec:
13951395
tolerations:
1396-
- key: node.cloudprovider.kubernetes.io/uninitialized
1397-
value: "true"
1398-
effect: NoSchedule
1399-
- key: node-role.kubernetes.io/master
1400-
effect: NoSchedule
1401-
operator: Exists
1402-
- key: node-role.kubernetes.io/control-plane
1403-
effect: NoSchedule
1404-
operator: Exists
1405-
- key: node.kubernetes.io/not-ready
1406-
effect: NoSchedule
1407-
operator: Exists
1408-
- key: CriticalAddonsOnly
1409-
effect: NoExecute
1410-
operator: Exists
1396+
- effect: NoSchedule
1397+
key: node.cloudprovider.kubernetes.io/uninitialized
1398+
value: "true"
1399+
- effect: NoSchedule
1400+
key: node-role.kubernetes.io/control-plane
1401+
operator: Exists
1402+
- effect: NoSchedule
1403+
key: node.kubernetes.io/not-ready
1404+
operator: Exists
1405+
- effect: NoExecute
1406+
key: CriticalAddonsOnly
1407+
operator: Exists
1408+
affinity:
1409+
nodeAffinity:
1410+
requiredDuringSchedulingIgnoredDuringExecution:
1411+
nodeSelectorTerms:
1412+
- matchExpressions:
1413+
- key: node-role.kubernetes.io/control-plane
1414+
operator: Exists
14111415
securityContext:
14121416
fsGroup: 1001
14131417
runAsUser: 1001
@@ -1431,16 +1435,6 @@ data:
14311435
- name: vsphere-config-volume
14321436
configMap:
14331437
name: cloud-config
1434-
affinity:
1435-
nodeAffinity:
1436-
requiredDuringSchedulingIgnoredDuringExecution:
1437-
nodeSelectorTerms:
1438-
- matchExpressions:
1439-
- key: node-role.kubernetes.io/control-plane
1440-
operator: Exists
1441-
- matchExpressions:
1442-
- key: node-role.kubernetes.io/master
1443-
operator: Exists
14441438
---
14451439
apiVersion: rbac.authorization.k8s.io/v1
14461440
kind: RoleBinding

‎templates/cluster-template-supervisor.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1343,21 +1343,25 @@ data:
13431343
vsphere-cpi-infra: daemonset
13441344
spec:
13451345
tolerations:
1346-
- key: node.cloudprovider.kubernetes.io/uninitialized
1347-
value: "true"
1348-
effect: NoSchedule
1349-
- key: node-role.kubernetes.io/master
1350-
effect: NoSchedule
1351-
operator: Exists
1352-
- key: node-role.kubernetes.io/control-plane
1353-
effect: NoSchedule
1354-
operator: Exists
1355-
- key: node.kubernetes.io/not-ready
1356-
effect: NoSchedule
1357-
operator: Exists
1358-
- key: CriticalAddonsOnly
1359-
effect: NoExecute
1360-
operator: Exists
1346+
- effect: NoSchedule
1347+
key: node.cloudprovider.kubernetes.io/uninitialized
1348+
value: "true"
1349+
- effect: NoSchedule
1350+
key: node-role.kubernetes.io/control-plane
1351+
operator: Exists
1352+
- effect: NoSchedule
1353+
key: node.kubernetes.io/not-ready
1354+
operator: Exists
1355+
- effect: NoExecute
1356+
key: CriticalAddonsOnly
1357+
operator: Exists
1358+
affinity:
1359+
nodeAffinity:
1360+
requiredDuringSchedulingIgnoredDuringExecution:
1361+
nodeSelectorTerms:
1362+
- matchExpressions:
1363+
- key: node-role.kubernetes.io/control-plane
1364+
operator: Exists
13611365
securityContext:
13621366
fsGroup: 1001
13631367
runAsUser: 1001
@@ -1381,16 +1385,6 @@ data:
13811385
- name: vsphere-config-volume
13821386
configMap:
13831387
name: cloud-config
1384-
affinity:
1385-
nodeAffinity:
1386-
requiredDuringSchedulingIgnoredDuringExecution:
1387-
nodeSelectorTerms:
1388-
- matchExpressions:
1389-
- key: node-role.kubernetes.io/control-plane
1390-
operator: Exists
1391-
- matchExpressions:
1392-
- key: node-role.kubernetes.io/master
1393-
operator: Exists
13941388
---
13951389
apiVersion: rbac.authorization.k8s.io/v1
13961390
kind: RoleBinding

‎templates/cluster-template-topology-supervisor.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1151,21 +1151,25 @@ data:
11511151
vsphere-cpi-infra: daemonset
11521152
spec:
11531153
tolerations:
1154-
- key: node.cloudprovider.kubernetes.io/uninitialized
1155-
value: "true"
1156-
effect: NoSchedule
1157-
- key: node-role.kubernetes.io/master
1158-
effect: NoSchedule
1159-
operator: Exists
1160-
- key: node-role.kubernetes.io/control-plane
1161-
effect: NoSchedule
1162-
operator: Exists
1163-
- key: node.kubernetes.io/not-ready
1164-
effect: NoSchedule
1165-
operator: Exists
1166-
- key: CriticalAddonsOnly
1167-
effect: NoExecute
1168-
operator: Exists
1154+
- effect: NoSchedule
1155+
key: node.cloudprovider.kubernetes.io/uninitialized
1156+
value: "true"
1157+
- effect: NoSchedule
1158+
key: node-role.kubernetes.io/control-plane
1159+
operator: Exists
1160+
- effect: NoSchedule
1161+
key: node.kubernetes.io/not-ready
1162+
operator: Exists
1163+
- effect: NoExecute
1164+
key: CriticalAddonsOnly
1165+
operator: Exists
1166+
affinity:
1167+
nodeAffinity:
1168+
requiredDuringSchedulingIgnoredDuringExecution:
1169+
nodeSelectorTerms:
1170+
- matchExpressions:
1171+
- key: node-role.kubernetes.io/control-plane
1172+
operator: Exists
11691173
securityContext:
11701174
fsGroup: 1001
11711175
runAsUser: 1001
@@ -1189,16 +1193,6 @@ data:
11891193
- name: vsphere-config-volume
11901194
configMap:
11911195
name: cloud-config
1192-
affinity:
1193-
nodeAffinity:
1194-
requiredDuringSchedulingIgnoredDuringExecution:
1195-
nodeSelectorTerms:
1196-
- matchExpressions:
1197-
- key: node-role.kubernetes.io/control-plane
1198-
operator: Exists
1199-
- matchExpressions:
1200-
- key: node-role.kubernetes.io/master
1201-
operator: Exists
12021196
---
12031197
apiVersion: rbac.authorization.k8s.io/v1
12041198
kind: RoleBinding

‎templates/cluster-template-topology.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1166,21 +1166,25 @@ data:
11661166
vsphere-cpi-infra: daemonset
11671167
spec:
11681168
tolerations:
1169-
- key: node.cloudprovider.kubernetes.io/uninitialized
1170-
value: "true"
1171-
effect: NoSchedule
1172-
- key: node-role.kubernetes.io/master
1173-
effect: NoSchedule
1174-
operator: Exists
1175-
- key: node-role.kubernetes.io/control-plane
1176-
effect: NoSchedule
1177-
operator: Exists
1178-
- key: node.kubernetes.io/not-ready
1179-
effect: NoSchedule
1180-
operator: Exists
1181-
- key: CriticalAddonsOnly
1182-
effect: NoExecute
1183-
operator: Exists
1169+
- effect: NoSchedule
1170+
key: node.cloudprovider.kubernetes.io/uninitialized
1171+
value: "true"
1172+
- effect: NoSchedule
1173+
key: node-role.kubernetes.io/control-plane
1174+
operator: Exists
1175+
- effect: NoSchedule
1176+
key: node.kubernetes.io/not-ready
1177+
operator: Exists
1178+
- effect: NoExecute
1179+
key: CriticalAddonsOnly
1180+
operator: Exists
1181+
affinity:
1182+
nodeAffinity:
1183+
requiredDuringSchedulingIgnoredDuringExecution:
1184+
nodeSelectorTerms:
1185+
- matchExpressions:
1186+
- key: node-role.kubernetes.io/control-plane
1187+
operator: Exists
11841188
securityContext:
11851189
fsGroup: 1001
11861190
runAsUser: 1001
@@ -1204,16 +1208,6 @@ data:
12041208
- name: vsphere-config-volume
12051209
configMap:
12061210
name: cloud-config
1207-
affinity:
1208-
nodeAffinity:
1209-
requiredDuringSchedulingIgnoredDuringExecution:
1210-
nodeSelectorTerms:
1211-
- matchExpressions:
1212-
- key: node-role.kubernetes.io/control-plane
1213-
operator: Exists
1214-
- matchExpressions:
1215-
- key: node-role.kubernetes.io/master
1216-
operator: Exists
12171211
---
12181212
apiVersion: rbac.authorization.k8s.io/v1
12191213
kind: RoleBinding

‎templates/cluster-template.yaml

+19-25
Original file line numberDiff line numberDiff line change
@@ -1383,21 +1383,25 @@ data:
13831383
vsphere-cpi-infra: daemonset
13841384
spec:
13851385
tolerations:
1386-
- key: node.cloudprovider.kubernetes.io/uninitialized
1387-
value: "true"
1388-
effect: NoSchedule
1389-
- key: node-role.kubernetes.io/master
1390-
effect: NoSchedule
1391-
operator: Exists
1392-
- key: node-role.kubernetes.io/control-plane
1393-
effect: NoSchedule
1394-
operator: Exists
1395-
- key: node.kubernetes.io/not-ready
1396-
effect: NoSchedule
1397-
operator: Exists
1398-
- key: CriticalAddonsOnly
1399-
effect: NoExecute
1400-
operator: Exists
1386+
- effect: NoSchedule
1387+
key: node.cloudprovider.kubernetes.io/uninitialized
1388+
value: "true"
1389+
- effect: NoSchedule
1390+
key: node-role.kubernetes.io/control-plane
1391+
operator: Exists
1392+
- effect: NoSchedule
1393+
key: node.kubernetes.io/not-ready
1394+
operator: Exists
1395+
- effect: NoExecute
1396+
key: CriticalAddonsOnly
1397+
operator: Exists
1398+
affinity:
1399+
nodeAffinity:
1400+
requiredDuringSchedulingIgnoredDuringExecution:
1401+
nodeSelectorTerms:
1402+
- matchExpressions:
1403+
- key: node-role.kubernetes.io/control-plane
1404+
operator: Exists
14011405
securityContext:
14021406
fsGroup: 1001
14031407
runAsUser: 1001
@@ -1421,16 +1425,6 @@ data:
14211425
- name: vsphere-config-volume
14221426
configMap:
14231427
name: cloud-config
1424-
affinity:
1425-
nodeAffinity:
1426-
requiredDuringSchedulingIgnoredDuringExecution:
1427-
nodeSelectorTerms:
1428-
- matchExpressions:
1429-
- key: node-role.kubernetes.io/control-plane
1430-
operator: Exists
1431-
- matchExpressions:
1432-
- key: node-role.kubernetes.io/master
1433-
operator: Exists
14341428
---
14351429
apiVersion: rbac.authorization.k8s.io/v1
14361430
kind: RoleBinding

‎test/e2e/config/config-overrides-example.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ variables:
1313
VSPHERE_DATASTORE: "WorkloadDatastore"
1414
VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy"
1515
VSPHERE_NETWORK: "network-1"
16-
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
1818
CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10"
1919
# Only for clusterctl upgrade tests
2020
# WORKLOAD_CONTROL_PLANE_ENDPOINT_IP:
@@ -27,7 +27,7 @@ variables:
2727
VSPHERE2_SERVER: "vcenter2.vmware.com"
2828
VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF"
2929
VSPHERE2_RESOURCE_POOL: "ResourcePool"
30-
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
3131
VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11"
3232
# Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data
3333
# VSPHERE2_USERNAME:

‎test/e2e/config/vsphere.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,11 @@ providers:
267267

268268
variables:
269269
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
270-
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0-rc.1"
271-
KUBERNETES_VERSION: "v1.31.0-rc.1"
270+
KUBERNETES_VERSION_MANAGEMENT: "v1.31.0"
271+
KUBERNETES_VERSION: "v1.31.0"
272272
KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.0"
273-
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0-rc.1"
274-
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.31"
273+
KUBERNETES_VERSION_UPGRADE_TO: "v1.31.0"
274+
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.32"
275275
CPI_IMAGE_K8S_VERSION: "v1.31.0-rc.1"
276276
CNI: "./data/cni/calico/calico.yaml"
277277
EXP_CLUSTER_RESOURCE_SET: "true"
@@ -294,12 +294,12 @@ variables:
294294
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "8"
295295
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "8Gi"
296296
VSPHERE_CONTENT_LIBRARY: "capv"
297-
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0"
298-
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.30.0"
297+
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2204-kube-v1.31.0"
298+
VSPHERE_IMAGE_NAME: "ubuntu-2204-kube-v1.31.0"
299299
VSPHERE_NETWORK: "sddc-cgw-network-10"
300300
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
301-
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.30.0"
302-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3815.2.2-kube-v1.30.0"
301+
VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0"
302+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
303303
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
304304
NODE_DRAIN_TIMEOUT: "60s"
305305
CLUSTER_TOPOLOGY: "true"

‎test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml

+10-6
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
template: |-
1212
{{- if eq .builtin.controlPlane.version "v1.28.0" -}}
1313
ubuntu-2204-kube-v1.28.0
14-
{{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}}
14+
{{- else if eq .builtin.controlPlane.version "v1.29.0" -}}
1515
ubuntu-2204-kube-v1.29.0
16-
{{- else -}}
16+
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
1717
ubuntu-2204-kube-v1.30.0
18-
{{- end -}}{{- end -}}
18+
{{- else -}}
19+
ubuntu-2204-kube-v1.31.0
20+
{{- end -}}
1921
selector:
2022
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2123
kind: VSphereMachineTemplate
@@ -30,11 +32,13 @@
3032
template: |-
3133
{{- if eq .builtin.machineDeployment.version "v1.28.0" -}}
3234
ubuntu-2204-kube-v1.28.0
33-
{{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}}
35+
{{- else if eq .builtin.machineDeployment.version "v1.29.0" -}}
3436
ubuntu-2204-kube-v1.29.0
35-
{{- else -}}
37+
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
3638
ubuntu-2204-kube-v1.30.0
37-
{{- end -}}{{- end -}}
39+
{{- else -}}
40+
ubuntu-2204-kube-v1.31.0
41+
{{- end -}}
3842
selector:
3943
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
4044
kind: VSphereMachineTemplate

‎test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml

+10-6
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
template: |-
1212
{{- if eq .builtin.controlPlane.version "v1.28.0" -}}
1313
ubuntu-2204-kube-v1.28.0
14-
{{- else -}}{{- if eq .builtin.controlPlane.version "v1.29.0" -}}
14+
{{- else if eq .builtin.controlPlane.version "v1.29.0" -}}
1515
ubuntu-2204-kube-v1.29.0
16-
{{- else -}}
16+
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
1717
ubuntu-2204-kube-v1.30.0
18-
{{- end -}}{{- end -}}
18+
{{- else -}}
19+
ubuntu-2204-kube-v1.31.0
20+
{{- end -}}
1921
selector:
2022
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
2123
kind: VSphereMachineTemplate
@@ -30,11 +32,13 @@
3032
template: |-
3133
{{- if eq .builtin.machineDeployment.version "v1.28.0" -}}
3234
ubuntu-2204-kube-v1.28.0
33-
{{- else -}}{{- if eq .builtin.machineDeployment.version "v1.29.0" -}}
35+
{{- else if eq .builtin.machineDeployment.version "v1.29.0" -}}
3436
ubuntu-2204-kube-v1.29.0
35-
{{- else -}}
37+
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
3638
ubuntu-2204-kube-v1.30.0
37-
{{- end -}}{{- end -}}
39+
{{- else -}}
40+
ubuntu-2204-kube-v1.31.0
41+
{{- end -}}
3842
selector:
3943
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
4044
kind: VSphereMachineTemplate

0 commit comments

Comments
 (0)
Please sign in to comment.