Merge pull request #50 from GDATASoftwareAG/49-allow-the-scan-socket-…

…volume-to-be-moved-into-memory-andor-persistent-volume-storage let the customer select some settings for the volumes
GDATASoftwareAG · Jul 2, 2024 · eff1540 · eff1540
2 parents c841e26 + 42514bb
commit eff1540
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 1 deletion.
diff --git a/charts/gdscan/Chart.yaml b/charts/gdscan/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
   - name: G DATA CyberDefense AG
     email: [email protected]
 type: application
-version: 1.9.1
+version: 1.9.2
diff --git a/charts/gdscan/templates/deployment.yaml b/charts/gdscan/templates/deployment.yaml
@@ -48,7 +48,14 @@ spec:
           emptyDir: {}
           {{- end }}
         - name: scan-socket
+          {{- if or (.Values.scanSocketFolder.inmemory) }}
+          emptyDir:
+            {{- if .Values.scanSocketFolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
         - name: client-tmp
           {{- if or (.Values.client.tempfolder.inmemory) (.Values.client.tempfolder.sizeLimit.enabled) }}
           emptyDir:
@@ -62,7 +69,17 @@ spec:
           emptyDir: {}
           {{- end }}
         - name: server-var-log
+          {{- if or (.Values.server.logFolder.inmemory) (.Values.server.logFolder.sizeLimit.enabled) }}
+          emptyDir:
+            {{- if .Values.server.logFolder.sizeLimit.enabled }}
+            sizeLimit: {{ .Values.server.logFolder.sizeLimit.size | quote }}
+            {{- end }}
+            {{- if .Values.server.logFolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
       {{- include "gdscan.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: {{ .Values.server.name }}

diff --git a/charts/gdscan/templates/stateful-set.yaml b/charts/gdscan/templates/stateful-set.yaml
@@ -34,13 +34,50 @@ spec:
       {{- include "gdscan.imagePullSecrets" . | nindent 6 }}
       volumes:
         - name: server-tmp
+          {{- if or (.Values.server.tempfolder.inmemory) (.Values.server.tempfolder.sizeLimit.enabled) }}
+          emptyDir:
+            {{- if .Values.server.tempfolder.sizeLimit.enabled }}
+            sizeLimit: {{ .Values.server.tempfolder.sizeLimit.size | quote }}
+            {{- end }}
+            {{- if .Values.server.tempfolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
         - name: scan-socket
+          {{- if or (.Values.scanSocketFolder.inmemory) (.Values.scanSocketFolder.sizeLimit.enabled) }}
+          emptyDir:
+            {{- if .Values.scanSocketFolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
         - name: client-tmp
+          {{- if or (.Values.client.tempfolder.inmemory) (.Values.client.tempfolder.sizeLimit.enabled) }}
+          emptyDir:
+            {{- if .Values.client.tempfolder.sizeLimit.enabled }}
+            sizeLimit: {{ .Values.client.tempfolder.sizeLimit.size | quote }}
+            {{- end }}
+            {{- if .Values.client.tempfolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
         - name: server-var-log
+          {{- if or (.Values.server.logFolder.inmemory) (.Values.server.logFolder.sizeLimit.enabled) }}
+          emptyDir:
+            {{- if .Values.server.logFolder.sizeLimit.enabled }}
+            sizeLimit: {{ .Values.server.logFolder.sizeLimit.size | quote }}
+            {{- end }}
+            {{- if .Values.server.logFolder.inmemory }}
+            medium : "Memory"
+            {{- end }}
+          {{- else }}
           emptyDir: {}
+          {{- end }}
       containers:
         - name: {{ .Values.server.name }}
           env:

diff --git a/charts/gdscan/values.yaml b/charts/gdscan/values.yaml
@@ -1,5 +1,7 @@
 replicaCount: 1
 deploymentStrategy: "Recreate"
+scanSocketFolder:
+  inmemory: false
 server:
   name: server
   image:
@@ -11,6 +13,11 @@ server:
     sizeLimit:
       enabled: false
       size: 1Gi
+  logFolder:
+    inmemory: false
+    sizeLimit:
+      enabled: false
+      size: 1Gi
   containerSecurityContext:
     enabled: true
     readOnlyRootFilesystem: true