fix: revert capi and capo version upgrade (#144)

vexxhost · Nov 28, 2024 · f6c3fa6 · f6c3fa6
1 parent 330428d
commit f6c3fa6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/molecule/cluster-api-upgrade/prepare.yml b/molecule/cluster-api-upgrade/prepare.yml
@@ -21,8 +21,8 @@
     - role: vexxhost.kubernetes.cert_manager
     - role: vexxhost.kubernetes.cluster_api
       vars:
-        clusterctl_version: 1.6.0
-        cluster_api_core_version: 1.6.0
-        cluster_api_bootstrap_version: 1.6.0
-        cluster_api_control_plane_version: 1.6.0
-        cluster_api_infrastructure_version: 0.10.5
+        clusterctl_version: 1.5.1
+        cluster_api_core_version: 1.5.1
+        cluster_api_bootstrap_version: 1.5.1
+        cluster_api_control_plane_version: 1.5.1
+        cluster_api_infrastructure_version: 0.8.0
diff --git a/roles/cluster_api/defaults/main.yml b/roles/cluster_api/defaults/main.yml
@@ -21,15 +21,15 @@ cluster_api_github_token: ""
 cluster_api_provider_path: /var/lib/cluster-api/providers
 
 cluster_api_core_provider: cluster-api
-cluster_api_core_version: 1.8.4
+cluster_api_core_version: 1.6.0
 
 cluster_api_bootstrap_provider: kubeadm
-cluster_api_bootstrap_version: 1.8.4
+cluster_api_bootstrap_version: 1.6.0
 
 cluster_api_control_plane_provider: kubeadm
-cluster_api_control_plane_version: 1.8.4
+cluster_api_control_plane_version: 1.6.0
 
 cluster_api_infrastructure_provider: openstack
-cluster_api_infrastructure_version: 0.11.2
+cluster_api_infrastructure_version: 0.9.0
 
 cluster_api_node_selector: {}
diff --git a/roles/clusterctl/defaults/main.yml b/roles/clusterctl/defaults/main.yml
@@ -20,12 +20,14 @@ clusterctl_checksums:
     1.4.4: 0e8b878d307c11c67ab8233bc2f6fa1f13ed97894120f86e6965ed6eafce5345
     1.5.1: 849c0dd9523d2b4916b199946794ceb9ad7f5ea70c56a635b70cdcf328c7a242
     1.6.0: 1f9d967b0a8fa8cf50fd86203658a8ddacbc7b4d5aafafccb1653aa0b38169ce
+    1.8.4: a7f40cde4e4a4f7119a52713386238ebcfa8691e7683b5afb823439ea81a8729
   arm64:
     1.3.2: 1c409918fdbe693f0c2a4558ea1a35a0bacb9dcee258177f11ecded1e669191c
     1.3.3: f34abc7047f17d522757eb341cf64f05761b85fa9e1a4390a96adbb2482de784
     1.4.4: 17782ec9151b7c9fc41538f7c65a53e3d922debc6e4f51aa2da460081384769f
     1.5.1: 053f31b6bcd1440ff2da1863a44a32123fbb050078786221be54edd88df57398
     1.6.0: 0fd6ef67b82a8e570d9701458ef33933f6fbacde094895b66b8fb6b36a0a85d1
+    1.8.4: 8fbaa26320fcdd11aa40e1e2ae4889f9743c33744e1d191eec2afca54d34bdbc
 
 clusterctl_download_url: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v{{ clusterctl_version }}/clusterctl-linux-{{ download_artifact_goarch }}" # noqa: yaml[line-length]
 clusterctl_download_dest: /usr/local/bin/clusterctl