In the PVC definition, skip the storageClassName attr if null/empty (#1498)

Signed-off-by: Arthur Darcet <[email protected]> Co-authored-by: majinghe <[email protected]> Co-authored-by: houseme <[email protected]>
2026-01-14 20:18:00 +08:00
parent 2d58eea702
commit 6928221b56
1 changed files with 17 additions and 10 deletions
@@ -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 }}