[sophora-server]_ add extraVolumes and extraVolumeMounts (#118)

See ZUPUS-328 Co-authored-by: Sven Schliesing <[email protected]>
subshell · Sep 11, 2024 · c5f3fd8 · c5f3fd8
1 parent 8aa6385
commit c5f3fd8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/charts/sophora-server/Chart.yaml b/charts/sophora-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.3
+version: 2.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

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: