From 1979ca0fb8d27d37a4bff932e94eff12d86bb45a Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Thu, 28 Nov 2024 14:12:20 -0500 Subject: [PATCH] Remove CAPI default versions --- galaxy.yml | 2 +- molecule/aio/molecule.yml | 1 - molecule/cluster-api-upgrade/prepare.yml | 9 ++++----- molecule/cluster-api/molecule.yml | 5 ++++- roles/cluster_api/defaults/main.yml | 12 +++++++----- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 85fef356..b82b121e 100644 --- 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 diff --git a/molecule/aio/molecule.yml b/molecule/aio/molecule.yml index ca2c7d74..bae801b4 100644 --- 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 index bd710965..0f65bde6 100644 --- 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 index 0edc2c48..ca486611 100644 --- 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 index 45678ff1..5b4f884a 100644 --- 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: {}