From 989905aa9f59733a7a37c28578dc7cc1b043332a Mon Sep 17 00:00:00 2001 From: Toby Jackson Date: Thu, 4 Nov 2021 21:18:25 +0000 Subject: [PATCH] helm: csiplugin-configmap generates invalid configuation When generating csiconfiguration from values the config.json key gets merged with cluster-mapping.json as the config.json toYaml element supresses a newline. This fixes the situation where configuration is generated as shown; ``` data: config.json: |- [{"clusterID":"....","monitors":["..."]}]cluster-mapping.json: |- [] ``` Signed-off-by: Toby Jackson --- charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml index 3cec53e6e..f0944027e 100644 --- a/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml +++ b/charts/ceph-csi-rbd/templates/csiplugin-configmap.yaml @@ -12,7 +12,7 @@ metadata: heritage: {{ .Release.Service }} data: config.json: |- -{{ toJson .Values.csiConfig | indent 4 -}} +{{ toJson .Values.csiConfig | indent 4 }} cluster-mapping.json: |- -{{ toJson .Values.csiMapping | indent 4 -}} +{{ toJson .Values.csiMapping | indent 4 }} {{- end }}