Revert "Removed unused certificate mounts from helm chart" (#6597)

Revert "Removed unused certificate mounts from helm chart (#6581)"

This reverts commit 65b0a7cf83.

k8s/charts/seaweedfs/Chart.yaml

@@ -3,4 +3,4 @@ description: SeaweedFS
 name: seaweedfs
 appVersion: "3.85"
 # Dev note: Trigger a helm chart release by `git tag -a helm-<version>`
-version: 4.0.386
+version: 4.0.385

k8s/charts/seaweedfs/templates/filer-statefulset.yaml

@@ -248,15 +248,19 @@ spec:
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
+            - name: master-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/master/
+            - name: volume-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/volume/
             - name: filer-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/filer/
-            {{- if .Values.filer.s3.enabled }}
             - name: client-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/client/
             {{- end }}
-            {{- end }}
             {{ tpl .Values.filer.extraVolumeMounts . | nindent 12 | trim }}
           ports:
             - containerPort: {{ .Values.filer.port }}
@@ -363,15 +367,19 @@ spec:
         - name: ca-cert
           secret:
             secretName: {{ template "seaweedfs.name" . }}-ca-cert
+        - name: master-cert
+          secret:
+            secretName: {{ template "seaweedfs.name" . }}-master-cert
+        - name: volume-cert
+          secret:
+            secretName: {{ template "seaweedfs.name" . }}-volume-cert
         - name: filer-cert
           secret:
             secretName: {{ template "seaweedfs.name" . }}-filer-cert
-        {{- if .Values.filer.s3.enabled }}
         - name: client-cert
           secret:
             secretName: {{ template "seaweedfs.name" . }}-client-cert
         {{- end }}
-        {{- end }}
         {{ tpl .Values.filer.extraVolumes . | indent 8 | trim }}
       {{- if .Values.filer.nodeSelector }}
       nodeSelector:

k8s/charts/seaweedfs/templates/master-statefulset.yaml

@@ -191,6 +191,15 @@ spec:
             - name: master-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/master/
+            - name: volume-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/volume/
+            - name: filer-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/filer/
+            - name: client-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/client/
             {{- end }}
             {{ tpl .Values.master.extraVolumeMounts . | nindent 12 | trim }}
           ports:
@@ -280,6 +289,15 @@ spec:
         - name: master-cert
           secret:
             secretName: {{ template "seaweedfs.name" . }}-master-cert
+        - name: volume-cert
+          secret:
+            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+        - name: filer-cert
+          secret:
+            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+        - name: client-cert
+          secret:
+            secretName: {{ template "seaweedfs.name" . }}-client-cert
         {{- end }}
         {{ tpl .Values.master.extraVolumes . | indent 8 | trim }}
       {{- if .Values.master.nodeSelector }}

k8s/charts/seaweedfs/templates/volume-statefulset.yaml

@@ -207,9 +207,18 @@ spec:
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
+            - name: master-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/master/
             - name: volume-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/volume/
+            - name: filer-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/filer/
+            - name: client-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/client/
             {{- end }}
             {{ tpl .Values.volume.extraVolumeMounts . | nindent 12 | trim }}
           ports: