Skip to content

Commit c31b5c6

Browse files
authored
✨ Bump Kubernetes to v1.32 and add new OVA's (#3294)
* Bump Kubernetes to v1.32 and add new OVA's * govmomi: fix template
1 parent 5bb63a0 commit c31b5c6

File tree

6 files changed

+25
-16
lines changed

6 files changed

+25
-16
lines changed

internal/test/helpers/vcsim/model.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var (
3939
"ubuntu-2204-kube-v1.29.0",
4040
"ubuntu-2204-kube-v1.30.0",
4141
"ubuntu-2404-kube-v1.31.0",
42+
"ubuntu-2404-kube-v1.32.0",
4243
}
4344
)
4445

packaging/flavorgen/cloudprovider/cpi/cpi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ spec:
159159
priorityClassName: system-node-critical
160160
containers:
161161
- name: vsphere-cpi
162-
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.31.0
162+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.32.1
163163
imagePullPolicy: IfNotPresent
164164
args:
165165
- --cloud-provider=vsphere

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

Lines changed: 3 additions & 3 deletions
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-2404-kube-v1.31.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.32.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-2404-kube-v1.31.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.32.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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,12 @@ providers:
279279

280280
variables:
281281
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
282-
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0-rc.1"
283-
KUBERNETES_VERSION: "v1.32.0-rc.1"
282+
KUBERNETES_VERSION_MANAGEMENT: "v1.32.0"
283+
KUBERNETES_VERSION: "v1.32.0"
284284
KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.0"
285-
KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0-rc.1"
285+
KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0"
286286
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33"
287-
CPI_IMAGE_K8S_VERSION: "v1.32.0-rc.0"
287+
CPI_IMAGE_K8S_VERSION: "v1.32.1"
288288
CNI: "./data/cni/calico/calico.yaml"
289289
AUTOSCALER_WORKLOAD: "./data/autoscaler/autoscaler-to-management-workload.yaml"
290290
EXP_CLUSTER_RESOURCE_SET: "true"
@@ -311,12 +311,12 @@ variables:
311311
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "2"
312312
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "2Gi"
313313
VSPHERE_CONTENT_LIBRARY: "capv"
314-
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0"
315-
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.31.0"
314+
VSPHERE_CONTENT_LIBRARY_ITEMS: "ubuntu-2204-kube-v1.28.0,ubuntu-2204-kube-v1.29.0,ubuntu-2204-kube-v1.30.0,ubuntu-2404-kube-v1.31.0,ubuntu-2404-kube-v1.32.0"
315+
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.32.0"
316316
VSPHERE_NETWORK: "sddc-cgw-network-10"
317317
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
318-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0"
319-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0"
318+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0"
319+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0"
320320
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
321321
NODE_DRAIN_TIMEOUT: "60s"
322322
CLUSTER_TOPOLOGY: "true"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
ubuntu-2204-kube-v1.29.0
1616
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
1717
ubuntu-2204-kube-v1.30.0
18-
{{- else -}}
18+
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
1919
ubuntu-2404-kube-v1.31.0
20+
{{- else -}}
21+
ubuntu-2404-kube-v1.32.0
2022
{{- end -}}
2123
selector:
2224
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -36,8 +38,10 @@
3638
ubuntu-2204-kube-v1.29.0
3739
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
3840
ubuntu-2204-kube-v1.30.0
39-
{{- else -}}
41+
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
4042
ubuntu-2404-kube-v1.31.0
43+
{{- else -}}
44+
ubuntu-2404-kube-v1.32.0
4145
{{- end -}}
4246
selector:
4347
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
ubuntu-2204-kube-v1.29.0
1616
{{- else if eq .builtin.controlPlane.version "v1.30.0" -}}
1717
ubuntu-2204-kube-v1.30.0
18-
{{- else -}}
18+
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
1919
ubuntu-2404-kube-v1.31.0
20+
{{- else -}}
21+
ubuntu-2404-kube-v1.32.0
2022
{{- end -}}
2123
selector:
2224
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
@@ -36,8 +38,10 @@
3638
ubuntu-2204-kube-v1.29.0
3739
{{- else if eq .builtin.machineDeployment.version "v1.30.0" -}}
3840
ubuntu-2204-kube-v1.30.0
39-
{{- else -}}
41+
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
4042
ubuntu-2404-kube-v1.31.0
43+
{{- else -}}
44+
ubuntu-2404-kube-v1.32.0
4145
{{- end -}}
4246
selector:
4347
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)