Added heap size control and fixed a bug (#16)

* Added heap size control and fixed a bug * renamed port name to geoserver from http * Updated changelog in README file * update chart values --------- Co-authored-by: Rob Kooper <[email protected]>
ncsa · Dec 6, 2023 · 686414e · 686414e
1 parent 1bc100a
commit 686414e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/charts/geoserver/Chart.yaml b/charts/geoserver/Chart.yaml
@@ -10,7 +10,7 @@ description: An open source server for sharing geospatial data.
 # 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: 1.0.0
+version: 1.1.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
@@ -35,4 +35,6 @@ annotations:
     - name: Helm Chart
       url: https://github.com/ncsa/charts
   artifacthub.io/changes: |
-    - Initial release of helm chart
+    - Added extra configuration option for setting Java memory heap size.
+    - Fixed bugs in the chart
+    - Port name changed to 'geoserver' from 'http'
diff --git a/charts/geoserver/README.md b/charts/geoserver/README.md
@@ -91,6 +91,12 @@ $ helm install --set persistence.existingClaim=PVC_NAME geoserver
 
 ## ChangeLog
 
+### 1.1.0
+
+- Added extra configuration option for setting Java memory heap size.
+- Fixed bugs in the chart
+- Port name changed to 'geoserver' from 'http'
+
 ### 1.0.0
 
 - Initial release of helm chart

diff --git a/charts/geoserver/templates/deployment.yaml b/charts/geoserver/templates/deployment.yaml
@@ -40,10 +40,12 @@ spec:
               value: {{ .Values.extension.stableExtension | quote }}
             - name: CORS_ENABLED
               value: {{ .Values.cors.enabled | quote }}
-            - name: SKIP_DEMO_DATA
-              values: {{ .Values.demoData.skip | quote }}
             - name: GEOSERVER_CSRF_WHITELIST
-              values: {{ .Values.geoserver.whitelist | quote }}
+              value: {{ .Values.whitelist | quote }}
+            - name: SKIP_DEMO_DATA
+              value: {{ .Values.demoData.skip | quote }}
+            - name: EXTRA_JAVA_OPTS
+              value: {{ .Values.envs.extraJavaOpts | quote }}
             - name: GEOSERVER_ADMIN_USER
               value: admin
             - name: GEOSERVER_ADMIN_PASSWORD
@@ -57,7 +59,7 @@ spec:
                   key: geoserver_admin_password
                   {{- end }}
           ports:
-            - name: http
+            - name: geoserver
               containerPort: 8080
               protocol: TCP
           volumeMounts:
@@ -66,17 +68,17 @@ spec:
           startupProbe:
             httpGet:
               path: /geoserver/web
-              port: http
+              port: geoserver
             failureThreshold: {{ .Values.startup.failureThreshold }}
             periodSeconds: {{ .Values.startup.periodSeconds }}
           livenessProbe:
             httpGet:
               path: /geoserver/web
-              port: http
+              port: geoserver
           readinessProbe:
             httpGet:
               path: /geoserver/web
-              port: http
+              port: geoserver
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/charts/geoserver/templates/secrets.yaml b/charts/geoserver/templates/secrets.yaml
@@ -7,4 +7,4 @@ metadata:
     {{- include "geoserver.labels" . | nindent 4 }}
 data:
   geoserver_admin_password: {{ .Values.auth.password | b64enc | quote }}
-{{- endif }}
+{{- end }}
diff --git a/charts/geoserver/templates/service.yaml b/charts/geoserver/templates/service.yaml
@@ -8,8 +8,8 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: geoserver
       protocol: TCP
-      name: http
+      name: geoserver
   selector:
     {{- include "geoserver.selectorLabels" . | nindent 4 }}
diff --git a/charts/geoserver/values.yaml b/charts/geoserver/values.yaml
@@ -44,6 +44,10 @@ persistence:
 # the values should be only url without http:// or https://, like "geoserver.example.com"
 whitelist: ""
 
+# the following is for the geoserver java memory heap size control
+envs:
+  extraJavaOpts: "-Xms512m -Xmx2g"
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true