Skip to content

Commit f4144ba

Browse files
authored
[bitnami/elasticsearch] Fix failed metrics pod in elasticsearch when deploy elasticsearch (#13303)
Signed-off-by: Anton Patsev <patsev.anton@gmail.com> Signed-off-by: Anton Patsev <patsev.anton@gmail.com>
1 parent ec3cc99 commit f4144ba

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
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/containers/tree/main/bitnami/elasticsearch
2727
- https://www.elastic.co/products/elasticsearch
28-
version: 19.4.6
28+
version: 19.5.0

bitnami/elasticsearch/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ $ helm delete --purge my-release
535535
| `metrics.image.digest` | Metrics exporter image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
536536
| `metrics.image.pullPolicy` | Metrics exporter image pull policy | `IfNotPresent` |
537537
| `metrics.image.pullSecrets` | Metrics exporter image pull secrets | `[]` |
538+
| `metrics.annotations` | Annotations for metrics | `{}` |
538539
| `metrics.extraArgs` | Extra arguments to add to the default exporter command | `[]` |
539540
| `metrics.hostAliases` | Add deployment host aliases | `[]` |
540541
| `metrics.schedulerName` | Name of the k8s scheduler (other than default) | `""` |

bitnami/elasticsearch/templates/metrics/deployment.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ metadata:
1111
{{- if .Values.commonLabels }}
1212
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
1313
{{- end }}
14-
{{- if .Values.commonAnnotations }}
15-
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
16-
{{- end }}
14+
annotations:
15+
{{- if .Values.metrics.annotations }}
16+
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.annotations "context" $) | nindent 4 }}
17+
{{- end }}
18+
{{- if .Values.commonAnnotations }}
19+
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
20+
{{- end }}
1721
spec:
1822
replicas: 1
1923
selector:

bitnami/elasticsearch/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1768,6 +1768,12 @@ metrics:
17681768
## - myRegistryKeySecretName
17691769
##
17701770
pullSecrets: []
1771+
## @param metrics.annotations [object] Annotations for metrics
1772+
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
1773+
##
1774+
annotations:
1775+
helm.sh/hook: "post-install,post-upgrade"
1776+
helm.sh/hook-weight: "5"
17711777
## @param metrics.extraArgs Extra arguments to add to the default exporter command
17721778
## ref: https://github.com/justwatchcom/elasticsearch_exporter
17731779
## e.g

0 commit comments

Comments
 (0)