Skip to content

Commit 084a728

Browse files
committed
Install ORC for CAPO >= 0.12.0
CAPO 0.12.0 has removed ORC [1] and now it needs to be installed additionally. [1] https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/tag/v0.12.0
1 parent c45e33c commit 084a728

File tree

4 files changed

+4685
-0
lines changed

4 files changed

+4685
-0
lines changed

molecule/cluster-api/molecule.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ provisioner:
3333
cluster_api_version: 1.9.6
3434
cluster_api_infrastructure_provider: openstack
3535
cluster_api_infrastructure_version: 0.12.2
36+
cluster_api_openstack_controller_version: 2.0.3
3637
cluster_api_node_selector:
3738
kubernetes.io/os: linux
3839
keepalived_interface: "{{ ansible_facts['default_ipv4'].interface }}"

roles/cluster_api/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ cluster_api_control_plane_version: "{{ cluster_api_version }}"
3434
# cluster_api_infrastructure_provider:
3535
# cluster_api_infrastructure_version:
3636

37+
cluster_api_openstack_controller_image: quay.io/orc/openstack-resource-controller
38+
cluster_api_openstack_controller_version: 2.0.3
39+
3740
cluster_api_node_selector: {}

roles/cluster_api/tasks/patch.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,17 @@
5252
- {"crd": "kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io", "path": "/spec/versions/2/schema/openAPIV3Schema/properties/spec/properties/template/properties/spec/properties/joinConfiguration/properties/nodeRegistration/properties/imagePullPolicy/default"}
5353
- {"crd": "kubeadmcontrolplanes.controlplane.cluster.x-k8s.io", "path": "/spec/versions/2/schema/openAPIV3Schema/properties/spec/properties/kubeadmConfigSpec/properties/initConfiguration/properties/nodeRegistration/properties/imagePullPolicy/default"}
5454
- {"crd": "kubeadmcontrolplanes.controlplane.cluster.x-k8s.io", "path": "/spec/versions/2/schema/openAPIV3Schema/properties/spec/properties/kubeadmConfigSpec/properties/joinConfiguration/properties/nodeRegistration/properties/imagePullPolicy/default"}
55+
56+
- name: Install required controllers
57+
kubernetes.core.k8s:
58+
state: present
59+
template:
60+
- path: "controllers/{{ cluster_api_infrastructure_provider }}-resource-controller/install.yaml.j2"
61+
apply: true
62+
server_side_apply:
63+
field_manager: ansible
64+
force_conflicts: true
65+
run_once: true
66+
when:
67+
- cluster_api_infrastructure_provider == "openstack"
68+
- cluster_api_infrastructure_version is ansible.builtin.version('0.12.0', 'ge')

0 commit comments

Comments
 (0)