C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(external-openstack): Do not override /etc/ssl/certs

Browse source
This commit is contained in:
Kevin Huang 2022-10-07 15:21:44 +02:00
parent 24632ae81b
commit 09d876edad
No known key found for this signature in database
GPG key ID: 39C78E8429C3F700
3 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
View file

@ -130,9 +130,6 @@ spec:
- name: secret-cinderplugin - name: secret-cinderplugin
mountPath: /etc/config mountPath: /etc/config
readOnly: true readOnly: true
- name: ca-certs
mountPath: /etc/ssl/certs
readOnly: true
{% if cinder_cacert is defined and cinder_cacert != "" %} {% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert - name: cinder-cacert
mountPath: {{ kube_config_dir }}/cinder-cacert.pem mountPath: {{ kube_config_dir }}/cinder-cacert.pem
@ -144,10 +141,6 @@ spec:
- name: secret-cinderplugin - name: secret-cinderplugin
secret: secret:
secretName: cloud-config secretName: cloud-config
- name: ca-certs
hostPath:
path: /etc/ssl/certs
type: DirectoryOrCreate
{% if cinder_cacert is defined and cinder_cacert != "" %} {% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert - name: cinder-cacert
hostPath: hostPath:

7
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-nodeplugin.yml.j2
View file

@ -89,9 +89,6 @@ spec:
- name: secret-cinderplugin - name: secret-cinderplugin
mountPath: /etc/config mountPath: /etc/config
readOnly: true readOnly: true
- name: ca-certs
mountPath: /etc/ssl/certs
readOnly: true
{% if cinder_cacert is defined and cinder_cacert != "" %} {% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert - name: cinder-cacert
mountPath: {{ kube_config_dir }}/cinder-cacert.pem mountPath: {{ kube_config_dir }}/cinder-cacert.pem
@ -121,10 +118,6 @@ spec:
- name: secret-cinderplugin - name: secret-cinderplugin
secret: secret:
secretName: cloud-config secretName: cloud-config
- name: ca-certs
hostPath:
path: /etc/ssl/certs
type: DirectoryOrCreate
{% if cinder_cacert is defined and cinder_cacert != "" %} {% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert - name: cinder-cacert
hostPath: hostPath:

7
roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
View file

@ -54,9 +54,6 @@ spec:
- mountPath: /etc/kubernetes/pki - mountPath: /etc/kubernetes/pki
name: k8s-certs name: k8s-certs
readOnly: true readOnly: true
- mountPath: /etc/ssl/certs
name: ca-certs
readOnly: true
- mountPath: /etc/config/cloud.conf - mountPath: /etc/config/cloud.conf
name: cloud-config-volume name: cloud-config-volume
readOnly: true readOnly: true
@ -87,10 +84,6 @@ spec:
path: /etc/kubernetes/pki path: /etc/kubernetes/pki
type: DirectoryOrCreate type: DirectoryOrCreate
name: k8s-certs name: k8s-certs
- hostPath:
path: /etc/ssl/certs
type: DirectoryOrCreate
name: ca-certs
- name: cloud-config-volume - name: cloud-config-volume
secret: secret:
secretName: external-openstack-cloud-config secretName: external-openstack-cloud-config