Skip to content

Commit b41add7

Browse files
author
Juan Ariza Toledano
authored
[bitnami/elasticsearch] Enable probess + add support for custom ones (#6691)
1 parent 00b1ad4 commit b41add7

File tree

7 files changed

+143
-70
lines changed

7 files changed

+143
-70
lines changed

‎bitnami/elasticsearch/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ name: elasticsearch
2525
sources:
2626
- https://github.com/bitnami/bitnami-docker-elasticsearch
2727
- https://www.elastic.co/products/elasticsearch
28-
version: 15.4.1
28+
version: 15.5.0

‎bitnami/elasticsearch/README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ The following table lists the configurable parameters of the Elasticsearch chart
140140
| `master.readinessProbe.timeoutSeconds` | When the probe times out (master-eligible nodes pod) | `5` |
141141
| `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (master-eligible nodes pod) | `1` |
142142
| `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` |
143+
| `master.customStartupProbe` | Override default startup probe | `{}` |
144+
| `master.customLivenessProbe` | Override default liveness probe | `{}` |
145+
| `master.customReadinessProbe` | Override default readiness probe | `{}` |
143146
| `master.serviceAccount.create` | Enable creation of ServiceAccount for the master node | `false` |
144147
| `master.serviceAccount.name` | Name of the created serviceAccount | Generated using the `elasticsearch.master.fullname` template |
145148
| `master.autoscaling.enabled` | Enable autoscaling for master replicas | `false` |
@@ -193,13 +196,17 @@ The following table lists the configurable parameters of the Elasticsearch chart
193196
| `coordinating.readinessProbe.timeoutSeconds` | When the probe times out (coordinating-only nodes pod) | `5` |
194197
| `coordinating.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (coordinating-only nodes pod) | `1` |
195198
| `coordinating.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` |
199+
| `coordinating.customStartupProbe` | Override default startup probe | `{}` |
200+
| `coordinating.customLivenessProbe` | Override default liveness probe | `{}` |
201+
| `coordinating.customReadinessProbe` | Override default readiness probe | `{}` |
196202
| `coordinating.serviceAccount.create` | Enable creation of ServiceAccount for the coordinating-only node | `false` |
197203
| `coordinating.serviceAccount.name` | Name of the created serviceAccount | Generated using the `elasticsearch.coordinating.fullname` |
198204
| `coordinating.autoscaling.enabled` | Enable autoscaling for coordinating replicas | `false` |
199205
| `coordinating.autoscaling.minReplicas` | Minimum number of coordinating replicas | `2` |
200206
| `coordinating.autoscaling.maxReplicas` | Maximum number of coordinating replicas | `11` |
201207
| `coordinating.autoscaling.targetCPU` | Target CPU utilization percentage for coordinating replica autoscaling | `nil` |
202208
| `coordinating.autoscaling.targetMemory` | Target Memory utilization percentage for coordinating replica autoscaling | `nil` |
209+
203210
### Data parameters
204211

205212
| Parameter | Description | Default |
@@ -235,6 +242,9 @@ The following table lists the configurable parameters of the Elasticsearch chart
235242
| `data.livenessProbe.timeoutSeconds` | When the probe times out (data nodes pod) | `5` |
236243
| `data.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (data nodes pod) | `1` |
237244
| `data.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` |
245+
| `data.customStartupProbe` | Override default startup probe | `{}` |
246+
| `data.customLivenessProbe` | Override default liveness probe | `{}` |
247+
| `data.customReadinessProbe` | Override default readiness probe | `{}` |
238248
| `data.podAnnotations` | Annotations for data pods. | `{}` |
239249
| `data.podAffinityPreset` | Data Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
240250
| `data.podAntiAffinityPreset` | Data Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
@@ -289,6 +299,9 @@ The following table lists the configurable parameters of the Elasticsearch chart
289299
| `ingest.livenessProbe.timeoutSeconds` | When the probe times out (ingest nodes pod) | `5` |
290300
| `ingest.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (ingest nodes pod) | `1` |
291301
| `ingest.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded | `5` |
302+
| `ingest.customStartupProbe` | Override default startup probe | `{}` |
303+
| `ingest.customLivenessProbe` | Override default liveness probe | `{}` |
304+
| `ingest.customReadinessProbe` | Override default readiness probe | `{}` |
292305
| `ingest.podAnnotations` | Annotations for ingest pods. | `{}` |
293306
| `ingest.podAffinityPreset` | Ingest Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
294307
| `ingest.podAntiAffinityPreset` | Ingest Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |

‎bitnami/elasticsearch/templates/coordinating-deploy.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ spec:
128128
httpGet:
129129
path: /_cluster/health?local=true
130130
port: 9200
131+
{{- else if .Values.coordinating.customStartupProbe }}
132+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinating.customStartupProbe "context" $) | nindent 12 }}
131133
{{- end }}
132134
{{- if .Values.coordinating.livenessProbe.enabled }}
133135
livenessProbe:
@@ -139,6 +141,8 @@ spec:
139141
httpGet:
140142
path: /_cluster/health?local=true
141143
port: http
144+
{{- else if .Values.coordinating.customLivenessProbe }}
145+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinating.customLivenessProbe "context" $) | nindent 12 }}
142146
{{- end }}
143147
{{- if .Values.coordinating.readinessProbe.enabled}}
144148
readinessProbe:
@@ -150,6 +154,8 @@ spec:
150154
httpGet:
151155
path: /_cluster/health?local=true
152156
port: http
157+
{{- else if .Values.coordinating.customReadinessProbe }}
158+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.coordinating.customReadinessProbe "context" $) | nindent 12 }}
153159
{{- end }}
154160
{{- if .Values.coordinating.resources }}
155161
resources: {{- toYaml .Values.coordinating.resources | nindent 12 }}

‎bitnami/elasticsearch/templates/data-statefulset.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
httpGet:
158158
path: /_cluster/health?local=true
159159
port: 9200
160+
{{- else if .Values.data.customStartupProbe }}
161+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.data.customStartupProbe "context" $) | nindent 12 }}
160162
{{- end }}
161163
{{- if .Values.data.livenessProbe.enabled }}
162164
livenessProbe:
@@ -168,6 +170,8 @@ spec:
168170
httpGet:
169171
path: /_cluster/health?local=true
170172
port: 9200
173+
{{- else if .Values.data.customLivenessProbe }}
174+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.data.customLivenessProbe "context" $) | nindent 12 }}
171175
{{- end }}
172176
{{- if .Values.data.readinessProbe.enabled }}
173177
readinessProbe:
@@ -179,6 +183,8 @@ spec:
179183
httpGet:
180184
path: /_cluster/health?local=true
181185
port: 9200
186+
{{- else if .Values.data.customReadinessProbe }}
187+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.data.customReadinessProbe "context" $) | nindent 12 }}
182188
{{- end }}
183189
{{- if .Values.data.resources }}
184190
resources: {{- toYaml .Values.data.resources | nindent 12 }}

‎bitnami/elasticsearch/templates/ingest-deploy.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ spec:
123123
httpGet:
124124
path: /_cluster/health?local=true
125125
port: 9200
126+
{{- else if .Values.ingest.customStartupProbe }}
127+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingest.customStartupProbe "context" $) | nindent 12 }}
126128
{{- end }}
127129
{{- if .Values.ingest.livenessProbe.enabled }}
128130
livenessProbe:
@@ -134,6 +136,8 @@ spec:
134136
httpGet:
135137
path: /_cluster/health?local=true
136138
port: 9200
139+
{{- else if .Values.ingest.customLivenessProbe }}
140+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingest.customLivenessProbe "context" $) | nindent 12 }}
137141
{{- end }}
138142
{{- if .Values.ingest.readinessProbe.enabled}}
139143
readinessProbe:
@@ -145,7 +149,9 @@ spec:
145149
httpGet:
146150
path: /_cluster/health?local=true
147151
port: 9200
148-
{{- end}}
152+
{{- else if .Values.ingest.customReadinessProbe }}
153+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.ingest.customReadinessProbe "context" $) | nindent 12 }}
154+
{{- end }}
149155
{{- if .Values.ingest.resources }}
150156
resources: {{- toYaml .Values.ingest.resources | nindent 12 }}
151157
{{- end}}

‎bitnami/elasticsearch/templates/master-statefulset.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ spec:
160160
httpGet:
161161
path: /_cluster/health?local=true
162162
port: 9200
163+
{{- else if .Values.master.customStartupProbe }}
164+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customStartupProbe "context" $) | nindent 12 }}
163165
{{- end }}
164166
{{- if .Values.master.livenessProbe.enabled }}
165167
livenessProbe:
@@ -171,6 +173,8 @@ spec:
171173
httpGet:
172174
path: /_cluster/health?local=true
173175
port: 9200
176+
{{- else if .Values.master.customLivenessProbe }}
177+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customLivenessProbe "context" $) | nindent 12 }}
174178
{{- end }}
175179
{{- if .Values.master.readinessProbe.enabled }}
176180
readinessProbe:
@@ -182,6 +186,8 @@ spec:
182186
httpGet:
183187
path: /_cluster/health?local=true
184188
port: 9200
189+
{{- else if .Values.master.customReadinessProbe }}
190+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.master.customReadinessProbe "context" $) | nindent 12 }}
185191
{{- end }}
186192
{{- if .Values.master.resources }}
187193
resources: {{- toYaml .Values.master.resources | nindent 12 }}

0 commit comments

Comments
 (0)