From 6928221b5644f5840602b71a872f4d7670d1975f Mon Sep 17 00:00:00 2001 From: Arthur Darcet Date: Wed, 14 Jan 2026 13:18:00 +0100 Subject: [PATCH] In the PVC definition, skip the storageClassName attr if null/empty (#1498) Signed-off-by: Arthur Darcet Co-authored-by: majinghe <42570491+majinghe@users.noreply.github.com> Co-authored-by: houseme --- helm/rustfs/templates/pvc.yaml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/helm/rustfs/templates/pvc.yaml b/helm/rustfs/templates/pvc.yaml index 849da8f2..1942a685 100644 --- a/helm/rustfs/templates/pvc.yaml +++ b/helm/rustfs/templates/pvc.yaml @@ -1,32 +1,39 @@ {{- if .Values.mode.standalone.enabled }} +{{- with .Values.storageclass }} apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: helm.sh/resource-policy: keep - name: {{ include "rustfs.fullname" . }}-data + name: {{ include "rustfs.fullname" $ }}-data labels: - {{- toYaml .Values.commonLabels | nindent 4 }} + {{- toYaml $.Values.commonLabels | nindent 4 }} spec: - accessModes: ["ReadWriteOnce"] - storageClassName: {{ .Values.storageclass.name }} + accessModes: [ ReadWriteOnce ] + {{- with .name }} + storageClassName: {{ . }} + {{- end }} resources: requests: - storage: {{ .Values.storageclass.dataStorageSize }} + storage: {{ .dataStorageSize }} --- + apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: helm.sh/resource-policy: keep - name: {{ include "rustfs.fullname" . }}-logs + name: {{ include "rustfs.fullname" $ }}-logs labels: - {{- toYaml .Values.commonLabels | nindent 4 }} + {{- toYaml $.Values.commonLabels | nindent 4 }} spec: - accessModes: ["ReadWriteOnce"] - storageClassName: {{ .Values.storageclass.name }} + accessModes: [ ReadWriteOnce ] + {{- with .name }} + storageClassName: {{ . }} + {{- end }} resources: requests: - storage: {{ .Values.storageclass.logStorageSize }} + storage: {{ .logStorageSize }} +{{- end }} {{- end }}