From c279a86fc71eecf00f92a274bee0d63f859c9428 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 21 Nov 2024 11:29:07 -0500 Subject: [PATCH] e2e: bump to ubuntu-2404-kube-v1.31.2 Let's bump k8s release to v1.31.2 to align with other platforms and the k8s version of CAPI & CAPO. Co-authored-by: Lennart Jern --- test/e2e/data/e2e_conf.yaml | 12 ++++++------ test/e2e/shared/images.go | 2 +- test/e2e/suites/e2e/e2e_suite_test.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index 6850ffdc02..7f42b31b6c 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -140,9 +140,9 @@ providers: variables: # used to ensure we deploy to the correct management cluster KUBE_CONTEXT: "kind-capo-e2e" - KUBERNETES_VERSION: "v1.30.1" - KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.5" - KUBERNETES_VERSION_UPGRADE_TO: "v1.30.1" + KUBERNETES_VERSION: "v1.31.2" + KUBERNETES_VERSION_UPGRADE_FROM: "v1.30.1" + KUBERNETES_VERSION_UPGRADE_TO: "v1.31.2" # NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z) ETCD_VERSION_UPGRADE_TO: "3.5.12-0" COREDNS_VERSION_UPGRADE_TO: "v1.11.1" @@ -162,8 +162,8 @@ variables: OPENSTACK_DNS_NAMESERVERS: "8.8.8.8" OPENSTACK_FAILURE_DOMAIN: "testaz1" OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2" - OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.30.1" - OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.29.5" + OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-v1.31.2" + OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.30.1" OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small" OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io" # The default external network created by devstack @@ -176,7 +176,7 @@ variables: SSH_USER_MACHINE: "ubuntu" EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true" # The Flatcar image produced by the image-builder - OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4081.2.0-kube-v1.30.1" + OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4081.2.0-kube-v1.31.2" # A plain Flatcar from the Flatcar releases server FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image" diff --git a/test/e2e/shared/images.go b/test/e2e/shared/images.go index d3404bef7e..4d0dfac6d2 100644 --- a/test/e2e/shared/images.go +++ b/test/e2e/shared/images.go @@ -79,7 +79,7 @@ func CoreImages(e2eCtx *E2EContext) []DownloadImage { }, { Name: "capo-default", - ArtifactPath: "ubuntu/2024-05-28/" + e2eCtx.E2EConfig.GetVariable("OPENSTACK_IMAGE_NAME") + ".img", + ArtifactPath: "ubuntu/2024-11-21/" + e2eCtx.E2EConfig.GetVariable("OPENSTACK_IMAGE_NAME") + ".img", }, } } diff --git a/test/e2e/suites/e2e/e2e_suite_test.go b/test/e2e/suites/e2e/e2e_suite_test.go index 468c09660b..817c0775a7 100644 --- a/test/e2e/suites/e2e/e2e_suite_test.go +++ b/test/e2e/suites/e2e/e2e_suite_test.go @@ -100,7 +100,7 @@ var _ = SynchronizedBeforeSuite(func(ctx context.Context) []byte { upgradeImage = shared.DownloadImage{ Name: "capo-upgrade-from", - ArtifactPath: "ubuntu/2024-05-28/" + e2eCtx.E2EConfig.GetVariable("OPENSTACK_IMAGE_NAME_UPGRADE_FROM") + ".img", + ArtifactPath: "ubuntu/2024-11-21/" + e2eCtx.E2EConfig.GetVariable("OPENSTACK_IMAGE_NAME_UPGRADE_FROM") + ".img", } })