Skip to content

Commit 7f5ae42

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3435 from fabriziopandini/bump-k8s-1-33
✨ Bump Kubernetes to v1.33 and add new OVA's
2 parents 9de7e45 + f79b7f1 commit 7f5ae42

File tree

6 files changed

+25
-17
lines changed

6 files changed

+25
-17
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ var (
4040
"ubuntu-2204-kube-v1.30.0",
4141
"ubuntu-2404-kube-v1.31.0",
4242
"ubuntu-2404-kube-v1.32.0",
43+
"ubuntu-2404-kube-v1.33.0",
4344
}
4445
)
4546

‎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.32.1
162+
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.33.0
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.32.0"
17-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0"
16+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
17+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.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.32.0"
30+
VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.33.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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,11 @@ providers:
303303

304304
variables:
305305
# Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml
306-
KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-rc.1"
307-
# Note: currently not ci/latest-1.33 because of rate-limiting issues.
308-
KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-rc.1"
309-
KUBERNETES_VERSION: "v1.33.0-rc.1"
306+
KUBERNETES_VERSION_MANAGEMENT: "v1.33.0"
307+
KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "ci/latest-1.33"
308+
KUBERNETES_VERSION: "v1.33.0"
310309
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0"
311-
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-rc.1"
310+
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0"
312311
KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33"
313312
CPI_IMAGE_K8S_VERSION: "v1.33.0-rc.0"
314313
CNI: "./data/cni/calico/calico.yaml"
@@ -335,12 +334,12 @@ variables:
335334
VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "2"
336335
VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "2Gi"
337336
VSPHERE_CONTENT_LIBRARY: "capv"
338-
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"
339-
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.32.0"
337+
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,ubuntu-2404-kube-v1.33.0"
338+
VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.33.0"
340339
VSPHERE_NETWORK: "sddc-cgw-network-10"
341340
VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10"
342-
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0"
343-
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0"
341+
VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0"
342+
FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0"
344343
KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml"
345344
NODE_DRAIN_TIMEOUT: "60s"
346345
EXP_CLUSTER_RESOURCE_SET: "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
@@ -17,8 +17,10 @@
1717
ubuntu-2204-kube-v1.30.0
1818
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
1919
ubuntu-2404-kube-v1.31.0
20-
{{- else -}}
20+
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
2121
ubuntu-2404-kube-v1.32.0
22+
{{- else -}}
23+
ubuntu-2404-kube-v1.33.0
2224
{{- end -}}
2325
selector:
2426
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -40,8 +42,10 @@
4042
ubuntu-2204-kube-v1.30.0
4143
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
4244
ubuntu-2404-kube-v1.31.0
43-
{{- else -}}
45+
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
4446
ubuntu-2404-kube-v1.32.0
47+
{{- else -}}
48+
ubuntu-2404-kube-v1.33.0
4549
{{- end -}}
4650
selector:
4751
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
@@ -17,8 +17,10 @@
1717
ubuntu-2204-kube-v1.30.0
1818
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
1919
ubuntu-2404-kube-v1.31.0
20-
{{- else -}}
20+
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
2121
ubuntu-2404-kube-v1.32.0
22+
{{- else -}}
23+
ubuntu-2404-kube-v1.33.0
2224
{{- end -}}
2325
selector:
2426
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1
@@ -40,8 +42,10 @@
4042
ubuntu-2204-kube-v1.30.0
4143
{{- else if eq .builtin.controlPlane.version "v1.31.0" -}}
4244
ubuntu-2404-kube-v1.31.0
43-
{{- else -}}
45+
{{- else if eq .builtin.controlPlane.version "v1.32.0" -}}
4446
ubuntu-2404-kube-v1.32.0
47+
{{- else -}}
48+
ubuntu-2404-kube-v1.33.0
4549
{{- end -}}
4650
selector:
4751
apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1

0 commit comments

Comments
 (0)