Browse Source

Revert "Fix Cinder CSI"

This reverts commit 290d60a0aa.

We cannot do the copy in the Ignition stage, it's too early, unfortunately. We may have to fall back to the original way to put the copy in a script.

Change-Id: I5b6d1d3d7acfb640a20ecc7f8e1e954a7d3628e4
changes/75/761875/1
Feilong Wang 9 months ago
parent
commit
e17e6b8a60
  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,15 +246,6 @@ 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,6 +3,7 @@ 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,8 +112,7 @@ 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