[sophora-server] add extraVolumes and extraVolumeMounts

See ZUPUS-328
subshell · Sep 10, 2024 · 1580f56 · 1580f56
1 parent 8aa6385
commit 1580f56
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/charts/sophora-server/templates/statefulset.yaml b/charts/sophora-server/templates/statefulset.yaml
@@ -226,6 +226,10 @@ spec:
             - name: tools
               mountPath: "/tools"
             {{- end }}
+
+            {{- with .Values.extraVolumeMounts}}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           env:
             - name: JDK_JAVA_OPTIONS
               value: >-
@@ -396,6 +400,10 @@ spec:
           configMap:
             name: {{ include "sophora-server.archiveConfigName" . }}
         {{- end }}
+
+        {{- with .Values.extraVolumes}}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
   volumeClaimTemplates:
     - metadata:
         name: sophora-server-storage
@@ -418,4 +426,4 @@ spec:
         storageClassName: {{ .Values.sophora.server.storage.storageClass }}
     {{- if .Values.extraVolumeClaimTemplates }}
     {{ include "common.tplvalues.render" (dict "value" .Values.extraVolumeClaimTemplates "context" $) | nindent 4 }}
-    {{- end }}
+    {{- end }}
diff --git a/charts/sophora-server/test-values.yaml b/charts/sophora-server/test-values.yaml
@@ -179,6 +179,16 @@ extraVolumeClaimTemplates:
           storage: 2Gi
       storageClassName: "premium"
 
+extraVolumeMounts:
+  - mountPath: /foo
+    name: bar
+    subPath: baz
+
+extraVolumes:
+  - name: bar
+    persistentVolumeClaim:
+      claimName: bar
+
 resources:
   requests:
     memory: "12G"

diff --git a/charts/sophora-server/values.yaml b/charts/sophora-server/values.yaml
@@ -81,6 +81,9 @@ extraContainers: []
 extraInitContainers: []
 extraVolumeClaimTemplates: []
 
+extraVolumes: []
+extraVolumeMounts: []
+
 sophora:
   server:
     ports: