Skip to content

Commit

Permalink
Merge pull request #11659 from fabriziopandini/11647-follow-ups
Browse files Browse the repository at this point in the history
🌱 Follow up of 11647
  • Loading branch information
k8s-ci-robot authored Jan 10, 2025
2 parents fe6a595 + 91d01dc commit 7f2a8cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/release/role-handbooks/release-lead/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions test/e2e/clusterctl_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 7f2a8cd

Please sign in to comment.