Skip to content

Commit cc09c2b

Browse files
Merge pull request #629 from furkatgofurov7/prepare-main-v015
🌱 Prepare main branch for v0.15 development
2 parents 2479d29 + 60798fe commit cc09c2b

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.9.5 --bootstrap rke2:v0.13.0 --control-plane rke2:v0.13.0 --infrastructure docker:v1.9.5
56+
clusterctl init --core cluster-api:v1.9.5 --bootstrap rke2:v0.14.0 --control-plane rke2:v0.14.0 --infrastructure docker:v1.9.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
@@ -48,3 +48,6 @@ releaseSeries:
4848
- major: 0
4949
minor: 14
5050
contract: v1beta1
51+
- major: 0
52+
minor: 15
53+
contract: v1beta1

test/e2e/config/e2e_conf.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ providers:
6464
- name: rke2-control-plane
6565
type: ControlPlaneProvider
6666
versions:
67-
- name: "v0.13.0"
68-
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.13.0/control-plane-components.yaml"
67+
- name: "v0.14.0"
68+
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.14.0/control-plane-components.yaml"
6969
type: "url"
7070
contract: v1beta1
7171
files:
@@ -76,7 +76,7 @@ providers:
7676
new: "imagePullPolicy: IfNotPresent"
7777
- old: "--leader-elect"
7878
new: "--leader-elect=false"
79-
- name: v0.14.99 # next; use manifest from source files
79+
- name: v0.15.99 # next; use manifest from source files
8080
value: "../../../controlplane/config/default"
8181
contract: v1beta1
8282
files:
@@ -90,8 +90,8 @@ providers:
9090
- name: rke2-bootstrap
9191
type: BootstrapProvider
9292
versions:
93-
- name: "v0.13.0"
94-
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.13.0/bootstrap-components.yaml"
93+
- name: "v0.14.0"
94+
value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.14.0/bootstrap-components.yaml"
9595
type: "url"
9696
contract: v1beta1
9797
files:
@@ -102,7 +102,7 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: "--leader-elect"
104104
new: "--leader-elect=false"
105-
- name: v0.14.99 # next; use manifest from source files
105+
- name: v0.15.99 # next; use manifest from source files
106106
value: ../../../bootstrap/config/default
107107
contract: v1beta1
108108
files:

test/e2e/e2e_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
258258
InfrastructureProviders: config.InfrastructureProviders(),
259259
IPAMProviders: config.IPAMProviders(),
260260
RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
261-
BootstrapProviders: []string{"rke2-bootstrap:v0.13.0"},
262-
ControlPlaneProviders: []string{"rke2-control-plane:v0.13.0"},
261+
BootstrapProviders: []string{"rke2-bootstrap:v0.14.0"},
262+
ControlPlaneProviders: []string{"rke2-control-plane:v0.14.0"},
263263
LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
264264
DisableMetricsCollection: true,
265265
}, 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
@@ -85,8 +85,8 @@ var _ = Describe("Workload cluster creation", func() {
8585
})
8686

8787
Context("Creating a single control-plane cluster", func() {
88-
It("Should create a cluster with v0.13.0 and perform upgrade to latest version", func() {
89-
By("Installing v0.13.0 boostrap/controlplane provider version")
88+
It("Should create a cluster with v0.14.0 and perform upgrade to latest version", func() {
89+
By("Installing v0.14.0 boostrap/controlplane provider version")
9090
initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
9191

9292
By("Initializing the cluster")
@@ -133,8 +133,8 @@ var _ = Describe("Workload cluster creation", func() {
133133
UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
134134
ClusterProxy: bootstrapClusterProxy,
135135
ClusterctlConfigPath: clusterctlConfigPath,
136-
BootstrapProviders: []string{"rke2-bootstrap:v0.14.99"},
137-
ControlPlaneProviders: []string{"rke2-control-plane:v0.14.99"},
136+
BootstrapProviders: []string{"rke2-bootstrap:v0.15.99"},
137+
ControlPlaneProviders: []string{"rke2-control-plane:v0.15.99"},
138138
LogFolder: clusterctlLogFolder,
139139
})
140140

0 commit comments

Comments
 (0)