Skip to content

🌱 Bump e2e to use k8s v1.34.2 #2836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2025
+15 −12
Merged

🌱 Bump e2e to use k8s v1.34.2 #2836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions test/e2e/data/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,11 @@ providers:
variables:
# used to ensure we deploy to the correct management cluster
KUBE_CONTEXT: "kind-capo-e2e"
KUBERNETES_VERSION: "v1.33.1"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.32.5"
KUBERNETES_VERSION_UPGRADE_TO: "v1.33.1"
# Pick a version that has a kind node image available. This is used in clusterctl upgrade tests.
KUBERNETES_KIND_VERSION: "v1.34.0"
KUBERNETES_VERSION: "v1.34.2"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.33.1"
KUBERNETES_VERSION_UPGRADE_TO: "v1.34.2"
# NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z)
ETCD_VERSION_UPGRADE_TO: "3.5.21-0"
COREDNS_VERSION_UPGRADE_TO: "v1.12.0"
Expand All @@ -235,10 +237,10 @@ variables:
OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
OPENSTACK_FAILURE_DOMAIN: "testaz1"
OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-v1.33.1"
OPENSTACK_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.33.1
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2404-kube-v1.32.5"
OPENSTACK_IMAGE_URL_UPGRADE_FROM: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.32.5
OPENSTACK_IMAGE_NAME: "ubuntu-2404-kube-latest"
OPENSTACK_IMAGE_URL: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.34.2
OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2404-kube-previous"
OPENSTACK_IMAGE_URL_UPGRADE_FROM: https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/ubuntu-2404-kube-v1.33.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
Expand All @@ -252,8 +254,8 @@ variables:
CLUSTER_TOPOLOGY: "true"
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
# The Flatcar image produced by the image-builder
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-4152.2.3-kube-v1.33.1"
OPENSTACK_FLATCAR_IMAGE_URL: "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-4152.2.3-kube-v1.33.1"
OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable"
OPENSTACK_FLATCAR_IMAGE_URL: "https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-4459.2.0-kube-v1.34.2"
# A plain Flatcar from the Flatcar releases server
FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
FLATCAR_IMAGE_URL: https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img
Expand Down
1 change: 1 addition & 0 deletions test/e2e/shared/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
const (
DefaultSSHKeyPairName = "cluster-api-provider-openstack-sigs-k8s-io"
KubeContext = "KUBE_CONTEXT"
KubernetesKindVersion = "KUBERNETES_KIND_VERSION"
KubernetesVersion = "KUBERNETES_VERSION"
CCMPath = "CCM"
CCMResources = "CCM_RESOURCES"
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/suites/e2e/clusterctl_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.11=>current) and
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
MgmtFlavor: shared.FlavorDefault,
WorkloadFlavor: shared.FlavorCapiV1Beta1,
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
UseKindForManagementCluster: true,
}
Expand Down Expand Up @@ -99,7 +99,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.12=>current) and
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease110},
MgmtFlavor: shared.FlavorDefault,
WorkloadFlavor: shared.FlavorCapiV1Beta1,
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
UseKindForManagementCluster: true,
}
Expand Down Expand Up @@ -133,7 +133,7 @@ var _ = Describe("When testing clusterctl upgrades for CAPO (v0.13=>current) and
InitWithControlPlaneProviders: []string{"kubeadm:" + capiRelease111},
MgmtFlavor: shared.FlavorDefault,
WorkloadFlavor: shared.FlavorDefault,
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesVersion),
InitWithKubernetesVersion: e2eCtx.E2EConfig.MustGetVariable(shared.KubernetesKindVersion),
InitWithRuntimeExtensionProviders: []string{"openstack-resource-controller:v1.0.2"},
UseKindForManagementCluster: true,
}
Expand Down