From 08e748424333c873f8539d29dcc1a8dd83143d39 Mon Sep 17 00:00:00 2001
From: Mike Fedosin <mfedosin@redhat.com>
Date: Mon, 5 Jul 2021 15:58:18 +0200
Subject: [PATCH 1/2] Use /etc/openstack to mount the config and secrets

/etc/kubernetes is a read-only fs, so we can't create folders there.

To avoid this, we will mount openstack related resources to
/etc/openstack.
---
 pkg/cloud/openstack/assets/config.yaml     | 2 +-
 pkg/cloud/openstack/assets/deployment.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/cloud/openstack/assets/config.yaml b/pkg/cloud/openstack/assets/config.yaml
index afcdb4c26..209ad8324 100644
--- a/pkg/cloud/openstack/assets/config.yaml
+++ b/pkg/cloud/openstack/assets/config.yaml
@@ -3,7 +3,7 @@ data:
   cloud.conf: |
     [Global]
     use-clouds = true
-    clouds-file = /etc/kubernetes/secret/clouds.yaml
+    clouds-file = /etc/openstack/secret/clouds.yaml
     cloud = openstack
 kind: ConfigMap
 metadata:
diff --git a/pkg/cloud/openstack/assets/deployment.yaml b/pkg/cloud/openstack/assets/deployment.yaml
index 5142fbe1c..79edc9d92 100644
--- a/pkg/cloud/openstack/assets/deployment.yaml
+++ b/pkg/cloud/openstack/assets/deployment.yaml
@@ -49,7 +49,7 @@ spec:
           imagePullPolicy: "IfNotPresent"
           env:
             - name: CLOUD_CONFIG
-              value: /etc/kubernetes/config/cloud.conf
+              value: /etc/openstack/config/cloud.conf
           args:
             - --v=1
             - --cloud-config=$(CLOUD_CONFIG)
@@ -78,10 +78,10 @@ spec:
               name: host-etc-kube
               readOnly: true
             - name: secret-occm
-              mountPath: /etc/kubernetes/secret
+              mountPath: /etc/openstack/secret
               readOnly: true
             - name: config-occm
-              mountPath: /etc/kubernetes/config
+              mountPath: /etc/openstack/config
               readOnly: true
       volumes:
         - name: host-etc-kube

From 95318dbaf88f940fd4988194bc6260589d25781f Mon Sep 17 00:00:00 2001
From: Mike Fedosin <mfedosin@redhat.com>
Date: Mon, 5 Jul 2021 22:52:08 +0200
Subject: [PATCH 2/2] Fix openstack CCM binary path

According to https://github.com/openshift/cloud-provider-openstack/blob/master/images/cloud-controller-manager/Dockerfile#L10
it is /usr/bin/openstack-cloud-controller-manager.
---
 pkg/cloud/openstack/assets/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cloud/openstack/assets/deployment.yaml b/pkg/cloud/openstack/assets/deployment.yaml
index 79edc9d92..c5f59e697 100644
--- a/pkg/cloud/openstack/assets/deployment.yaml
+++ b/pkg/cloud/openstack/assets/deployment.yaml
@@ -68,7 +68,7 @@ spec:
             else
               URL_ONLY_KUBECONFIG=/etc/kubernetes/kubeconfig
             fi
-            exec /bin/openstack-cloud-controller-manager
+            exec /usr/bin/openstack-cloud-controller-manager
           resources:
             requests:
               cpu: 200m