Prepare main branch for v0.22 development

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

Author: furkatgofurov7

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

@@ -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.10.5 --bootstrap rke2:v0.20.0 --control-plane rke2:v0.20.0 --infrastructure docker:v1.10.5
+clusterctl init --core cluster-api:v1.10.5 --bootstrap rke2:v0.21.0 --control-plane rke2:v0.21.0 --infrastructure docker:v1.10.5
 ```
 
 Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster).

metadata.yaml

@@ -69,3 +69,6 @@ releaseSeries:
   - major: 0
     minor: 21
     contract: v1beta1
+  - major: 0
+    minor: 22
+    contract: v1beta1

test/e2e/config/e2e_conf.yaml

@@ -49,8 +49,13 @@ providers:
   - name: rke2-control-plane
     type: ControlPlaneProvider
     versions:
+<<<<<<< HEAD
     - name: "v0.20.0"
       value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.20.0/control-plane-components.yaml"
+=======
+    - name: "v0.21.0"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.21.0/control-plane-components.yaml"
+>>>>>>> a25a12d (Prepare main branch for v0.22 development)
       type: "url"
       contract: v1beta1
       files:
@@ -61,7 +66,7 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.21.99 # next; use manifest from source files
+    - name: v0.22.99 # next; use manifest from source files
       value: "../../../controlplane/config/default"
       contract: v1beta1
       files:
@@ -75,8 +80,8 @@ providers:
   - name: rke2-bootstrap
     type: BootstrapProvider
     versions:
-    - name: "v0.20.0"
-      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.20.0/bootstrap-components.yaml"
+    - name: "v0.21.0"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.21.0/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -87,7 +92,7 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.21.99 # next; use manifest from source files
+    - name: v0.22.99 # next; use manifest from source files
       value: ../../../bootstrap/config/default
       contract: v1beta1
       files:

test/e2e/e2e_suite_test.go

@@ -274,8 +274,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy
 		InfrastructureProviders:   config.InfrastructureProviders(),
 		IPAMProviders:             config.IPAMProviders(),
 		RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
-		BootstrapProviders:        []string{"rke2-bootstrap:v0.20.0"},
-		ControlPlaneProviders:     []string{"rke2-control-plane:v0.20.0"},
+		BootstrapProviders:        []string{"rke2-bootstrap:v0.21.0"},
+		ControlPlaneProviders:     []string{"rke2-control-plane:v0.21.0"},
 		LogFolder:                 filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
 		DisableMetricsCollection:  true,
 	}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)

test/e2e/e2e_upgrade_test.go

@@ -87,8 +87,8 @@ var _ = Describe("Provider upgrade", func() {
 	})
 
 	Context("Creating a single control-plane cluster", func() {
-		It("Should create a cluster with v0.20.0 and perform upgrade to latest version", func() {
-			By("Installing v0.20.0 boostrap/controlplane provider version")
+		It("Should create a cluster with v0.21.0 and perform upgrade to latest version", func() {
+			By("Installing v0.21.0 boostrap/controlplane provider version")
 			initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
 
 			By("Initializing the cluster")
@@ -135,8 +135,8 @@ var _ = Describe("Provider upgrade", func() {
 			UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
 				ClusterProxy:          bootstrapClusterProxy,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapProviders:    []string{"rke2-bootstrap:v0.21.99"},
-				ControlPlaneProviders: []string{"rke2-control-plane:v0.21.99"},
+				BootstrapProviders:    []string{"rke2-bootstrap:v0.22.99"},
+				ControlPlaneProviders: []string{"rke2-control-plane:v0.22.99"},
 				LogFolder:             clusterctlLogFolder,
 			})