Skip to content

Commit 56576c2

Browse files
Merge pull request #762 from rancher/add-metadata-missing
Prepare main branch for releasing 0.21
2 parents a1f5488 + 4fba78c commit 56576c2

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

docs/book/src/01_user/01_getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ In order to use this provider, you need to have a management cluster available t
5353
No additional steps are required and you can install the RKE2 provider with **clusterctl** directly:
5454
5555
```bash
56-
clusterctl init --core cluster-api:v1.10.5 --bootstrap rke2:v0.19.0 --control-plane rke2:v0.19.0 --infrastructure docker:v1.10.5
56+
clusterctl init --core cluster-api:v1.10.5 --bootstrap rke2:v0.20.0 --control-plane rke2:v0.20.0 --infrastructure docker:v1.10.5
5757
```
5858
5959
Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster).

metadata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,6 @@ releaseSeries:
6666
- major: 0
6767
minor: 20
6868
contract: v1beta1
69+
- major: 0
70+
minor: 21
71+
contract: v1beta1

test/e2e/config/e2e_conf.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ providers:
4949
- name: rke2-control-plane
5050
type: ControlPlaneProvider
5151
versions:
52-
- name: "v0.19.0"
53-
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.19.0/control-plane-components.yaml"
52+
- name: "v0.20.0"
53+
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.20.0/control-plane-components.yaml"
5454
type: "url"
5555
contract: v1beta1
5656
files:
@@ -61,7 +61,7 @@ providers:
6161
new: "imagePullPolicy: IfNotPresent"
6262
- old: "--leader-elect"
6363
new: "--leader-elect=false"
64-
- name: v0.20.99 # next; use manifest from source files
64+
- name: v0.21.99 # next; use manifest from source files
6565
value: "../../../controlplane/config/default"
6666
contract: v1beta1
6767
files:
@@ -75,8 +75,8 @@ providers:
7575
- name: rke2-bootstrap
7676
type: BootstrapProvider
7777
versions:
78-
- name: "v0.19.0"
79-
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.19.0/bootstrap-components.yaml"
78+
- name: "v0.20.0"
79+
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.20.0/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -87,7 +87,7 @@ providers:
8787
new: "imagePullPolicy: IfNotPresent"
8888
- old: "--leader-elect"
8989
new: "--leader-elect=false"
90-
- name: v0.20.99 # next; use manifest from source files
90+
- name: v0.21.99 # next; use manifest from source files
9191
value: ../../../bootstrap/config/default
9292
contract: v1beta1
9393
files:

test/e2e/e2e_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
274274
InfrastructureProviders: config.InfrastructureProviders(),
275275
IPAMProviders: config.IPAMProviders(),
276276
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
277-
BootstrapProviders: []string{"rke2-bootstrap:v0.19.0"},
278-
ControlPlaneProviders: []string{"rke2-control-plane:v0.19.0"},
277+
BootstrapProviders: []string{"rke2-bootstrap:v0.20.0"},
278+
ControlPlaneProviders: []string{"rke2-control-plane:v0.20.0"},
279279
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
280280
DisableMetricsCollection: true,
281281
}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)

test/e2e/e2e_upgrade_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ var _ = Describe("Provider upgrade", func() {
8787
})
8888

8989
Context("Creating a single control-plane cluster", func() {
90-
It("Should create a cluster with v0.19.0 and perform upgrade to latest version", func() {
91-
By("Installing v0.19.0 boostrap/controlplane provider version")
90+
It("Should create a cluster with v0.20.0 and perform upgrade to latest version", func() {
91+
By("Installing v0.20.0 boostrap/controlplane provider version")
9292
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
9393

9494
By("Initializing the cluster")
@@ -135,8 +135,8 @@ var _ = Describe("Provider upgrade", func() {
135135
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
136136
ClusterProxy: bootstrapClusterProxy,
137137
ClusterctlConfigPath: clusterctlConfigPath,
138-
BootstrapProviders: []string{"rke2-bootstrap:v0.20.99"},
139-
ControlPlaneProviders: []string{"rke2-control-plane:v0.20.99"},
138+
BootstrapProviders: []string{"rke2-bootstrap:v0.21.99"},
139+
ControlPlaneProviders: []string{"rke2-control-plane:v0.21.99"},
140140
LogFolder: clusterctlLogFolder,
141141
})
142142

0 commit comments

Comments
 (0)