mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-22 14:20:19 +00:00
Support externally managed configmap.
https://github.com/ceph/ceph-csi/issues/927
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
(cherry picked from commit d4c4954c9d
)
This commit is contained in:
parent
1a8f8e3c24
commit
6f73d4e3ca
@ -1,3 +1,4 @@
|
|||||||
|
{{- if not .Values.externallyManagedConfigmap }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
@ -12,3 +13,4 @@ metadata:
|
|||||||
data:
|
data:
|
||||||
config.json: |-
|
config.json: |-
|
||||||
{{ toJson .Values.csiConfig | indent 4 -}}
|
{{ toJson .Values.csiConfig | indent 4 -}}
|
||||||
|
{{- end }}
|
||||||
|
@ -190,6 +190,11 @@ spec:
|
|||||||
- name: ceph-csi-config
|
- name: ceph-csi-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.configMapName | quote }}
|
name: {{ .Values.configMapName | quote }}
|
||||||
|
{{- if .Values.configMapKey }}
|
||||||
|
items:
|
||||||
|
- key: {{ .Values.configMapKey | quote }}
|
||||||
|
path: config.json
|
||||||
|
{{- end }}
|
||||||
- name: keys-tmp-dir
|
- name: keys-tmp-dir
|
||||||
emptyDir: {
|
emptyDir: {
|
||||||
medium: "Memory"
|
medium: "Memory"
|
||||||
|
@ -176,6 +176,11 @@ spec:
|
|||||||
- name: ceph-csi-config
|
- name: ceph-csi-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.configMapName | quote }}
|
name: {{ .Values.configMapName | quote }}
|
||||||
|
{{- if .Values.configMapKey }}
|
||||||
|
items:
|
||||||
|
- key: {{ .Values.configMapKey | quote }}
|
||||||
|
path: config.json
|
||||||
|
{{- end }}
|
||||||
- name: keys-tmp-dir
|
- name: keys-tmp-dir
|
||||||
emptyDir: {
|
emptyDir: {
|
||||||
medium: "Memory"
|
medium: "Memory"
|
||||||
|
@ -195,3 +195,7 @@ pluginDir: /var/lib/kubelet/plugins
|
|||||||
driverName: cephfs.csi.ceph.com
|
driverName: cephfs.csi.ceph.com
|
||||||
# Name of the configmap used for state
|
# Name of the configmap used for state
|
||||||
configMapName: ceph-csi-config-cephfs
|
configMapName: ceph-csi-config-cephfs
|
||||||
|
# Key to use in the Configmap if not config.json
|
||||||
|
# configMapKey:
|
||||||
|
# Use an externally provided configmap
|
||||||
|
externallyManagedConfigmap: false
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
{{- if not .Values.externallyManagedConfigmap }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
@ -12,3 +13,4 @@ metadata:
|
|||||||
data:
|
data:
|
||||||
config.json: |-
|
config.json: |-
|
||||||
{{ toJson .Values.csiConfig | indent 4 -}}
|
{{ toJson .Values.csiConfig | indent 4 -}}
|
||||||
|
{{- end }}
|
||||||
|
@ -189,6 +189,11 @@ spec:
|
|||||||
- name: ceph-csi-config
|
- name: ceph-csi-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.configMapName | quote }}
|
name: {{ .Values.configMapName | quote }}
|
||||||
|
{{- if .Values.configMapKey }}
|
||||||
|
items:
|
||||||
|
- key: {{ .Values.configMapKey | quote }}
|
||||||
|
path: config.json
|
||||||
|
{{- end }}
|
||||||
- name: ceph-csi-encryption-kms-config
|
- name: ceph-csi-encryption-kms-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.kmsConfigMapName | quote }}
|
name: {{ .Values.kmsConfigMapName | quote }}
|
||||||
|
@ -193,6 +193,11 @@ spec:
|
|||||||
- name: ceph-csi-config
|
- name: ceph-csi-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.configMapName | quote }}
|
name: {{ .Values.configMapName | quote }}
|
||||||
|
{{- if .Values.configMapKey }}
|
||||||
|
items:
|
||||||
|
- key: {{ .Values.configMapKey | quote }}
|
||||||
|
path: config.json
|
||||||
|
{{- end }}
|
||||||
- name: ceph-csi-encryption-kms-config
|
- name: ceph-csi-encryption-kms-config
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ .Values.kmsConfigMapName | quote }}
|
name: {{ .Values.kmsConfigMapName | quote }}
|
||||||
|
@ -212,5 +212,9 @@ pluginDir: /var/lib/kubelet/plugins
|
|||||||
driverName: rbd.csi.ceph.com
|
driverName: rbd.csi.ceph.com
|
||||||
# Name of the configmap used for state
|
# Name of the configmap used for state
|
||||||
configMapName: ceph-csi-config-rbd
|
configMapName: ceph-csi-config-rbd
|
||||||
|
# Key to use in the Configmap if not config.json
|
||||||
|
# configMapKey:
|
||||||
|
# Use an externally provided configmap
|
||||||
|
externallyManagedConfigmap: false
|
||||||
# Name of the configmap used for encryption kms configuration
|
# Name of the configmap used for encryption kms configuration
|
||||||
kmsConfigMapName: ceph-csi-encryption-kms-config
|
kmsConfigMapName: ceph-csi-encryption-kms-config
|
||||||
|
Loading…
Reference in New Issue
Block a user