diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-03-03 10:59:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-03 10:59:28 -0800 |
| commit | 91a963190458f4ad7f677e8566d61ce42c4a4487 (patch) | |
| tree | d6b530e991340d8693c9ec428309550a7b5e3155 | |
| parent | d3221099bf2c82418c402eb29014b6ee0eedd511 (diff) | |
| download | seaweedfs-91a963190458f4ad7f677e8566d61ce42c4a4487.tar.xz seaweedfs-91a963190458f4ad7f677e8566d61ce42c4a4487.zip | |
Revert "Removed unused certificate mounts from helm chart" (#6597)
Revert "Removed unused certificate mounts from helm chart (#6581)"
This reverts commit 65b0a7cf83e78b2c24ca56377f8aac78d0fd3496.
| -rw-r--r-- | k8s/charts/seaweedfs/Chart.yaml | 2 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/filer-statefulset.yaml | 16 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/master-statefulset.yaml | 18 | ||||
| -rw-r--r-- | k8s/charts/seaweedfs/templates/volume-statefulset.yaml | 9 |
4 files changed, 40 insertions, 5 deletions
diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index 9d893a980..6f20d7a74 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/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 diff --git a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml b/k8s/charts/seaweedfs/templates/filer-statefulset.yaml index abbf89416..304d746d8 100644 --- a/k8s/charts/seaweedfs/templates/filer-statefulset.yaml +++ b/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: diff --git a/k8s/charts/seaweedfs/templates/master-statefulset.yaml b/k8s/charts/seaweedfs/templates/master-statefulset.yaml index 719895559..c46d37166 100644 --- a/k8s/charts/seaweedfs/templates/master-statefulset.yaml +++ b/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 }} diff --git a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml b/k8s/charts/seaweedfs/templates/volume-statefulset.yaml index 8cefe14c7..e915593a5 100644 --- a/k8s/charts/seaweedfs/templates/volume-statefulset.yaml +++ b/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: |