From 91d01dcd0edf2e78eda5839bb10c8892cea1c5af Mon Sep 17 00:00:00 2001 From: fabriziopandini Date: Fri, 10 Jan 2025 10:11:55 +0100 Subject: [PATCH] Follow up of 11647 --- docs/release/role-handbooks/release-lead/README.md | 2 +- test/e2e/clusterctl_upgrade_test.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/release/role-handbooks/release-lead/README.md b/docs/release/role-handbooks/release-lead/README.md index 1fa1efd291a0..10eacd4cf599 100644 --- a/docs/release/role-handbooks/release-lead/README.md +++ b/docs/release/role-handbooks/release-lead/README.md @@ -94,7 +94,7 @@ This comes down to changing occurrences of the old version to the new version, e Prior art: -* 1.10 - https://github.com/kubernetes-sigs/cluster-api/pull/... +* 1.10 - https://github.com/kubernetes-sigs/cluster-api/pull/11647 ### Create a new GitHub milestone for the next release diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go index 00c8a7a6f0e7..f30dedcb58f0 100644 --- a/test/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/clusterctl_upgrade_test.go @@ -241,8 +241,9 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>cur InitWithInfrastructureProviders: []string{fmt.Sprintf(providerDockerPrefix, stableRelease)}, InitWithProvidersContract: "v1beta1", // Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version. - InitWithKubernetesVersion: "v1.31.4", - WorkloadKubernetesVersion: "v1.31.4", + // When picking this version, please check also the list of versions known by the source Cluster API version. + InitWithKubernetesVersion: "v1.31.0", + WorkloadKubernetesVersion: "v1.31.0", MgmtFlavor: "topology", WorkloadFlavor: "topology", UseKindForManagementCluster: true, @@ -267,6 +268,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, stableRelease), InitWithProvidersContract: "v1beta1", // Note: Both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version. + // When picking this version, please check also the list of versions known by the source Cluster API version. InitWithKubernetesVersion: "v1.32.0", WorkloadKubernetesVersion: "v1.32.0", MgmtFlavor: "topology", @@ -296,6 +298,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur InitWithProvidersContract: "v1beta1", // Note: InitWithKubernetesVersion should be the latest of the next supported kubernetes version by the target Cluster API version. // Note: WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the source Cluster API version. + // When picking this version, please check also the list of versions known by the source Cluster API version. InitWithKubernetesVersion: initKubernetesVersion, WorkloadKubernetesVersion: "v1.32.0", MgmtFlavor: "topology",