diff --git a/metadata.yaml b/metadata.yaml index f6da37a5..cfae25fa 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -24,3 +24,6 @@ releaseSeries: - major: 0 minor: 6 contract: v1beta1 + - major: 0 + minor: 7 + contract: v1beta1 diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index f1774ca5..9aff6ea4 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.4.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/control-plane-components.yaml" + - name: "v0.6.0" + value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -76,19 +76,7 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: "--leader-elect" new: "--leader-elect=false" - - name: "v0.5.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.5.0/control-plane-components.yaml" - type: "url" - contract: v1beta1 - files: - - sourcePath: "../../../metadata.yaml" - targetName: "metadata.yaml" - replacements: - - old: "imagePullPolicy: Always" - new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - - name: v0.6.99 + - name: v0.7.99 value: "../../../controlplane/config/default" contract: v1beta1 files: @@ -102,20 +90,8 @@ providers: - name: rke2-bootstrap type: BootstrapProvider versions: - - name: "v0.4.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.4.0/bootstrap-components.yaml" - type: "url" - contract: v1beta1 - files: - - sourcePath: "../../../metadata.yaml" - targetName: "metadata.yaml" - replacements: - - old: "imagePullPolicy: Always" - new: "imagePullPolicy: IfNotPresent" - - old: "--leader-elect" - new: "--leader-elect=false" - - name: "v0.5.0" - value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.5.0/bootstrap-components.yaml" + - name: "v0.6.0" + value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.6.0/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -126,7 +102,7 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: "--leader-elect" new: "--leader-elect=false" - - name: v0.6.99 + - name: v0.7.99 value: ../../../bootstrap/config/default contract: v1beta1 files: diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 00f078d9..bc92160e 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -257,8 +257,8 @@ func initUpgradableBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy InfrastructureProviders: config.InfrastructureProviders(), IPAMProviders: config.IPAMProviders(), RuntimeExtensionProviders: config.RuntimeExtensionProviders(), - BootstrapProviders: []string{"rke2-bootstrap:v0.5.0"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.5.0"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.6.0"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.6.0"}, LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()), }, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) } diff --git a/test/e2e/e2e_upgrade_test.go b/test/e2e/e2e_upgrade_test.go index db000b86..77594396 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.5.0 and perform upgrade to latest version", func() { - By("Installing v0.5.0 boostrap/controlplane provider version") + 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") initUpgradableBootstrapCluster(bootstrapClusterProxy, e2eConfig, clusterctlConfigPath, artifactFolder) By("Initializing the cluster") @@ -118,8 +118,8 @@ var _ = Describe("Workload cluster creation", func() { clusterctl.UpgradeManagementClusterAndWait(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{ ClusterProxy: bootstrapClusterProxy, ClusterctlConfigPath: clusterctlConfigPath, - BootstrapProviders: []string{"rke2-bootstrap:v0.6.99"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.6.99"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.7.99"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.7.99"}, LogFolder: clusterctlLogFolder, }, e2eConfig.GetIntervals(specName, "wait-controllers")...)