Bump CAPI to v1.7.7

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
rancher · Oct 10, 2024 · c76a3bd · c76a3bd
1 parent 170094b
commit c76a3bd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -146,7 +146,7 @@ HELM_VER := v3.15.3
 HELM_BIN := helm
 HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
 
-CLUSTERCTL_VER := v1.7.3
+CLUSTERCTL_VER := v1.7.7
 CLUSTERCTL_BIN := clusterctl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)
 

diff --git a/internal/controllers/clusterctl/config.yaml b/internal/controllers/clusterctl/config.yaml
@@ -11,7 +11,7 @@ data:
     providers:
     # Cluster API core provider
     - name:         "cluster-api"
-      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.3/core-components.yaml"
+      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.7/core-components.yaml"
       type:         "CoreProvider"
 
     # Infrastructure providers
@@ -28,20 +28,20 @@ data:
       url:          "https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/v0.7.0/infrastructure-components.yaml"
       type:         "InfrastructureProvider"
     - name:         "docker"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/infrastructure-components-development.yaml"
+      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.7/infrastructure-components-development.yaml"
       type:         "InfrastructureProvider"
 
     # Bootstrap providers
     - name:         "kubeadm"
-      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.3/bootstrap-components.yaml"
+      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.7/bootstrap-components.yaml"
       type:         "BootstrapProvider"
     - name:         "rke2"
       url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/bootstrap-components.yaml"
       type:         "BootstrapProvider"
 
     # ControlPlane providers
     - name:         "kubeadm"
-      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.3/control-plane-components.yaml"
+      url:          "https://github.com/rancher-sandbox/cluster-api/releases/v1.7.7/control-plane-components.yaml"
       type:         "ControlPlaneProvider"
     - name:         "rke2"
       url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.7.0/control-plane-components.yaml"

diff --git a/internal/sync/provider_sync_test.go b/internal/sync/provider_sync_test.go
@@ -160,7 +160,7 @@ var _ = Describe("Provider sync", func() {
 		s := sync.NewProviderSync(testEnv, capiProvider.DeepCopy())
 
 		expected := capiProvider.DeepCopy()
-		expected.Spec.Version = "v1.7.3"
+		expected.Spec.Version = "v1.7.7"
 
 		Eventually(func(g Gomega) {
 			g.Expect(s.Get(ctx)).To(Succeed())
@@ -254,7 +254,7 @@ var _ = Describe("Provider sync", func() {
 		s := sync.NewProviderSync(testEnv, capiProvider.DeepCopy())
 
 		expected := capiProvider.DeepCopy()
-		expected.Spec.Version = "v1.7.3"
+		expected.Spec.Version = "v1.7.7"
 
 		Eventually(func(g Gomega) {
 			g.Expect(s.Get(ctx)).To(Succeed())
@@ -342,7 +342,7 @@ var _ = Describe("Provider sync", func() {
 			g.Expect(capiProvider.Status.Conditions).To(HaveLen(2))
 			g.Expect(conditions.IsTrue(capiProvider, turtlesv1.LastAppliedConfigurationTime)).To(BeTrue())
 			g.Expect(conditions.IsTrue(capiProvider, turtlesv1.CheckLatestVersionTime)).To(BeTrue())
-			g.Expect(conditions.Get(capiProvider, turtlesv1.CheckLatestVersionTime).Message).To(Equal("Updated to latest v1.7.3 version"))
+			g.Expect(conditions.Get(capiProvider, turtlesv1.CheckLatestVersionTime).Message).To(Equal("Updated to latest v1.7.7 version"))
 			g.Expect(conditions.Get(capiProvider, turtlesv1.LastAppliedConfigurationTime).LastTransitionTime.After(
 				appliedCondition.LastTransitionTime.Time)).To(BeTrue())
 		}).Should(Succeed())

diff --git a/scripts/turtles-dev.sh b/scripts/turtles-dev.sh
@@ -44,8 +44,8 @@ export CLUSTER_TOPOLOGY=true
 
 helm install capi-operator capi-operator/cluster-api-operator \
 	--create-namespace -n capi-operator-system \
-	--set infrastructure=docker:v1.7.3 \
-	--set core=cluster-api:v1.7.3 \
+	--set infrastructure=docker:v1.7.7 \
+	--set core=cluster-api:v1.7.7 \
 	--set controlPlane=rke2:v0.7.0 \
 	--set bootstrap=rke2:v0.7.0 \
 	--timeout 90s --wait

diff --git a/test/e2e/suites/chart-upgrade/chart_upgrade_test.go b/test/e2e/suites/chart-upgrade/chart_upgrade_test.go
@@ -104,21 +104,21 @@ var _ = Describe("Chart upgrade functionality should work", Label(e2e.ShortTestL
 		upgradeInput.PostUpgradeSteps = append(upgradeInput.PostUpgradeSteps, func() {
 			framework.WaitForCAPIProviderRollout(ctx, framework.WaitForCAPIProviderRolloutInput{
 				Getter:    setupClusterResult.BootstrapClusterProxy.GetClient(),
-				Version:   "v1.7.3",
+				Version:   "v1.7.7",
 				Name:      "cluster-api",
 				Namespace: "capi-system",
 			}, e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers")...)
 		}, func() {
 			framework.WaitForCAPIProviderRollout(ctx, framework.WaitForCAPIProviderRolloutInput{
 				Getter:    setupClusterResult.BootstrapClusterProxy.GetClient(),
-				Version:   "v1.7.3",
+				Version:   "v1.7.7",
 				Name:      "kubeadm-control-plane",
 				Namespace: "capi-kubeadm-control-plane-system",
 			}, e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers")...)
 		}, func() {
 			framework.WaitForCAPIProviderRollout(ctx, framework.WaitForCAPIProviderRolloutInput{
 				Getter:    setupClusterResult.BootstrapClusterProxy.GetClient(),
-				Version:   "v1.7.3",
+				Version:   "v1.7.7",
 				Name:      "docker",
 				Namespace: "capd-system",
 			}, e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers")...)

diff --git a/test/e2e/suites/update-labels/suite_test.go b/test/e2e/suites/update-labels/suite_test.go
@@ -161,7 +161,7 @@ var _ = BeforeSuite(func() {
 		Tag:                          e2eConfig.GetVariable(e2e.TurtlesVersionVar),
 		WaitDeploymentsReadyInterval: e2eConfig.GetIntervals(setupClusterResult.BootstrapClusterProxy.GetName(), "wait-controllers"),
 		AdditionalValues: map[string]string{
-			"cluster-api-operator.cluster-api.version":          "v1.7.3",
+			"cluster-api-operator.cluster-api.version":          "v1.7.7",
 			"rancherTurtles.features.rancher-kubeconfigs.label": "true", // force to be true even if the default in the chart changes
 		},
 	}