rancher
/
cluster-api-provider-rke2
mirror of https://github.com/rancher/cluster-api-provider-rke2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #667 from furkatgofurov7/prepare-main-v017 

🌱 Prepare main branch for v0.17 development
This commit is contained in:
Furkat Gofurov 2025-05-28 09:55:15 +00:00 committed by GitHub
parent 8c30949d43 afe38dbc1f
commit bb055e7d38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/book/src/01_user/01_getting-started.md
View File

@ -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).

3
metadata.yaml
View File

@ -54,3 +54,6 @@ releaseSeries:
- major: 0
minor: 16
contract: v1beta1
- major: 0
minor: 17
contract: v1beta1

12
test/e2e/config/e2e_conf.yaml
View File

@ -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:
@ -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:
@ -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:
@ -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:

4
test/e2e/e2e_suite_test.go
View File

@ -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")...)

8
test/e2e/e2e_upgrade_test.go
View File

@ -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")
@ -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,
})