From ab4b4721e6959bdd68a74a8f810dd9a4dc5600c8 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 12 Dec 2024 08:46:48 +0100 Subject: [PATCH] Bump Kubernetes to v1.32 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 | 16 ++++++++-------- .../clusterclass/patch-vsphere-template.yaml | 10 +++++++--- .../clusterclass/patch-vsphere-template.yaml | 8 ++++++-- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/internal/test/helpers/vcsim/model.go b/internal/test/helpers/vcsim/model.go index 2960e33320..6087ce286d 100644 --- a/internal/test/helpers/vcsim/model.go +++ b/internal/test/helpers/vcsim/model.go @@ -39,6 +39,7 @@ var ( "ubuntu-2204-kube-v1.29.0", "ubuntu-2204-kube-v1.30.0", "ubuntu-2404-kube-v1.31.0", + "ubuntu-2404-kube-v1.32.0", } ) diff --git a/packaging/flavorgen/cloudprovider/cpi/cpi.yaml b/packaging/flavorgen/cloudprovider/cpi/cpi.yaml index aba5e2bb76..b58a22d2a6 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.31.0 + image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.32.1 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 9c74465b79..0acbd3c930 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.31.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.32.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.31.0" + VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.32.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 b8fdd99aea..2b78bb824c 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -279,12 +279,12 @@ providers: variables: # Ensure all Kubernetes versions used here are covered in patch-vsphere-template.yaml - KUBERNETES_VERSION_MANAGEMENT: "v1.32.0-rc.1" - KUBERNETES_VERSION: "v1.32.0-rc.1" + KUBERNETES_VERSION_MANAGEMENT: "v1.32.0" + KUBERNETES_VERSION: "v1.32.0" KUBERNETES_VERSION_UPGRADE_FROM: "v1.31.0" - KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0-rc.1" + KUBERNETES_VERSION_UPGRADE_TO: "v1.32.0" KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.33" - CPI_IMAGE_K8S_VERSION: "v1.32.0-rc.0" + CPI_IMAGE_K8S_VERSION: "v1.32.1" CNI: "./data/cni/calico/calico.yaml" AUTOSCALER_WORKLOAD: "./data/autoscaler/autoscaler-to-management-workload.yaml" EXP_CLUSTER_RESOURCE_SET: "true" @@ -311,12 +311,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" - VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.31.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" + VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.32.0" VSPHERE_NETWORK: "sddc-cgw-network-10" VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10" - VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0" - FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.32.0" + FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-4081.2.0-kube-v1.32.0" KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml" NODE_DRAIN_TIMEOUT: "60s" CLUSTER_TOPOLOGY: "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 0212e88f8a..9a8d1f3511 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 @@ -15,8 +15,10 @@ ubuntu-2204-kube-v1.29.0 {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 + {{- else -}} + ubuntu-2404-kube-v1.32.0 {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -36,9 +38,11 @@ ubuntu-2204-kube-v1.29.0 {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 - {{- end -}} + {{- else -}} + ubuntu-2404-kube-v1.32.0 + {{- end -}}` selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: VSphereMachineTemplate 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 769ede6045..cf501f348f 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 @@ -15,8 +15,10 @@ ubuntu-2204-kube-v1.29.0 {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 + {{- else -}} + ubuntu-2404-kube-v1.32.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1 @@ -36,8 +38,10 @@ ubuntu-2204-kube-v1.29.0 {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 - {{- else -}} + {{- else if eq .builtin.controlPlane.version "v1.31.0" -}} ubuntu-2404-kube-v1.31.0 + {{- else -}} + ubuntu-2404-kube-v1.32.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1