C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix deployment without openstack cacert (#7723)

Browse source 
* fix group name

* fix external-openstack-cloud-config secret

* don't add ca.cert in the secret if not defined
This commit is contained in:
Id2ndR 2021-06-21 14:38:50 +02:00 committed by GitHub
parent e83728897b
commit a31baf3c16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
View file

@ -7,7 +7,7 @@
src: "{{ external_openstack_cacert }}" src: "{{ external_openstack_cacert }}"
register: external_openstack_cacert_b64 register: external_openstack_cacert_b64
when: when:
- inventory_hostname == groups['k8s_control_plane'][0] - inventory_hostname == groups['kube_control_plane'][0]
- external_openstack_cacert is defined - external_openstack_cacert is defined
- external_openstack_cacert | length > 0 - external_openstack_cacert | length > 0
tags: external-openstack tags: external-openstack

6
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2
View file

@ -7,5 +7,7 @@ metadata:
name: external-openstack-cloud-config name: external-openstack-cloud-config
namespace: kube-system namespace: kube-system
data: data:
cloud.conf: {{ external_openstack_cloud_config_secret.content }} cloud.conf: {{ external_openstack_cloud_config_secret }}
ca.cert: {{ external_openstack_cacert_b64.content | default("") }} {% if external_openstack_cacert_b64.content is defined %}
ca.cert: {{ external_openstack_cacert_b64.content }}
{% endif %}