Define extravolumes and init containers in values.yaml

charts/geoserver/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: geoserver
 description: Helm chart for GeoServer
 icon: https://geoserver.org/img/uploads/geoserver_icon.png
-version: 2.1.0
-appVersion: 2.24.1
+version: 3.0.0
+appVersion: 2.24.2

charts/geoserver/templates/configmap.yaml

@@ -1,9 +1,15 @@
+{{-if .Values.initData.enabled}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "geoserver.fullname" . }}
+  name: geoserver-init-configmap
   labels:
 {{ include "geoserver.labels" . | indent 4 }}
+
+äölm,dsafölm,
+
+TODO: allow secrets
+
 data:
   init-data.sh: |-
     #!/bin/sh
@@ -27,3 +33,27 @@ data:
       eval $CMD
       echo "Successfully extracted geoserver_data directory to '{{ .Values.storage.dataDir }}'!"
     fi
+  init-community-modules.sh: |-
+    #!/bin/sh
+    echo "Checking if geoserver_data is already initialized…"
+    FILE={{ .Values.storage.dataDir }}/.community_modules_loaded
+    if [ -f "$FILE" ]; then
+      echo "Directory geoserver_data already initialized."
+    else
+      echo "Downloading geoserver_data.tgz …"
+      CMD="wget -q -O /mnt/download/geoserver_data.tgz '{{ .Values.storage.initDataUrl }}'"
+      echo $CMD
+      eval $CMD
+      CMD="cd {{ .Values.storage.dataDir }}"
+      echo $CMD
+      eval $CMD
+      CMD="tar -zxf /mnt/download/geoserver_data.tgz --strip 1 -k"
+      echo $CMD
+      eval $CMD
+      CMD="touch $FILE"
+      echo $CMD
+      eval $CMD
+      echo "Successfully extracted geoserver_data directory to '{{ .Values.storage.dataDir }}'!"
+    fi
+{{-end}}
+

charts/geoserver/templates/statefulset.yaml

@@ -22,17 +22,8 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
       initContainers:
-        {{- if and .Values.storage.initDataUrl }}
-        - name: download-data
-          image: alpine
-          command: ["/bin/sh","/mnt/init-data.sh"]
-          volumeMounts:
-            - name: temp
-              mountPath: /mnt/download
-            - name: init-configmap
-              mountPath: /mnt/
-            - name: datadir
-              mountPath: {{ .Values.storage.dataDir }}
+        {{- if .Values.initContainers }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
       containers:
         - name: {{ .Chart.Name }}
@@ -75,17 +66,12 @@ spec:
               mountPath: {{ .Values.storage.dataDir }}
             - name: additional-libs
               mountPath: {{ .Values.storage.additionalLibsDir }}
+            {{- if .Values.extraVolumeMounts }}
+            {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
+            {{- end }}
       volumes:
-        - name: temp
-          emptyDir: {}
         - name: additional-libs
           emptyDir: {}
-        - name: init-configmap
-          configMap:
-            name: {{ include "geoserver.fullname" . }}
-            items:
-              - key: init-data.sh
-                path: init-data.sh
         {{- if and .Values.persistence.enabled (not .Values.persistence.useExisting) }}
         - name: datadir
           persistentVolumeClaim:
@@ -98,3 +84,6 @@ spec:
         - name: datadir
           emptyDir: {}
         {{- end }}
+        {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- end }}

charts/geoserver/values.yaml

@@ -31,8 +31,7 @@ resources:
   limits:
     memory: 2500Mi
   requests:
-    cpu: 500m
-    memory: 1500Mi
+    memory: 1250Mi
 
 nodeSelector: {}
 
@@ -49,7 +48,48 @@ environment:
 storage:
   dataDir: /opt/geoserver_data
   additionalLibsDir: /opt/additional_libs
-  # initDataUrl: https://files.example.com/geoserver_data.tgz
+
+initData:
+  enabled: false
+  initDataUrl: https://files.example.com/geoserver_data.tgz
+  secret: my-secret
+
+# init container config (can be used to add community modules or initial datasets)
+initContainers:
+  - name: init-data-directory
+    image: docker.terrestris.de/alpine
+    command: [ "/bin/sh", "/mnt/init-data.sh" ]
+    volumeMounts:
+      - name: temp
+        mountPath: /mnt/download
+      - name: init-configmap
+        mountPath: /mnt/
+      - name: datadir
+        mountPath: /opt/geoserver_data
+  - name: init-community-modules
+    image: docker.terrestris.de/alpine
+    command: [ "/bin/sh","/mnt/init-community-modules.sh" ]
+    volumeMounts:
+      - name: temp
+        mountPath: /mnt/download
+      - name: init-configmap
+        mountPath: /mnt/
+      - name: additional_libs_dir
+        mountPath:  /opt/additional_libs
+extraVolumes:
+  - name: temp
+    emptyDir: {}
+  - name: init-configmap
+    configMap:
+      name: geoserver-init-configmap
+      items:
+        - key: init-data.sh
+          path: init-data.sh
+        - key: init-community-modules.sh
+          path: init-community-modules.sh
+extraVolumeMounts:
+  - name: providers
+    mountPath: /opt/bitnami/keycloak/providers
 
 # optional existing pvc for persistent geoserver data
 persistence: