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

allow custom liveness startup probe for mapstore and geoserver #101

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
10 changes: 8 additions & 2 deletions templates/geoserver/geoserver-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,9 @@ spec:
ports:
- containerPort: 8080
name: http-proxy
{{- if $webapp.custom_liveness_probe }}
{{ $webapp.custom_liveness_probe | toYaml | nindent 8 }}
{{- if $webapp.livenessProbe }}
livenessProbe:
{{ $webapp.livenessProbe | toYaml | nindent 10 }}
{{- else }}
livenessProbe:
httpGet:
Expand All @@ -205,11 +206,16 @@ spec:
periodSeconds: 10
timeoutSeconds: 5
{{- end }}
{{- if $webapp.startupProbe }}
startupProbe:
{{ $webapp.startupProbe | toYaml | nindent 10 }}
{{- else }}
startupProbe:
tcpSocket:
port: 8080
failureThreshold: 5
periodSeconds: 40
{{- else }}
{{- if $webapp.jetty_monitoring }}
- name: jmx-collectd
image: camptocamp/jmx-collectd:bullseye
Expand Down
10 changes: 10 additions & 0 deletions templates/mapstore/mapstore-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,27 @@ spec:
lifecycle:
{{- toYaml . | nindent 10 }}
{{- end }}
{{- if $webapp.livenessProbe }}
livenessProbe:
{{ $webapp.livenessProbe | toYaml | nindent 10 }}
{{- else }}
livenessProbe:
httpGet:
path: /mapstore/configs/config.json
port: 8080
periodSeconds: 10
{{- end }}
{{- if $webapp.startupProbe }}
startupProbe:
{{ $webapp.startupProbe | toYaml | nindent 10 }}
{{- else }}
startupProbe:
httpGet:
path: /mapstore/configs/config.json
port: 8080
failureThreshold: 5
periodSeconds: 15
{{- end }}
volumes:
- name: georchestra-datadir
emptyDir: {}
Expand Down
2 changes: 2 additions & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ georchestra:
geoserver:
enabled: true
replicaCount: "1"
livenessProbe: []
startupProbe: []
docker_image: georchestra/geoserver:latest
jetty_monitoring: false
extra_environment: []
Expand Down
Loading