Skip to content

Commit 1b51e52

Browse files
authored
Remove CAPI default versions (#146)
1 parent 471eaec commit 1b51e52

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

galaxy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace: vexxhost
22
name: kubernetes
3-
version: 2.0.0
3+
version: 2.0.1
44
readme: README.md
55
authors:
66
- Mohammed Naser <[email protected]>

molecule/aio/molecule.yml

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ provisioner:
2727
operator:
2828
replicas: 1
2929
controllers:
30-
clusterctl_version: 1.6.0
3130
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"
3231
keepalived_vip: 172.17.0.100
3332
keepalived_vrid: 42

molecule/cluster-api-upgrade/prepare.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
- role: vexxhost.kubernetes.cert_manager
2222
- role: vexxhost.kubernetes.cluster_api
2323
vars:
24-
clusterctl_version: 1.5.1
25-
cluster_api_core_version: 1.5.1
26-
cluster_api_bootstrap_version: 1.5.1
27-
cluster_api_control_plane_version: 1.5.1
28-
cluster_api_infrastructure_version: 0.8.0
24+
clusterctl_version: 1.6.0
25+
cluster_api_version: 1.6.0
26+
cluster_api_infrastructure_provider: openstack
27+
cluster_api_infrastructure_version: 0.9.0

molecule/cluster-api/molecule.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ provisioner:
2929
operator:
3030
replicas: 1
3131
controllers:
32-
clusterctl_version: 1.6.0
32+
clusterctl_version: 1.8.4
33+
cluster_api_version: 1.8.4
34+
cluster_api_infrastructure_provider: openstack
35+
cluster_api_infrastructure_version: 0.11.2
3336
cluster_api_node_selector:
3437
kubernetes.io/os: linux
3538
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"

roles/cluster_api/defaults/main.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ cluster_api_github_token: ""
2020

2121
cluster_api_provider_path: /var/lib/cluster-api/providers
2222

23+
# cluster_api_version:
24+
2325
cluster_api_core_provider: cluster-api
24-
cluster_api_core_version: 1.6.0
26+
cluster_api_core_version: "{{ cluster_api_version }}"
2527

2628
cluster_api_bootstrap_provider: kubeadm
27-
cluster_api_bootstrap_version: 1.6.0
29+
cluster_api_bootstrap_version: "{{ cluster_api_version }}"
2830

2931
cluster_api_control_plane_provider: kubeadm
30-
cluster_api_control_plane_version: 1.6.0
32+
cluster_api_control_plane_version: "{{ cluster_api_version }}"
3133

32-
cluster_api_infrastructure_provider: openstack
33-
cluster_api_infrastructure_version: 0.9.0
34+
# cluster_api_infrastructure_provider:
35+
# cluster_api_infrastructure_version:
3436

3537
cluster_api_node_selector: {}

0 commit comments

Comments
 (0)