From 8f9176996a38711478daeeec91ebdad76ef4cca2 Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Mon, 22 Jul 2024 19:40:17 +0200 Subject: [PATCH 1/2] chore: add v0.5.0 to metadata.yaml Signed-off-by: Carlos Salas --- metadata.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/metadata.yaml b/metadata.yaml index a4e66791..1421db8f 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -17,4 +17,7 @@ releaseSeries: contract: v1beta1 - major: 0 minor: 4 - contract: v1beta1 \ No newline at end of file + contract: v1beta1 + - major: 0 + minor: 5 + contract: v1beta1 From 7165cfc50a274a68095806a4f0c3ab46cfbb46aa Mon Sep 17 00:00:00 2001 From: Carlos Salas Date: Mon, 22 Jul 2024 19:40:34 +0200 Subject: [PATCH 2/2] test: update tests to use latest release Signed-off-by: Carlos Salas --- test/e2e/config/e2e_conf.yaml | 32 ++++++++++++++++++++++++++++---- test/e2e/e2e_suite_test.go | 8 ++++---- test/e2e/e2e_upgrade_test.go | 10 +++++----- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index 53216b9a..043cecbb 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -1,9 +1,9 @@ managementClusterName: caprke2-e2e images: - - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.4.0 + - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.5.0 loadBehavior: tryLoad - - name: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.4.0 + - name: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.5.0 loadBehavior: tryLoad - name: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev loadBehavior: mustLoad @@ -88,7 +88,19 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: "--leader-elect" new: "--leader-elect=false" - - name: v0.4.99 + - 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.5.99 value: "../../../controlplane/config/default" contract: v1beta1 files: @@ -138,7 +150,19 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: "--leader-elect" new: "--leader-elect=false" - - name: v0.4.99 + - name: "v0.5.0" + value: "https://github.com/rancher/cluster-api-provider-rke2/releases/download/v0.5.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.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 c7e76889..c5cab2bf 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -241,8 +241,8 @@ func initBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, config * InfrastructureProviders: config.InfrastructureProviders(), IPAMProviders: config.IPAMProviders(), RuntimeExtensionProviders: config.RuntimeExtensionProviders(), - BootstrapProviders: []string{"rke2-bootstrap:v0.4.0"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.4.0"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.5.0"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.5.0"}, LogFolder: filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()), }, config.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) } @@ -254,8 +254,8 @@ func initLegacyBootstrapCluster(bootstrapClusterProxy framework.ClusterProxy, co InfrastructureProviders: config.InfrastructureProviders(), IPAMProviders: config.IPAMProviders(), RuntimeExtensionProviders: config.RuntimeExtensionProviders(), - BootstrapProviders: []string{"rke2-bootstrap:v0.2.7"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.2.7"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.3.0"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.3.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 b834a304..b4df84c0 100644 --- a/test/e2e/e2e_upgrade_test.go +++ b/test/e2e/e2e_upgrade_test.go @@ -115,12 +115,12 @@ var _ = Describe("Workload cluster creation", func() { ControlPlane: client.ObjectKeyFromObject(result.LegacyControlPlane), }, e2eConfig.GetIntervals(specName, "wait-control-plane")...) - By("Upgrading to v0.3.0 boostrap/controlplane provider version") + By("Upgrading to v0.4.0 boostrap/controlplane provider version") clusterctl.UpgradeManagementClusterAndWait(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{ ClusterProxy: bootstrapClusterProxy, ClusterctlConfigPath: clusterctlConfigPath, - BootstrapProviders: []string{"rke2-bootstrap:v0.3.0"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.3.0"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.4.0"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.4.0"}, LogFolder: clusterctlLogFolder, }, e2eConfig.GetIntervals(specName, "wait-controllers")...) @@ -128,8 +128,8 @@ var _ = Describe("Workload cluster creation", func() { clusterctl.UpgradeManagementClusterAndWait(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{ ClusterProxy: bootstrapClusterProxy, ClusterctlConfigPath: clusterctlConfigPath, - BootstrapProviders: []string{"rke2-bootstrap:v0.4.99"}, - ControlPlaneProviders: []string{"rke2-control-plane:v0.4.99"}, + BootstrapProviders: []string{"rke2-bootstrap:v0.5.99"}, + ControlPlaneProviders: []string{"rke2-control-plane:v0.5.99"}, LogFolder: clusterctlLogFolder, }, e2eConfig.GetIntervals(specName, "wait-controllers")...)