Skip to content

[prometheus-elasticsearch-exporter] Deployment volumes volumeMounts fix #5493

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.

Sign up for GitHub

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

Merged
zeritti merged 7 commits into from
Apr 2, 2025
Merged

[prometheus-elasticsearch-exporter] Deployment volumes volumeMounts fix #5493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e88783c
[prometheus-elasticsearch-exporter]Deployment volumes and volumeMount…
bobanj Apr 1, 2025
507a92c
[prometheus-elasticsearch-exporter] bump chart version
bobanj Apr 1, 2025
334794d
Exclude ci from package
zeritti Apr 1, 2025
59699be
Add further CI test cases
zeritti Apr 1, 2025
4567dba
Merge branch 'main' of github.com:prometheus-community/helm-charts in…
bobanj Apr 2, 2025
ad1ad62
Merge branch 'elasticsearch-deployment-volumes-fix' of github.com:bob…
bobanj Apr 2, 2025
eec294e
[prometheus-elasticsearch-exporter] template deployment, add new line…
bobanj Apr 2, 2025
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: 2 additions & 0 deletions charts/prometheus-elasticsearch-exporter/.helmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ OWNERS
.idea/
*.tmproj
.vscode/

ci/
2 changes: 1 addition & 1 deletion charts/prometheus-elasticsearch-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Elasticsearch stats exporter for Prometheus
name: prometheus-elasticsearch-exporter
version: 6.7.1
version: 6.7.2
kubeVersion: ">=1.19.0-0"
appVersion: "v1.9.0"
home: https://github.com/prometheus-community/elasticsearch_exporter
Expand Down
4 changes: 4 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/common-labels-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
commonLabels:
foo: bar
baz: qux
7 changes: 7 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/deployment-labels-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
deployment:
labels:
foo: bar
baz: qux
annotations:
foo.io/bar: baz
4 changes: 4 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/env-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
env:
FOO: bar
BAZ: qux
10 changes: 10 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/extra-volumes-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
extraVolumes:
- name: cache
emptyDir:
sizeLimit: 100Mi

extraVolumeMounts:
- name: cache
mountPath: /cache
readOnly: false
7 changes: 7 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/pod-labels-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
podLabels:
foo: bar
baz: qux

podAnnotations:
foo.io/bar: baz
5 changes: 5 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/pod-monitor-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
podMonitor:
enabled: true
labels:
foo: bar
16 changes: 16 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/secret-mounts-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
secretMounts:
- name: secret
path: /etc/secret
secretName: mysecret

extraManifests:
- |
apiVersion: v1
kind: Secret
metadata:
name: mysecret
labels: {{ include "elasticsearch-exporter.labels" . | nindent 4 }}
type: Opaque
data:
foo: YmFy
7 changes: 7 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/service-labels-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
service:
labels:
foo: bar
baz: qux
annotations:
foo.io/bar: baz
6 changes: 6 additions & 0 deletions charts/prometheus-elasticsearch-exporter/ci/service-monitor-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
serviceMonitor:
enabled: true
labels:
foo: bar
jobLabel: app.kubernetes.io/name
4 changes: 4 additions & 0 deletions charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ spec:
preStop:
exec:
command: ["/bin/sleep", "20"]
{{- if or (and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false)) (not (empty .Values.secretMounts)) (not (empty .Values.extraVolumeMounts)) }}
volumeMounts:
{{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }}
- mountPath: /ssl
Expand All @@ -175,6 +176,7 @@ spec:
{{- with .Values.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.initContainers }}
initContainers:
{{- toYaml . | nindent 8 }}
Expand All @@ -195,6 +197,7 @@ spec:
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or (and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false)) (not (empty .Values.secretMounts)) (not (empty .Values.extraVolumes)) }}
volumes:
{{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }}
- name: ssl
Expand All @@ -209,3 +212,4 @@ spec:
{{- with .Values.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}