Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added heap size control and fixed a bug #16

Merged
merged 6 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions charts/geoserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
6 changes: 6 additions & 0 deletions charts/geoserver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions charts/geoserver/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -57,7 +59,7 @@ spec:
key: geoserver_admin_password
{{- end }}
ports:
- name: http
- name: geoserver
containerPort: 8080
protocol: TCP
volumeMounts:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/geoserver/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ metadata:
{{- include "geoserver.labels" . | nindent 4 }}
data:
geoserver_admin_password: {{ .Values.auth.password | b64enc | quote }}
{{- endif }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/geoserver/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 4 additions & 0 deletions charts/geoserver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down