address review

Author: leafty

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

@@ -1,12 +1,11 @@
 {{- define "csiRcloneCertificates.initContainer" -}}
 {{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
-{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
 - name: init-certificates
   image: "{{ .Values.csiNodepluginRclone.certificates.image.repository }}:{{ .Values.csiNodepluginRclone.certificates.image.tag }}"
   volumeMounts:
     - name: etc-ssl-certs
       mountPath: /etc/ssl/certs/
-    {{- if or $customCAsEnabled $customCAsForMountsEnabled }}
+    {{- if $customCAsEnabled }}
     - name: custom-ca-certs
       mountPath: /usr/local/share/ca-certificates
       readOnly: true

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

@@ -1,10 +1,9 @@
 {{- define "csiRcloneCertificatesForMounts.volumes" -}}
 {{- $customCAsEnabled := .Values.csiNodepluginRclone.certificates.customCAs -}}
-{{- $customCAsForMountsEnabled := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts -}}
 - name: etc-ssl-certs
   emptyDir:
     medium: "Memory"
-{{- if or $customCAsEnabled $customCAsForMountsEnabled }}
+{{- if $customCAsEnabled }}
 - name: custom-ca-certs
   projected:
     defaultMode: 0444
@@ -15,11 +14,5 @@
           name: {{ $customCA.secret }}
     {{- end -}}
     {{- end -}}
-    {{- if $customCAsForMountsEnabled }}
-    {{- range $customCA := .Values.csiNodepluginRclone.certificates.customCAsForDataConnectorMounts }}
-      - secret:
-          name: {{ $customCA.secret }}
-    {{- end -}}
-    {{- end -}}
 {{- end -}}
 {{- end -}}

deploy/csi-rclone/values.yaml

@@ -117,8 +117,6 @@ csiNodepluginRclone:
       tag: "0.0.2"
     customCAs: []
     # - secret:
-    customCAsForDataConnectorMounts: []
-    # - secret:
   serviceAccount:
     annotations: {}
   nodeSelector: {}