Merge branch 'main' into feat/alertmanager-sts-autodeletepvc

Signed-off-by: Peter Barr <[email protected]>
prometheus-community · Sep 29, 2023 · 2374ff8 · 2374ff8
2 parents 1859914 + 74d6e9e
commit 2374ff8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 5.3.0
+version: 5.3.1
 kubeVersion: ">=1.10.0-0"
 appVersion: "v1.6.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
@@ -161,7 +161,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/bash", "-c", "sleep 20"]
+                command: ["/bin/sleep", "20"]
           volumeMounts:
             {{- if and .Values.es.ssl.enabled (eq .Values.es.ssl.useExistingSecrets false) }}
             - mountPath: /ssl

diff --git a/charts/prometheus-kafka-exporter/Chart.yaml b/charts/prometheus-kafka-exporter/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "v1.7.0"
 description: A Helm chart to export the metrics from Kafka in Prometheus format using the kafka-exporter from https://github.com/danielqsj/kafka_exporter
 name: prometheus-kafka-exporter
 home: https://github.com/danielqsj/kafka_exporter
-version: 2.6.0
+version: 2.7.0
 kubeVersion: ">=1.19.0-0"
 sources:
   - https://gkarthiks.github.io/helm-charts/charts/prometheus-kafka-exporter

diff --git a/charts/prometheus-kafka-exporter/templates/service.yaml b/charts/prometheus-kafka-exporter/templates/service.yaml
@@ -14,6 +14,9 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
+{{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+{{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: exporter-port

diff --git a/charts/prometheus-kafka-exporter/values.yaml b/charts/prometheus-kafka-exporter/values.yaml
@@ -71,9 +71,11 @@ service:
   port: 9308
   labels: {}
   annotations: {}
-  # Specifies a custom nodePort for external use.
-  # Must be used with service.type=NodePort.
+  # Specifies a custom nodePort for external use. Used with service.type=NodePort.
   nodePort: null
+  # Specifies a reserved static IP. Used with service.type=LoadBalancer.
+  # The field is deprecated, implementation-specific annotations should be set instead.
+  loadBalancerIP: null
 
 liveness:
   enabled: false

diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "v0.13.2"
+appVersion: "v0.14.0"
 description: A Helm chart for prometheus postgres-exporter
 name: prometheus-postgres-exporter
-version: 5.0.0
+version: 5.1.0
 home: https://github.com/prometheus-community/postgres_exporter
 sources:
 - https://github.com/prometheus-community/postgres_exporter