Bump CAPRKE2 to latest version in e2e setup

Signed-off-by: Furkat Gofurov <[email protected]>
rancher · Jul 5, 2024 · c0f8bc4 · c0f8bc4
1 parent 723fbb7
commit c0f8bc4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git 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-sandbox/cluster-api-provider-rke2-bootstrap:v0.2.7
+  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:v0.4.0
     loadBehavior: tryLoad
-  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:v0.2.7
+  - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:v0.4.0
     loadBehavior: tryLoad
   - name: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev
     loadBehavior: mustLoad
@@ -52,8 +52,8 @@ providers:
   - name: rke2-control-plane
     type: ControlPlaneProvider
     versions:
-    - name: "v0.2.7"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.2.7/control-plane-components.yaml"
+    - name: "v0.3.0"
+      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.3.0/control-plane-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -64,7 +64,19 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.3.99
+    - name: "v0.4.0"
+      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.4.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.4.99
       value: "../../../controlplane/config/default"
       contract: v1beta1
       files:
@@ -78,8 +90,20 @@ providers:
   - name: rke2-bootstrap
     type: BootstrapProvider
     versions:
-    - name: "v0.2.7"
-      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.2.7/bootstrap-components.yaml"
+    - name: "v0.3.0"
+      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.3.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.4.0"
+      value: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/download/v0.4.0/bootstrap-components.yaml"
       type: "url"
       contract: v1beta1
       files:
@@ -90,7 +114,7 @@ providers:
           new: "imagePullPolicy: IfNotPresent"
         - old: "--leader-elect"
           new: "--leader-elect=false"
-    - name: v0.3.99
+    - name: v0.4.99
       value: ../../../bootstrap/config/default
       contract: v1beta1
       files:

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -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
@@ -119,8 +119,8 @@ var _ = Describe("Workload cluster creation", func() {
 			clusterctl.UpgradeManagementClusterAndWait(ctx, clusterctl.UpgradeManagementClusterAndWaitInput{
 				ClusterProxy:          bootstrapClusterProxy,
 				ClusterctlConfigPath:  clusterctlConfigPath,
-				BootstrapProviders:    []string{"rke2-bootstrap:v0.3.99"},
-				ControlPlaneProviders: []string{"rke2-control-plane:v0.3.99"},
+				BootstrapProviders:    []string{"rke2-bootstrap:v0.4.99"},
+				ControlPlaneProviders: []string{"rke2-control-plane:v0.4.99"},
 				LogFolder:             clusterctlLogFolder,
 			}, e2eConfig.GetIntervals(specName, "wait-controllers")...)