Remove CAPI default versions

vexxhost · Nov 28, 2024 · 1979ca0 · 1979ca0
1 parent 471eaec
commit 1979ca0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: vexxhost
 name: kubernetes
-version: 2.0.0
+version: 2.0.1
 readme: README.md
 authors:
   - Mohammed Naser <[email protected]>

diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml
@@ -27,7 +27,6 @@ provisioner:
           operator:
             replicas: 1
       controllers:
-        clusterctl_version: 1.6.0
         keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"
         keepalived_vip: 172.17.0.100
         keepalived_vrid: 42

diff --git a/molecule/cluster-api-upgrade/prepare.yml b/molecule/cluster-api-upgrade/prepare.yml
@@ -21,8 +21,7 @@
     - role: vexxhost.kubernetes.cert_manager
     - role: vexxhost.kubernetes.cluster_api
       vars:
-        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
+        clusterctl_version: 1.6.0
+        cluster_api_version: 1.6.0
+        cluster_api_infrastructure_provider: openstack
+        cluster_api_infrastructure_version: 0.9.0
diff --git a/molecule/cluster-api/molecule.yml b/molecule/cluster-api/molecule.yml
@@ -29,7 +29,10 @@ provisioner:
           operator:
             replicas: 1
       controllers:
-        clusterctl_version: 1.6.0
+        clusterctl_version: 1.8.4
+        cluster_api_version: 1.8.4
+        cluster_api_infrastructure_provider: openstack
+        cluster_api_infrastructure_version: 0.11.2
         cluster_api_node_selector:
           kubernetes.io/os: linux
         keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"

diff --git a/roles/cluster_api/defaults/main.yml b/roles/cluster_api/defaults/main.yml
@@ -20,16 +20,18 @@ cluster_api_github_token: ""
 
 cluster_api_provider_path: /var/lib/cluster-api/providers
 
+# cluster_api_version:
+
 cluster_api_core_provider: cluster-api
-cluster_api_core_version: 1.6.0
+cluster_api_core_version: "{{ cluster_api_version }}"
 
 cluster_api_bootstrap_provider: kubeadm
-cluster_api_bootstrap_version: 1.6.0
+cluster_api_bootstrap_version: "{{ cluster_api_version }}"
 
 cluster_api_control_plane_provider: kubeadm
-cluster_api_control_plane_version: 1.6.0
+cluster_api_control_plane_version: "{{ cluster_api_version }}"
 
-cluster_api_infrastructure_provider: openstack
-cluster_api_infrastructure_version: 0.9.0
+# cluster_api_infrastructure_provider:
+# cluster_api_infrastructure_version:
 
 cluster_api_node_selector: {}