From f79b7f1a6ed53ae37b6fa5864cfb92d2736905b7 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 16 Apr 2025 15:09:02 +0200 Subject: [PATCH] Bump Kubernetes to v1.33 and add new OVA's --- internal/test/helpers/vcsim/model.go | 1 + packaging/flavorgen/cloudprovider/cpi/cpi.yaml | 2 +- test/e2e/config/config-overrides-example.yaml | 6 +++--- test/e2e/config/vsphere.yaml | 17 ++++++++--------- .../clusterclass/patch-vsphere-template.yaml | 8 ++++++-- .../clusterclass/patch-vsphere-template.yaml | 8 ++++++-- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/internal/test/helpers/vcsim/model.go b/internal/test/helpers/vcsim/model.go index 6087ce286d..b070e1bc42 100644 --- a/internal/test/helpers/vcsim/model.go +++ b/internal/test/helpers/vcsim/model.go @@ -40,6 +40,7 @@ var ( "ubuntu-2204-kube-v1.30.0", "ubuntu-2404-kube-v1.31.0", "ubuntu-2404-kube-v1.32.0", + "ubuntu-2404-kube-v1.33.0", } ) diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml index b58a22d2a6..c157c8a213 100644 --- a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml +++ b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml @@ -159,7 +159,7 @@ spec: priorityClassName: system-node-critical containers: - name: vsphere-cpi - image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.32.1 + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.33.0 imagePullPolicy: IfNotPresent args: - --cloud-provider=vsphere diff --git a/test/e2e/config/config-overrides-example.yaml b/test/e2e/config/config-overrides-example.yaml index 815c9a44f7..9cb9fa4582 100644 --- a/test/e2e/config/config-overrides-example.yaml +++ b/test/e2e/config/config-overrides-example.yaml @@ -13,8 +13,8 @@ variables: VSPHERE_DATASTORE: "WorkloadDatastore" VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy" VSPHERE_NETWORK: "network-1" - VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0" CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10" # Only for clusterctl upgrade tests # WORKLOAD_CONTROL_PLANE_ENDPOINT_IP: @@ -27,7 +27,7 @@ variables: VSPHERE2_SERVER: "vcenter2.vmware.com" VSPHERE2_TLS_THUMBPRINT: "AA:BB:CC:DD:11:22:33:44:EE:FF" VSPHERE2_RESOURCE_POOL: "ResourcePool" - VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.32.0" + VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.33.0" VSPHERE2_CONTROL_PLANE_ENDPOINT_IP: "10.0.0.11" # Also following variables are required but it is recommended to use env variables to avoid disclosure of sensitive data # VSPHERE2_USERNAME: diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml index dbc8a4471d..bea9cade36 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -303,12 +303,11 @@ providers: variables: # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml - KUBERNETES_VERSION_MANAGEMENT: "v1.33.0-rc.1" - # Note: currently not ci/latest-1.33 because of rate-limiting issues. - KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "v1.33.0-rc.1" - KUBERNETES_VERSION: "v1.33.0-rc.1" + KUBERNETES_VERSION_MANAGEMENT: "v1.33.0" + KUBERNETES_VERSION_MANAGEMENT_LATEST_CI: "ci/latest-1.33" + KUBERNETES_VERSION: "v1.33.0" KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.0" - KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0-rc.1" + KUBERNETES_VERSION_UPGRADE_TO: "v1.33.0" KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33" CPI_IMAGE_K8S_VERSION: "v1.33.0-rc.0" CNI: "./data/cni/calico/calico.yaml" @@ -335,12 +334,12 @@ variables: VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "2" VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "2Gi" VSPHERE_CONTENT_LIBRARY: "capv" - 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" - VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.32.0" + 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" + VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.33.0" VSPHERE_NETWORK: "sddc-cgw-network-10" VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10" - VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.33.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4152.2.2-kube-v1.33.0" KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml" NODE_DRAIN_TIMEOUT: "60s" EXP_CLUSTER_RESOURCE_SET: "true" diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml index 21a4cebc30..3d8cbd1908 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-vsphere-template.yaml @@ -17,8 +17,10 @@ ubuntu-2204-kube-v1.30.0 {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.32.0" -}} ubuntu-2404-kube-v1.32.0 + {{- else -}} + ubuntu-2404-kube-v1.33.0 {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -40,8 +42,10 @@ ubuntu-2204-kube-v1.30.0 {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.32.0" -}} ubuntu-2404-kube-v1.32.0 + {{- else -}} + ubuntu-2404-kube-v1.33.0 {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml index cf501f348f..c2ee357697 100644 --- a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml +++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-vsphere-template.yaml @@ -17,8 +17,10 @@ ubuntu-2204-kube-v1.30.0 {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.32.0" -}} ubuntu-2404-kube-v1.32.0 + {{- else -}} + ubuntu-2404-kube-v1.33.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1 @@ -40,8 +42,10 @@ ubuntu-2204-kube-v1.30.0 {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.32.0" -}} ubuntu-2404-kube-v1.32.0 + {{- else -}} + ubuntu-2404-kube-v1.33.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1