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

add a way to configure tolerations for multinode support #110

Merged
merged 1 commit into from
Sep 4, 2024
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
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# 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.2.0
version: 1.2.1

# 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 Down
4 changes: 4 additions & 0 deletions templates/analytics/analytics-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/cas/cas-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/console/console-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/datafeeder/datafeeder-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/datafeeder/import-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/gateway/gateway-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/geonetwork/elasticsearch/es-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,9 @@ spec:
- name: gn4-es-data
persistentVolumeClaim:
claimName: {{ include "georchestra.fullname" . }}-gn4-es-data
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

4 changes: 4 additions & 0 deletions templates/geonetwork/geonetwork-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/geonetwork/kibana/kibana-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ spec:
- name: gn4-kibana-config
configMap:
name: {{ include "georchestra.fullname" . }}-gn4-kibana-config
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,8 @@ spec:
secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
defaultMode: 0400
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end -}}
4 changes: 4 additions & 0 deletions templates/geoserver/geoserver-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -256,4 +256,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/geowebcache/geowebcache-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/header/header-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,9 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

5 changes: 4 additions & 1 deletion templates/ldap/openldap-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}

{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/mapstore/mapstore-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,9 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}

4 changes: 4 additions & 0 deletions templates/security-proxy/security-proxy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,8 @@ spec:
imagePullSecrets:
- name: {{ $webapp.registry_secret }}
{{- end }}
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions templates/smtp-smarthost/smtp-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,8 @@ spec:
tcpSocket:
port: smtp
initialDelaySeconds: 30
{{- if $webapp.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end -}}
16 changes: 16 additions & 0 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ georchestra:
# registry_secret: default
service:
annotations: {}
tolerations: []
cas:
enabled: true
replicaCount: "1"
Expand All @@ -29,6 +30,7 @@ georchestra:
# registry_secret: default
service:
annotations: {}
tolerations: []
console:
enabled: true
replicaCount: "1"
Expand All @@ -38,6 +40,7 @@ georchestra:
# registry_secret: default
service:
annotations: {}
tolerations: []
datafeeder:
enabled: true # won't deploy if datafeeder_frontend is not enable
replicaCount: "1"
Expand All @@ -52,6 +55,7 @@ georchestra:
enabled: true
service:
annotations: {}
tolerations: []
datafeeder_frontend:
# Matches datafeeder/import-xxx.yaml templates in the helm chart
enabled: true # won't deploy if datafeeder is not enable
Expand All @@ -62,6 +66,7 @@ georchestra:
# registry_secret: default
service:
annotations: {}
tolerations: []
geonetwork:
enabled: true
replicaCount: "1"
Expand All @@ -77,6 +82,7 @@ georchestra:
# container extra volume. It should match an item from the extra_volumes.name
# variable above.
extra_volumeMounts: []
tolerations: []
ogc_api_records:
enabled: true
replicaCount: "1"
Expand All @@ -86,6 +92,7 @@ georchestra:
enabled: true
service:
annotations: {}
tolerations: []
elasticsearch:
replicaCount: "1"
resources:
Expand All @@ -96,11 +103,13 @@ georchestra:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.21
service:
annotations: {}
tolerations: []
kibana:
replicaCount: "1"
image: docker.elastic.co/kibana/kibana:7.15.1
service:
annotations: {}
tolerations: []
# automatically clean some logs of geonetwork
housekeeping:
harvester_logs:
Expand All @@ -121,6 +130,7 @@ georchestra:
# container extra volume. It should match an item from the extra_volumes.name
# variable above.
extra_volumeMounts: []
tolerations: []
# registry_secret: default
service:
annotations: {}
Expand All @@ -131,13 +141,15 @@ georchestra:
enabled: true
docker_image: georchestra/geowebcache:latest
extra_environment: []
tolerations: []
service:
annotations: {}
header:
enabled: true
replicaCount: "1"
docker_image: georchestra/header:latest
extra_environment: []
tolerations: []
# registry_secret: default
service:
annotations: {}
Expand All @@ -148,6 +160,7 @@ georchestra:
# registry_secret: default
# no need to put the original command already managed
extra_environment: []
tolerations: []
command: []
args: []
lifecycle: {}
Expand All @@ -169,6 +182,7 @@ georchestra:
# registry_secret: default
service:
annotations: {}
tolerations: []
proxy:
enabled: false
replicaCount: "1"
Expand All @@ -180,6 +194,7 @@ georchestra:
enabled: true
service:
annotations: {}
tolerations: []
gateway:
enabled: true
replicaCount: "1"
Expand All @@ -189,6 +204,7 @@ georchestra:
extra_environment: []
service:
annotations: {}
tolerations: []
datadir:
volume:
- name: georchestra-datadir
Expand Down
Loading