upgrade geoserver-lb chart for extra volumes to be mounted

Author: jeanmi151

geoserver-lb/Chart.yaml

@@ -2,5 +2,5 @@ name: geoserver-lb
 apiVersion: v2
 description: A Helm chart for deploying geoserver loadbalanced
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "22.0.4"

geoserver-lb/templates/geoserver-deploy.yaml

@@ -10,7 +10,7 @@ spec:
   replicas: {{ .Values.geoserver.replicas }}
   selector:
     matchLabels:
-      {{- include "georchestra-geoserver.labels" . | nindent 6 }}
+      {{- include "georchestra-geoserver.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: {{ include "georchestra-geoserver.fullname" . }}-geoserver-slaves
   template:
     metadata:
@@ -51,6 +51,11 @@ spec:
         - name: geoserver-geodata
           persistentVolumeClaim:
             claimName: georchestra-geoserver-geodata
+        {{- range .Values.geoserver.extra_volumes }}
+        - name: {{ .name }}
+          persistentVolumeClaim:
+            claimName: {{ .claimName }}
+        {{- end }}
       {{- with .Values.geoserver.pull_secret }}
       imagePullSecrets:
       - name: {{ . }}
@@ -170,6 +175,10 @@ spec:
             name: geoserver-webapp
           - mountPath: /mnt/geoserver_tiles
             name: geoserver-tiles
+          {{- range .Values.geoserver.extra_volumes }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+          {{- end }}
       - name: geoserver-reload
         image: {{ .Values.geoserver.reloader.docker_image }}
         imagePullPolicy: IfNotPresent

geoserver-lb/templates/geoserver-lb-deploy.yaml

@@ -9,7 +9,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      {{- include "georchestra-geoserver.labels" . | nindent 6 }}
+      {{- include "georchestra-geoserver.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: {{ include "georchestra-geoserver.fullname" . }}-geoserver-lb
   template:
     metadata:
@@ -47,6 +47,10 @@ spec:
             mountPath: /var/cache/nginx
           - name: var-run
             mountPath: /var/run
+          {{- range .Values.geoserver.extra_volumes }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+          {{- end }}
           resources:
             requests:
               memory: "64Mi"
@@ -75,6 +79,12 @@ spec:
         emptyDir: {}
       - name: etc-nginx
         emptyDir: {}
+      {{- range .Values.geoserver.extra_volumes }}
+      - name: {{ .name }}
+        persistentVolumeClaim:
+          claimName: {{ .claimName }}
+      {{- end }}
+
 
 
 {{- end }}

geoserver-lb/templates/geoserver-lb-svc.yaml

@@ -10,7 +10,7 @@ spec:
     protocol: TCP
     targetPort: 8080
   selector:
-    {{- include "georchestra-geoserver.labels" . | nindent 4 }}
+    {{- include "georchestra-geoserver.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: {{ include "georchestra-geoserver.fullname" . }}-geoserver-lb
   sessionAffinity: None
   type: ClusterIP

geoserver-lb/templates/geoserver-svc.yaml

@@ -13,6 +13,6 @@ spec:
       protocol: TCP
       targetPort: 8080
   selector:
-    {{- include "georchestra-geoserver.labels" . | nindent 4 }}
+    {{- include "georchestra-geoserver.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: {{ include "georchestra-geoserver.fullname" . }}-geoserver-slaves
 {{- end -}}

geoserver-lb/values.yaml

@@ -13,6 +13,7 @@ geoserver:
     docker_image: python:3.9
     http_headers: "{ 'sec-username': 'superadmin', 'sec-roles': 'ROLE_ADMINISTRATOR', 'Accept': 'application/xml' }"
   extra_environment: []
+  extra_volumes: []
 
 gs_datadir_sync:
   # docker_pull_secret: dockerhub-registry-secret