From 66f273987ad995858bce31725005075e755c56ee Mon Sep 17 00:00:00 2001 From: Alexandr Demicev Date: Thu, 28 Nov 2024 11:07:40 +0100 Subject: [PATCH] Prepare main branch for v0.9 development Signed-off-by: Alexandr Demicev --- docs/book/src/01_user/01_getting-started.md | 2 +- metadata.yaml | 3 +++ test/e2e/config/e2e_conf.yaml | 12 ++++++------ test/e2e/e2e_suite_test.go | 4 ++-- test/e2e/e2e_upgrade_test.go | 8 ++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/book/src/01_user/01_getting-started.md b/docs/book/src/01_user/01_getting-started.md index 937691a0..b7ce018f 100644 --- a/docs/book/src/01_user/01_getting-started.md +++ b/docs/book/src/01_user/01_getting-started.md @@ -53,7 +53,7 @@ To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'. No additional steps are required and you can install the RKE2 provider with **clusterctl** directly: ```bash -clusterctl init --core cluster-api:v1.8.5 --bootstrap rke2:v0.8.0 --control-plane rke2:v0.8.0 --infrastructure docker:v1.8.5 +clusterctl init --core cluster-api:v1.8.5 --bootstrap rke2:v0.9.0 --control-plane rke2:v0.9.0 --infrastructure docker:v1.8.5 ``` Next, you can proceed to [creating a workload cluster](#create-a-workload-cluster). diff --git a/metadata.yaml b/metadata.yaml index 888af576..1cb44a93 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -33,3 +33,6 @@ releaseSeries: - major: 0 minor: 9 contract: v1beta1 + - major: 0 + minor: 10 + contract: v1beta1 diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index 15fbbda4..3f9cec2e 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -64,8 +64,8 @@ providers: - name: rke2-control-plane type: ControlPlaneProvider versions: - - name: "v0.8.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.8.0/control-plane-components.yaml" + - name: "v0.9.0" + value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.9.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.9.99 # next; use manifest from source files + - name: v0.10.99 # next; use manifest from source files value: "../../../controlplane/config/default" contract: v1beta1 files: @@ -90,8 +90,8 @@ providers: - name: rke2-bootstrap type: BootstrapProvider versions: - - name: "v0.8.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.8.0/bootstrap-components.yaml" + - name: "v0.9.0" + value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.9.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.9.99 # next; use manifest from source files + - name: v0.10.99 # next; use manifest from source files value: ../../../bootstrap/config/default contract: v1beta1 files: diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 3aab1bda..4d73b792 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -258,8 +258,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy InfrastructureProviders: config.InfrastructureProviders(), IPAMProviders: config.IPAMProviders(), RuntimeExtensionProviders: config.RuntimeExtensionProviders(), - BootstrapProviders: []string{"rke2-bootstrap:v0.8.0"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.8.0"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.9.0"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.9.0"}, LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()), DisableMetricsCollection: true, }, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) diff --git a/test/e2e/e2e_upgrade_test.go b/test/e2e/e2e_upgrade_test.go index eedd2b88..6beca400 100644 --- a/test/e2e/e2e_upgrade_test.go +++ b/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.8.0 and perform upgrade to latest version", func() { - By("Installing v0.8.0 boostrap/controlplane provider version") + It("Should create a cluster with v0.9.0 and perform upgrade to latest version", func() { + By("Installing v0.9.0 boostrap/controlplane provider version") initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder) By("Initializing the cluster") @@ -118,8 +118,8 @@ var _ = Describe("Workload cluster creation", func() { UpgradeManagementCluster(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{ ClusterProxy: bootstrapClusterProxy, ClusterctlConfigPath: clusterctlConfigPath, - BootstrapProviders: []string{"rke2-bootstrap:v0.9.99"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.9.99"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.10.99"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.10.99"}, LogFolder: clusterctlLogFolder, })