feat(manila-csi): allow cluster-id to be pulled from env variables

Signed-off-by: Jack Charlie Munday <jack.charlie.munday@cern.ch>

Author: Jack Charlie Munday

charts/manila-csi-plugin/templates/controllerplugin-statefulset.yaml

@@ -101,7 +101,7 @@ spec:
             {{- if .compatibilitySettings }}
             --compatibility-settings={{ .compatibilitySettings }}
             {{- end }}
-            --cluster-id="{{ $.Values.csimanila.clusterID }}"
+            --cluster-id=$(CLUSTER_NAME)
             {{- if $.Values.csimanila.pvcAnnotations }}
             --pvc-annotations
             {{- end }}'
@@ -115,9 +115,17 @@ spec:
               value: "unix://{{ .fwdNodePluginEndpoint.dir }}/{{ .fwdNodePluginEndpoint.sockFile }}"
             - name: MANILA_SHARE_PROTO
               value: "{{ .protocolSelector }}"
+            {{- if $.Values.csimanila.clusterID }}
+            - name: CLUSTER_NAME
+              value: {{ $.Values.csimanila.clusterID }}
+            {{- end }}
             {{- if $.Values.controllerplugin.nodeplugin.extraEnv }}
               {{- toYaml $.Values.controllerplugin.nodeplugin.extraEnv | nindent 12 }}
             {{- end }}
+          {{- with $.Values.controllerplugin.nodeplugin.envFrom }}
+          envFrom:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
           imagePullPolicy: {{ $.Values.csimanila.image.pullPolicy }}
           volumeMounts:
             - name: {{ .protocolSelector | lower }}-plugin-dir

charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml

@@ -62,7 +62,7 @@ spec:
             --drivername=$(DRIVER_NAME)
             --share-protocol-selector=$(MANILA_SHARE_PROTO)
             --fwdendpoint=$(FWD_CSI_ENDPOINT)
-            --cluster-id="{{ $.Values.csimanila.clusterID }}"'
+            --cluster-id=$(CLUSTER_NAME)'
           ]
           env:
             - name: DRIVER_NAME
@@ -73,6 +73,10 @@ spec:
               value: "unix://{{ .fwdNodePluginEndpoint.dir }}/{{ .fwdNodePluginEndpoint.sockFile }}"
             - name: MANILA_SHARE_PROTO
               value: "{{ .protocolSelector }}"
+            {{- if $.Values.csimanila.clusterID }}
+            - name: CLUSTER_NAME
+              value: "{{ $.Values.csimanila.clusterID }}"
+            {{- end }}
             {{- if $.Values.nodeplugin.nodeplugin.extraEnv }}
               {{- toYaml $.Values.nodeplugin.nodeplugin.extraEnv | nindent 12 }}
             {{- end }}