Merge branch 'main' into oauth

prometheus-community · Sep 13, 2023 · 09a3442 · 09a3442
2 parents 24b15b0 + 0f018d1
commit 09a3442
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 20 deletions.
diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.4.1
-appVersion: v0.11.0
+version: 4.5.0
+appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter
 keywords:

diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- with .Values.env }}
         env:

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -4,7 +4,8 @@ topologySpreadConstraints: []
 
 image:
   repository: registry.k8s.io/prometheus-adapter/prometheus-adapter
-  tag: v0.11.0
+  # if not set appVersion field from Chart.yaml is used
+  tag: ""
   pullPolicy: IfNotPresent
 
 logLevel: 4

diff --git a/charts/prometheus-elasticsearch-exporter/Chart.yaml b/charts/prometheus-elasticsearch-exporter/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 description: Elasticsearch stats exporter for Prometheus
 name: prometheus-elasticsearch-exporter
-version: 5.2.0
+version: 5.3.0
 kubeVersion: ">=1.10.0-0"
-appVersion: 1.5.0
+appVersion: "v1.6.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter
 sources:
   - https://github.com/prometheus-community/helm-charts/tree/main/charts/prometheus-elasticsearch-exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml b/charts/prometheus-elasticsearch-exporter/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
           - secretRef:
               name: {{ .Values.envFromSecret }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["elasticsearch_exporter",
                     {{- with .Values.log.format }}
@@ -109,7 +109,7 @@ spec:
                     "--es.snapshots",
                     {{- end }}
                     {{- if .Values.es.cluster_settings }}
-                    "--es.cluster_settings",
+                    "--collector.clustersettings",
                     {{- end }}
                     {{- if .Values.es.slm }}
                     "--es.slm",

diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml
@@ -14,7 +14,8 @@ restartPolicy: Always
 
 image:
   repository: quay.io/prometheuscommunity/elasticsearch-exporter
-  tag: v1.5.0
+  # if not set appVersion field from Chart.yaml is used
+  tag: ""
   pullPolicy: IfNotPresent
   pullSecret: ""
 

diff --git a/charts/prometheus-mongodb-exporter/Chart.yaml b/charts/prometheus-mongodb-exporter/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
-appVersion: "0.31.0"
+appVersion: "0.39.0"
 description: A Prometheus exporter for MongoDB metrics
 home: https://github.com/percona/mongodb_exporter
 keywords:
-- exporter
-- metrics
-- mongodb
-- prometheus
+  - exporter
+  - metrics
+  - mongodb
+  - prometheus
 maintainers:
-- email: [email protected]
-  name: steven-sheehy
-- email: [email protected]
-  name: zeritti
+  - email: [email protected]
+    name: steven-sheehy
+  - email: [email protected]
+    name: zeritti
 name: prometheus-mongodb-exporter
 sources:
-- https://github.com/percona/mongodb_exporter
-version: 3.3.1
+  - https://github.com/percona/mongodb_exporter
+version: 3.4.0