Skip to content

Commit a7b4e47

Browse files
jeanmi151jeanmi151
committed
add a way to configure tolerations for multinode support
1 parent f165387 commit a7b4e47

19 files changed

+85
-2
lines changed

‎Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.2.0
18+
version: 1.2.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎templates/analytics/analytics-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ spec:
6565
imagePullSecrets:
6666
- name: {{ $webapp.registry_secret }}
6767
{{- end }}
68+
{{- if $webapp.tolerations }}
69+
tolerations:
70+
{{- toYaml . | nindent 8 }}
71+
{{- end }}
6872
{{- end }}

‎templates/cas/cas-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,8 @@ spec:
6767
imagePullSecrets:
6868
- name: {{ $webapp.registry_secret }}
6969
{{- end }}
70+
{{- if $webapp.tolerations }}
71+
tolerations:
72+
{{- toYaml . | nindent 8 }}
73+
{{- end }}
7074
{{- end }}

‎templates/console/console-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,8 @@ spec:
7474
imagePullSecrets:
7575
- name: {{ $webapp.registry_secret }}
7676
{{- end }}
77+
{{- if $webapp.tolerations }}
78+
tolerations:
79+
{{- toYaml . | nindent 8 }}
80+
{{- end }}
7781
{{- end }}

‎templates/datafeeder/datafeeder-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,8 @@ spec:
124124
imagePullSecrets:
125125
- name: {{ $webapp.registry_secret }}
126126
{{- end }}
127+
{{- if $webapp.tolerations }}
128+
tolerations:
129+
{{- toYaml . | nindent 8 }}
130+
{{- end }}
127131
{{- end }}

‎templates/datafeeder/import-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,8 @@ spec:
6969
imagePullSecrets:
7070
- name: {{ $webapp.registry_secret }}
7171
{{- end }}
72+
{{- if $webapp.tolerations }}
73+
tolerations:
74+
{{- toYaml . | nindent 8 }}
75+
{{- end }}
7276
{{- end }}

‎templates/gateway/gateway-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,8 @@ spec:
7474
imagePullSecrets:
7575
- name: {{ $webapp.registry_secret }}
7676
{{- end }}
77+
{{- if $webapp.tolerations }}
78+
tolerations:
79+
{{- toYaml . | nindent 8 }}
80+
{{- end }}
7781
{{- end }}

‎templates/geonetwork/elasticsearch/es-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,9 @@ spec:
5656
- name: gn4-es-data
5757
persistentVolumeClaim:
5858
claimName: {{ include "georchestra.fullname" . }}-gn4-es-data
59+
{{- if $webapp.tolerations }}
60+
tolerations:
61+
{{- toYaml . | nindent 8 }}
62+
{{- end }}
5963
{{- end }}
6064

‎templates/geonetwork/geonetwork-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,8 @@ spec:
116116
imagePullSecrets:
117117
- name: {{ $webapp.registry_secret }}
118118
{{- end }}
119+
{{- if $webapp.tolerations }}
120+
tolerations:
121+
{{- toYaml . | nindent 8 }}
122+
{{- end }}
119123
{{- end }}

‎templates/geonetwork/kibana/kibana-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ spec:
4141
- name: gn4-kibana-config
4242
configMap:
4343
name: {{ include "georchestra.fullname" . }}-gn4-kibana-config
44+
{{- if $webapp.tolerations }}
45+
tolerations:
46+
{{- toYaml . | nindent 8 }}
47+
{{- end }}
4448
{{- end }}

‎templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,8 @@ spec:
8686
secretName: {{ .Values.georchestra.datadir.git.ssh_secret }}
8787
defaultMode: 0400
8888
{{- end }}
89+
{{- if $webapp.tolerations }}
90+
tolerations:
91+
{{- toYaml . | nindent 8 }}
92+
{{- end }}
8993
{{- end -}}

‎templates/geoserver/geoserver-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -256,4 +256,8 @@ spec:
256256
imagePullSecrets:
257257
- name: {{ $webapp.registry_secret }}
258258
{{- end }}
259+
{{- if $webapp.tolerations }}
260+
tolerations:
261+
{{- toYaml . | nindent 8 }}
262+
{{- end }}
259263
{{- end }}

‎templates/geowebcache/geowebcache-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,8 @@ spec:
106106
imagePullSecrets:
107107
- name: {{ $webapp.registry_secret }}
108108
{{- end }}
109+
{{- if $webapp.tolerations }}
110+
tolerations:
111+
{{- toYaml . | nindent 8 }}
112+
{{- end }}
109113
{{- end }}

‎templates/header/header-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,9 @@ spec:
7777
imagePullSecrets:
7878
- name: {{ $webapp.registry_secret }}
7979
{{- end }}
80+
{{- if $webapp.tolerations }}
81+
tolerations:
82+
{{- toYaml . | nindent 8 }}
83+
{{- end }}
8084
{{- end }}
8185

‎templates/ldap/openldap-deployment.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,8 @@ spec:
8484
imagePullSecrets:
8585
- name: {{ $webapp.registry_secret }}
8686
{{- end }}
87-
87+
{{- if $webapp.tolerations }}
88+
tolerations:
89+
{{- toYaml . | nindent 8 }}
90+
{{- end }}
8891
{{- end }}

‎templates/mapstore/mapstore-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,9 @@ spec:
9090
imagePullSecrets:
9191
- name: {{ $webapp.registry_secret }}
9292
{{- end }}
93+
{{- if $webapp.tolerations }}
94+
tolerations:
95+
{{- toYaml . | nindent 8 }}
96+
{{- end }}
9397
{{- end }}
9498

‎templates/security-proxy/security-proxy-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ spec:
114114
imagePullSecrets:
115115
- name: {{ $webapp.registry_secret }}
116116
{{- end }}
117+
{{- if $webapp.tolerations }}
118+
tolerations:
119+
{{- toYaml . | nindent 8 }}
120+
{{- end }}
117121
{{- end }}

‎templates/smtp-smarthost/smtp-deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,8 @@ spec:
6464
tcpSocket:
6565
port: smtp
6666
initialDelaySeconds: 30
67+
{{- if $webapp.tolerations }}
68+
tolerations:
69+
{{- toYaml . | nindent 8 }}
70+
{{- end }}
6771
{{- end -}}

‎values.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ georchestra:
2121
# registry_secret: default
2222
service:
2323
annotations: {}
24+
tolerations: []
2425
cas:
2526
enabled: true
2627
replicaCount: "1"
@@ -29,6 +30,7 @@ georchestra:
2930
# registry_secret: default
3031
service:
3132
annotations: {}
33+
tolerations: []
3234
console:
3335
enabled: true
3436
replicaCount: "1"
@@ -38,6 +40,7 @@ georchestra:
3840
# registry_secret: default
3941
service:
4042
annotations: {}
43+
tolerations: []
4144
datafeeder:
4245
enabled: true # won't deploy if datafeeder_frontend is not enable
4346
replicaCount: "1"
@@ -52,6 +55,7 @@ georchestra:
5255
enabled: true
5356
service:
5457
annotations: {}
58+
tolerations: []
5559
datafeeder_frontend:
5660
# Matches datafeeder/import-xxx.yaml templates in the helm chart
5761
enabled: true # won't deploy if datafeeder is not enable
@@ -62,6 +66,7 @@ georchestra:
6266
# registry_secret: default
6367
service:
6468
annotations: {}
69+
tolerations: []
6570
geonetwork:
6671
enabled: true
6772
replicaCount: "1"
@@ -77,6 +82,7 @@ georchestra:
7782
# container extra volume. It should match an item from the extra_volumes.name
7883
# variable above.
7984
extra_volumeMounts: []
85+
tolerations: []
8086
ogc_api_records:
8187
enabled: true
8288
replicaCount: "1"
@@ -86,6 +92,7 @@ georchestra:
8692
enabled: true
8793
service:
8894
annotations: {}
95+
tolerations: []
8996
elasticsearch:
9097
replicaCount: "1"
9198
resources:
@@ -96,11 +103,13 @@ georchestra:
96103
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.21
97104
service:
98105
annotations: {}
106+
tolerations: []
99107
kibana:
100108
replicaCount: "1"
101109
image: docker.elastic.co/kibana/kibana:7.15.1
102110
service:
103111
annotations: {}
112+
tolerations: []
104113
# automatically clean some logs of geonetwork
105114
housekeeping:
106115
harvester_logs:
@@ -121,6 +130,7 @@ georchestra:
121130
# container extra volume. It should match an item from the extra_volumes.name
122131
# variable above.
123132
extra_volumeMounts: []
133+
tolerations: []
124134
# registry_secret: default
125135
service:
126136
annotations: {}
@@ -131,13 +141,15 @@ georchestra:
131141
enabled: true
132142
docker_image: georchestra/geowebcache:latest
133143
extra_environment: []
144+
tolerations: []
134145
service:
135146
annotations: {}
136147
header:
137148
enabled: true
138149
replicaCount: "1"
139150
docker_image: georchestra/header:latest
140151
extra_environment: []
152+
tolerations: []
141153
# registry_secret: default
142154
service:
143155
annotations: {}
@@ -148,6 +160,7 @@ georchestra:
148160
# registry_secret: default
149161
# no need to put the original command already managed
150162
extra_environment: []
163+
tolerations: []
151164
command: []
152165
args: []
153166
lifecycle: {}
@@ -169,6 +182,7 @@ georchestra:
169182
# registry_secret: default
170183
service:
171184
annotations: {}
185+
tolerations: []
172186
proxy:
173187
enabled: false
174188
replicaCount: "1"
@@ -180,6 +194,7 @@ georchestra:
180194
enabled: true
181195
service:
182196
annotations: {}
197+
tolerations: []
183198
gateway:
184199
enabled: true
185200
replicaCount: "1"
@@ -189,6 +204,7 @@ georchestra:
189204
extra_environment: []
190205
service:
191206
annotations: {}
207+
tolerations: []
192208
datadir:
193209
volume:
194210
- name: georchestra-datadir

0 commit comments

Comments
 (0)