From 5a8e0193fb75eeb617a41ce781745d42a2494ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nathana=C3=ABl=20M?=
 <Nathanael-Mtd@users.noreply.github.com>
Date: Fri, 12 Jul 2024 18:05:21 +0200
Subject: [PATCH] Copy external_openstack_cacert to control-planes from host

---
 .../openstack/tasks/main.yml                        |  9 +++++----
 .../external-openstack-cloud-config-secret.yml.j2   |  3 ---
 ...nal-openstack-cloud-controller-manager-ds.yml.j2 | 13 ++++++++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml b/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
index 8c930f3aa..ec9d1b658 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
@@ -3,13 +3,14 @@
   include_tasks: openstack-credential-check.yml
   tags: external-openstack
 
-- name: External OpenStack Cloud Controller | Get base64 cacert
-  slurp:
+- name: External OpenStack Cloud Controller | Write cacert file
+  copy:
     src: "{{ external_openstack_cacert }}"
-  register: external_openstack_cacert_b64
+    dest: "{{ kube_config_dir }}/external-openstack-cacert.pem"
+    group: "{{ kube_cert_group }}"
+    mode: "0640"
   when:
     - inventory_hostname == groups['kube_control_plane'][0]
-    - external_openstack_cacert is defined
     - external_openstack_cacert | length > 0
   tags: external-openstack
 
diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2
index 2a6f6a8e3..807d83f03 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config-secret.yml.j2
@@ -8,6 +8,3 @@ metadata:
   namespace: kube-system
 data:
   cloud.conf: {{ external_openstack_cloud_config_secret }}
-{% if external_openstack_cacert_b64.content is defined %}
-  ca.cert: {{ external_openstack_cacert_b64.content }}
-{% endif %}
diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
index 85df9975e..170ef8df6 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
@@ -66,10 +66,11 @@ spec:
               name: cloud-config-volume
               readOnly: true
               subPath: cloud.conf
-            - mountPath: {{ kube_config_dir }}/external-openstack-cacert.pem
-              name: cloud-config-volume
+{% if external_openstack_cacert != "" %}
+            - name: external-openstack-cacert
+              mountPath: {{ kube_config_dir }}/external-openstack-cacert.pem
               readOnly: true
-              subPath: ca.cert
+{% endif %}
 {% if kubelet_flexvolumes_plugins_dir is defined %}
             - mountPath: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
               name: flexvolume-dir
@@ -110,3 +111,9 @@ spec:
       - name: cloud-config-volume
         secret:
           secretName: external-openstack-cloud-config
+{% if external_openstack_cacert != "" %}
+      - name: external-openstack-cacert
+        hostPath:
+          path: {{ kube_config_dir }}/external-openstack-cacert.pem
+          type: FileOrCreate
+{% endif %}