From a201a9d4ed9d135b6553fba39ff851bed9c0bd71 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Wed, 14 Aug 2024 10:04:56 +0200 Subject: [PATCH] Bump ubuntu to 24.04 images --- internal/test/helpers/vcsim/model.go | 2 +- test/e2e/config/config-overrides-example.yaml | 4 ++-- test/e2e/config/vsphere.yaml | 6 +++--- .../main/clusterclass/patch-vsphere-template.yaml | 4 ++-- .../main/clusterclass/patch-vsphere-template.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/test/helpers/vcsim/model.go b/internal/test/helpers/vcsim/model.go index e6022d447f..2960e33320 100644 --- a/internal/test/helpers/vcsim/model.go +++ b/internal/test/helpers/vcsim/model.go @@ -38,7 +38,7 @@ var ( "ubuntu-2204-kube-v1.28.0", "ubuntu-2204-kube-v1.29.0", "ubuntu-2204-kube-v1.30.0", - "ubuntu-2204-kube-v1.31.0", + "ubuntu-2404-kube-v1.31.0", } ) diff --git a/test/e2e/config/config-overrides-example.yaml b/test/e2e/config/config-overrides-example.yaml index bc3f9bc064..9c74465b79 100644 --- a/test/e2e/config/config-overrides-example.yaml +++ b/test/e2e/config/config-overrides-example.yaml @@ -13,7 +13,7 @@ variables: VSPHERE_DATASTORE: "WorkloadDatastore" VSPHERE_STORAGE_POLICY: "Cluster API vSphere Storage Policy" VSPHERE_NETWORK: "network-1" - VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0" FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0" CONTROL_PLANE_ENDPOINT_IP: "10.0.0.10" # Only for clusterctl upgrade tests @@ -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-2204-kube-v1.31.0" + VSPHERE2_TEMPLATE: "ubuntu-2404-kube-v1.31.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 aa28819f3f..2d0ae582f7 100644 --- a/test/e2e/config/vsphere.yaml +++ b/test/e2e/config/vsphere.yaml @@ -294,11 +294,11 @@ variables: VSPHERE_MACHINE_CLASS_CPU_CONFORMANCE: "8" VSPHERE_MACHINE_CLASS_MEMORY_CONFORMANCE: "8Gi" 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-2204-kube-v1.31.0" - VSPHERE_IMAGE_NAME: "ubuntu-2204-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" + VSPHERE_IMAGE_NAME: "ubuntu-2404-kube-v1.31.0" VSPHERE_NETWORK: "sddc-cgw-network-10" VSPHERE_DISTRIBUTED_PORT_GROUP: "/SDDC-Datacenter/network/sddc-cgw-network-10" - VSPHERE_TEMPLATE: "ubuntu-2204-kube-v1.31.0" + VSPHERE_TEMPLATE: "ubuntu-2404-kube-v1.31.0" FLATCAR_VSPHERE_TEMPLATE: "flatcar-stable-3975.2.0-kube-v1.31.0" KUBETEST_CONFIGURATION: "./data/kubetest/conformance.yaml" NODE_DRAIN_TIMEOUT: "60s" 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 d0eb0b0b97..0212e88f8a 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 @@ -16,7 +16,7 @@ {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 {{- else -}} - ubuntu-2204-kube-v1.31.0 + ubuntu-2404-kube-v1.31.0 {{- end -}} selector: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -37,7 +37,7 @@ {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 {{- else -}} - ubuntu-2204-kube-v1.31.0 + ubuntu-2404-kube-v1.31.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 aa3a9a23ef..769ede6045 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 @@ -16,7 +16,7 @@ {{- else if eq .builtin.controlPlane.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 {{- else -}} - ubuntu-2204-kube-v1.31.0 + ubuntu-2404-kube-v1.31.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1 @@ -37,7 +37,7 @@ {{- else if eq .builtin.machineDeployment.version "v1.30.0" -}} ubuntu-2204-kube-v1.30.0 {{- else -}} - ubuntu-2204-kube-v1.31.0 + ubuntu-2404-kube-v1.31.0 {{- end -}} selector: apiVersion: vmware.infrastructure.cluster.x-k8s.io/v1beta1