Prepare main branch for v0.8 development

Signed-off-by: Furkat Gofurov <[email protected]>

metadata.yaml

@@ -27,3 +27,6 @@ releaseSeries:
   - major: 0
     minor: 7
     contract: v1beta1
+  - major: 0
+    minor: 8
+    contract: v1beta1

test/e2e/config/e2e_conf.yaml

@@ -64,8 +64,8 @@ providers:
   - name: rke2-control-plane
     type: ControlPlaneProvider
     versions:
-    - name: "v0.6.0"
-      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/control-plane-components.yaml"
+    - name: "v0.7.0"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.7.0/control-plane-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -76,7 +76,7 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.7.99
+    - name: v0.8.99
       value: "../../../controlplane/config/default"
       contract: v1beta1
       files:
@@ -90,8 +90,8 @@ providers:
   - name: rke2-bootstrap
     type: BootstrapProvider
     versions:
-    - name: "v0.6.0"
-      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/bootstrap-components.yaml"
+    - name: "v0.7.0"
+      value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.7.0/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -102,7 +102,7 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.7.99
+    - name: v0.8.99 # next; use manifest from source files
       value: ../../../bootstrap/config/default
       contract: v1beta1
       files:

test/e2e/e2e_suite_test.go

@@ -249,17 +249,17 @@ func initBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *
 	}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)
 }
 
-// initUpgradableBootstrapCluster initializes a bootstrap cluster with the latest minor version N-1 and used to perform an upgrade to the latest version.
-// Make sure to update the version in the providers list to the latest minor version N-1.
+// initUpgradableBootstrapCluster initializes a bootstrap cluster with the latest minor version and used to perform an upgrade to the next version.
+// Make sure to update the version in the providers list to the latest minor version.
 func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config *clusterctl.E2EConfig, clusterctlConfig, artifactFolder string) {
 	InitManagementCluster(context.TODO(), clusterctl.InitManagementClusterAndWatchControllerLogsInput{
 		ClusterProxy:              bootstrapClusterProxy,
 		ClusterctlConfigPath:      clusterctlConfig,
 		InfrastructureProviders:   config.InfrastructureProviders(),
 		IPAMProviders:             config.IPAMProviders(),
 		RuntimeExtensionProviders: config.RuntimeExtensionProviders(),
-		BootstrapProviders:        []string{"rke2-bootstrap:v0.6.0"},
-		ControlPlaneProviders:     []string{"rke2-control-plane:v0.6.0"},
+		BootstrapProviders:        []string{"rke2-bootstrap:v0.7.0"},
+		ControlPlaneProviders:     []string{"rke2-control-plane:v0.7.0"},
 		LogFolder:                 filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
 		DisableMetricsCollection:  true,
 	}, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...)

test/e2e/e2e_upgrade_test.go

@@ -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.6.0 and perform upgrade to latest version", func() {
-			By("Installing v0.6.0 boostrap/controlplane provider version")
+		It("Should create a cluster with v0.7.0 and perform upgrade to latest version", func() {
+			By("Installing v0.7.0 boostrap/controlplane provider version")
 			initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder)
 
 			By("Initializing the cluster")
@@ -114,12 +114,12 @@ var _ = Describe("Workload cluster creation", func() {
 				ControlPlane: client.ObjectKeyFromObject(result.ControlPlane),
 			}, e2eConfig.GetIntervals(specName, "wait-control-plane")...)
 
-			By("Upgrading to latest boostrap/controlplane provider version")
+			By("Upgrading to next boostrap/controlplane provider version")
 			UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
 				ClusterProxy:          bootstrapClusterProxy,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapProviders:    []string{"rke2-bootstrap:v0.7.99"},
-				ControlPlaneProviders: []string{"rke2-control-plane:v0.7.99"},
+				BootstrapProviders:    []string{"rke2-bootstrap:v0.8.99"},
+				ControlPlaneProviders: []string{"rke2-control-plane:v0.8.99"},
 				LogFolder:             clusterctlLogFolder,
 			})