Skip to content

🌱 Prepare main branch for v0.17 development #667

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
May 28, 2025
Merged

🌱 Prepare main branch for v0.17 development #667

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
2 changes: 1 addition & 1 deletion docs/book/src/01_user/01_getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ In order to use this provider, you need to have a management cluster available t
No additional steps are required and you can install the RKE2 provider with **clusterctl** directly:

```bash
clusterctl init --core cluster-api:v1.9.5 --bootstrap rke2:v0.15.0 --control-plane rke2:v0.15.0 --infrastructure docker:v1.9.5
clusterctl init --core cluster-api:v1.9.5 --bootstrap rke2:v0.16.0 --control-plane rke2:v0.16.0 --infrastructure docker:v1.9.5
```

Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster).
Expand Down
3 changes: 3 additions & 0 deletions metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ releaseSeries:
- major: 0
minor: 16
contract: v1beta1
- major: 0
minor: 17
contract: v1beta1
12 changes: 6 additions & 6 deletions test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ providers:
- name: rke2-control-plane
type: ControlPlaneProvider
versions:
- name: "v0.15.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.15.0/control-plane-components.yaml"
- name: "v0.16.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.16.0/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -93,7 +93,7 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: "--leader-elect"
new: "--leader-elect=false"
- name: v0.16.99 # next; use manifest from source files
- name: v0.17.99 # next; use manifest from source files
value: "../../../controlplane/config/default"
contract: v1beta1
files:
Expand All @@ -107,8 +107,8 @@ providers:
- name: rke2-bootstrap
type: BootstrapProvider
versions:
- name: "v0.15.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.15.0/bootstrap-components.yaml"
- name: "v0.16.0"
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.16.0/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -119,7 +119,7 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: "--leader-elect"
new: "--leader-elect=false"
- name: v0.16.99 # next; use manifest from source files
- name: v0.17.99 # next; use manifest from source files
value: ../../../bootstrap/config/default
contract: v1beta1
files:
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
InfrastructureProviders: config.InfrastructureProviders(),
IPAMProviders: config.IPAMProviders(),
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
BootstrapProviders: []string{"rke2-bootstrap:v0.15.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.15.0"},
BootstrapProviders: []string{"rke2-bootstrap:v0.16.0"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.16.0"},
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
DisableMetricsCollection: true,
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/e2e_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ var _ = Describe("Workload cluster creation", func() {
})

Context("Creating a single control-plane cluster", func() {
It("Should create a cluster with v0.15.0 and perform upgrade to latest version", func() {
By("Installing v0.15.0 boostrap/controlplane provider version")
It("Should create a cluster with v0.16.0 and perform upgrade to latest version", func() {
By("Installing v0.16.0 boostrap/controlplane provider version")
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)

By("Initializing the cluster")
Expand Down Expand Up @@ -133,8 +133,8 @@ var _ = Describe("Workload cluster creation", func() {
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
ClusterProxy: bootstrapClusterProxy,
ClusterctlConfigPath: clusterctlConfigPath,
BootstrapProviders: []string{"rke2-bootstrap:v0.16.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.16.99"},
BootstrapProviders: []string{"rke2-bootstrap:v0.17.99"},
ControlPlaneProviders: []string{"rke2-control-plane:v0.17.99"},
LogFolder: clusterctlLogFolder,
})

Expand Down