[release/v1.4] Mount /usr/share/ca-certificates to the OpenStack CCM …

…pod (#1905) * Mount /usr/share/ca-certificates to the OpenStack CCM pod Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> * Fix issue with the gobetween script on Flatcar Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com> Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Mar 29, 2022 · aeb0a79 · aeb0a79
1 parent f9c655f
commit aeb0a79
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/addons/ccm-openstack/ccm-openstack.yaml b/addons/ccm-openstack/ccm-openstack.yaml
@@ -206,6 +206,9 @@ spec:
             - mountPath: /etc/ssl/certs
               name: ca-certs
               readOnly: true
+            - mountPath: /usr/share/ca-certificates
+              name: usr-ca-certs
+              readOnly: true
             - mountPath: /etc/config
               name: cloud-config-volume
               readOnly: true
@@ -225,6 +228,10 @@ spec:
         hostPath:
           path: /etc/ssl/certs
           type: DirectoryOrCreate
+      - hostPath:
+          path: /usr/share/ca-certificates
+          type: DirectoryOrCreate
+        name: usr-ca-certs
       - name: cloud-config-volume
         secret:
           secretName: cloud-config

diff --git a/examples/terraform/openstack/gobetween.sh b/examples/terraform/openstack/gobetween.sh
@@ -21,14 +21,14 @@ set -euf -o pipefail
 
 GOBETWEEN_VERSION=0.7.0
 
-noop() { : "didn't detected package manager, noop"; }
-
 PKG_MANAGER="noop"
 
 [ "$(command -v yum)" ] && PKG_MANAGER=yum
 [ "$(command -v apt-get)" ] && PKG_MANAGER=apt-get
 
-sudo ${PKG_MANAGER} install tar -y
+if [ "$PKG_MANAGER" != "noop" ]; then
+  sudo ${PKG_MANAGER} install tar -y
+fi
 
 mkdir -p /tmp/gobetween
 cd /tmp/gobetween