From 290d60a0aa9e6091fbee4892c2fdaa6f9a2263a2 Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Mon, 19 Oct 2020 21:04:39 +1300
Subject: [PATCH] Fix Cinder CSI

A regression issue introduced by [1], which is causing Cinder CSI pods
failed to start. This patch will fixed it.

[1] https://review.opendev.org/#/c/749101/

Task: 41097
Story: 2008250

Change-Id: I0e20bc3eb306af86d22f0ea9f770186bb88eaca5
---
 .../templates/kubernetes/fragments/enable-cinder-csi.sh  | 9 +++++++++
 .../kubernetes/fragments/write-kube-os-config.sh         | 1 -
 .../k8s_fedora_coreos_v1/templates/fcct-config.yaml      | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
index f198feb500..8559a93763 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
@@ -246,6 +246,15 @@ spec:
         app: csi-cinder-controllerplugin
     spec:
       serviceAccount: csi-cinder-controller-sa
+      tolerations:
+        # Make sure the pod can be scheduled on master kubelet.
+        - effect: NoSchedule
+          operator: Exists
+        # Mark the pod as a critical add-on for rescheduling.
+        - key: CriticalAddonsOnly
+          operator: Exists
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       containers:
         - name: csi-attacher
           image: ${CONTAINER_INFRA_PREFIX:-quay.io/k8scsi/}csi-attacher:${CSI_ATTACHER_TAG}
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
index d68924ee9b..274e1adb22 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
@@ -3,7 +3,6 @@ set +x
 set -x
 
 $ssh_cmd mkdir -p /etc/kubernetes/
-$ssh_cmd cp /etc/pki/tls/certs/ca-bundle.crt /etc/kubernetes/ca-bundle.crt
 
 if [ -n "${TRUST_ID}" ]; then
     KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/cloud-config
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
index 99fd2f13bc..13dcf49cfc 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
@@ -112,7 +112,8 @@ storage:
           done
 
           /usr/bin/update-ca-trust
-          
+          cp /etc/pki/tls/certs/ca-bundle.crt /etc/kubernetes/ca-bundle.crt
+ 
           HTTP_PROXY="__HTTP_PROXY__"
           HTTPS_PROXY="__HTTPS_PROXY__"
           NO_PROXY="__NO_PROXY__"