add volumes and volume mounts

Author: leafty

deploy/csi-rclone/templates/_certificates-init-container.tpl

@@ -1,13 +1,17 @@
 {{- define "certificates.initContainer" -}}
-{{- $customCAsEnabled := .Values.global.certificates.customCAs -}}
+{{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
+{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
+
 - name: init-certificates
-  image: "{{ .Values.global.certificates.image.repository }}:{{ .Values.global.certificates.image.tag }}"
+  image: "{{ .Values.csiNodepluginRclone.certificates.image.repository }}:{{ .Values.csiNodepluginRclone.certificates.image.tag }}"
   securityContext:
     {{- toYaml .Values.securityContext | nindent 4 }}
   volumeMounts:
     - name: etc-ssl-certs
       mountPath: /etc/ssl/certs/
+    {{- if or $customCAsEnabled $customCAsForMountsEnabled -}}
     - name: custom-ca-certs
       mountPath: /usr/local/share/ca-certificates
       readOnly: true
+    {{- end -}}
 {{- end -}}

deploy/csi-rclone/templates/_certificates-volumes.tpl

@@ -1,28 +1,25 @@
 {{- define "certificatesForMounts.volumes" -}}
-{{- $customCAsEnabled := .Values.global.certificates.customCAs -}}
-{{- $customCAsForMountsEnabled := .Values.global.certificates.customCAsForDataConnectorMounts -}}
+{{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
+{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
 - name: etc-ssl-certs
   emptyDir:
     medium: "Memory"
+{{- if or $customCAsEnabled $customCAsForMountsEnabled -}}
 - name: custom-ca-certs
   projected:
     defaultMode: 0444
     sources:
-      - secret:
-          name: {{ include "renku.CASecretName" . }}
-          items:
-            - key: tls.crt
-              path: {{ include "renku.CASecretName" . }}-internal-communication-ca.crt
     {{- if $customCAsEnabled }}
-    {{- range $customCA := .Values.global.certificates.customCAs }}
+    {{- range $customCA := .Values.csiNodepluginRclone.certificates.customCAs }}
       - secret:
           name: {{ $customCA.secret }}
     {{- end -}}
     {{- end -}}
     {{- if $customCAsForMountsEnabled }}
-    {{- range $customCA := .Values.global.certificates.customCAsForDataConnectorMounts }}
+    {{- range $customCA := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts }}
       - secret:
           name: {{ $customCA.secret }}
     {{- end -}}
     {{- end -}}
 {{- end -}}
+{{- end -}}

deploy/csi-rclone/templates/csi-nodeplugin-rclone.yaml

@@ -20,6 +20,8 @@ spec:
     spec:
       serviceAccountName: {{ include "chart.fullname" . }}-nodeplugin
       dnsPolicy: ClusterFirstWithHostNet
+      initContainers:
+        {{- include "certificates.initContainer" . | nindent 8 }}
       containers:
       - name: node-driver-registrar
         args:
@@ -143,6 +145,7 @@ spec:
           name: pods-mount-dir
         - mountPath: /var/lib/rclone
           name: cache-dir
+        {{- include "certificates.volumeMounts.system" . | nindent 8 }}
     {{- with .Values.csiNodepluginRclone.nodeSelector }}
       nodeSelector:
         {{ toYaml . | nindent 8 }}
@@ -170,3 +173,4 @@ spec:
         name: registration-dir
       - name: cache-dir
         emptyDir: {}
+      {{- include "certificatesForMounts.volumes" . | nindent 6 }}

deploy/csi-rclone/values.yaml

@@ -47,7 +47,6 @@ csiControllerRclone:
       port: 9090
       pathPrefix: # /metrics
       pollPeriod: # 30s
-  
   replicas: 1
   serviceAccount:
     annotations: {}