openstack
/
magnum
Code Issues Proposed changes

Merge "Revert "Fix Cinder CSI""

This commit is contained in:
Zuul 2020-11-09 11:52:19 +00:00 committed by Gerrit Code Review
parent 2d49b25496 e17e6b8a60
commit 95416d9a55
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh
View File

@ -246,15 +246,6 @@ spec:
app: csi-cinder-controllerplugin app: csi-cinder-controllerplugin
spec: spec:
serviceAccount: csi-cinder-controller-sa 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: containers:
- name: csi-attacher - name: csi-attacher
image: ${CONTAINER_INFRA_PREFIX:-quay.io/k8scsi/}csi-attacher:${CSI_ATTACHER_TAG} image: ${CONTAINER_INFRA_PREFIX:-quay.io/k8scsi/}csi-attacher:${CSI_ATTACHER_TAG}

1
magnum/drivers/common/templates/kubernetes/fragments/write-kube-os-config.sh
View File

@ -3,6 +3,7 @@ set +x
set -x set -x
$ssh_cmd mkdir -p /etc/kubernetes/ $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 if [ -n "${TRUST_ID}" ]; then
KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/cloud-config KUBE_OS_CLOUD_CONFIG=/etc/kubernetes/cloud-config

3
magnum/drivers/k8s_fedora_coreos_v1/templates/fcct-config.yaml
View File

@ -112,8 +112,7 @@ storage:
done done
/usr/bin/update-ca-trust /usr/bin/update-ca-trust
cp /etc/pki/tls/certs/ca-bundle.crt /etc/kubernetes/ca-bundle.crt
HTTP_PROXY="__HTTP_PROXY__" HTTP_PROXY="__HTTP_PROXY__"
HTTPS_PROXY="__HTTPS_PROXY__" HTTPS_PROXY="__HTTPS_PROXY__"
NO_PROXY="__NO_PROXY__" NO_PROXY="__NO_PROXY__"