Browse Source

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
changes/14/758714/6
Feilong Wang 10 months ago
committed by Bharat Kunwar
parent
commit
290d60a0aa
  1. 9
      magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
  2. 1
      magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
  3. 3
      magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml

9
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}

1
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

3
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__"

Loading…
Cancel
Save