Merge branch 'main' into json-exporter-add-action-replace

prometheus-community · Jun 8, 2024 · 317e17a · 317e17a
2 parents 687e9a3 + 782a331
commit 317e17a
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 60.0.0
+version: 60.0.1
 appVersion: v0.74.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -2862,7 +2862,7 @@ prometheusOperator:
   thanosImage:
     registry: quay.io
     repository: thanos/thanos
-    tag: v0.35.0
+    tag: v0.35.1
     sha: ""
 
   ## Set a Label Selector to filter watched prometheus and prometheusAgent
@@ -4424,7 +4424,7 @@ thanosRuler:
     image:
       registry: quay.io
       repository: thanos/thanos
-      tag: v0.35.0
+      tag: v0.35.1
       sha: ""
 
     ## Namespaces to be selected for PrometheusRules discovery.

diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
@@ -7,7 +7,7 @@ keywords:
   - prometheus
   - kubernetes
 type: application
-version: 5.19.1
+version: 5.20.0
 appVersion: 2.12.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

diff --git a/charts/kube-state-metrics/values.yaml b/charts/kube-state-metrics/values.yaml
@@ -103,7 +103,7 @@ kubeRBACProxy:
   image:
     registry: quay.io
     repository: brancz/kube-rbac-proxy
-    tag: v0.16.0
+    tag: v0.18.0
     sha: ""
     pullPolicy: IfNotPresent
 

diff --git a/charts/prometheus-ipmi-exporter/Chart.yaml b/charts/prometheus-ipmi-exporter/Chart.yaml
@@ -4,7 +4,7 @@ description: This is an IPMI exporter for Prometheus.
 
 type: application
 
-version: 0.3.0
+version: 0.4.0
 
 appVersion: "v1.8.0"
 

diff --git a/charts/prometheus-ipmi-exporter/templates/configmap.yaml b/charts/prometheus-ipmi-exporter/templates/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.configMapFile -}}
+{{- if not .Values.configSecret.enabled -}}
 {{- $fullName := include "prometheus-ipmi-exporter.fullname" . -}}
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/prometheus-ipmi-exporter/templates/deployment.yaml b/charts/prometheus-ipmi-exporter/templates/deployment.yaml
@@ -56,8 +56,16 @@ spec:
               memory: {{ .Values.resources.requests.memory }}
       volumes:
         - name: config-volume
+        {{- if .Values.configSecret.enabled }}
+          secret:
+            secretName: {{ .Values.configSecret.name }}
+            items:
+            - key: {{ .Values.configSecret.key }}
+              path: config.yml
+        {{- else }}
           configMap:
             name: {{ template "prometheus-ipmi-exporter.fullname" . }}
+        {{- end }}
         {{- with .Values.extraVolumes }}
             {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/prometheus-ipmi-exporter/values.yaml b/charts/prometheus-ipmi-exporter/values.yaml
@@ -63,6 +63,11 @@ serviceMonitor:
 
   # Configuration file for ipmi_exporter
 
+configSecret:
+  enabled: false
+  name: ipmi-secret
+  key: config.yml
+
 # This is an example config for scraping remote hosts via IPMI.
 # Information required to access remote IPMI interfaces can be supplied in the
 # 'modules' section. A scrape can request the usage of a given config by

diff --git a/charts/prometheus-operator-admission-webhook/Chart.yaml b/charts/prometheus-operator-admission-webhook/Chart.yaml
@@ -2,8 +2,8 @@
 apiVersion: v2
 description: Prometheus Operator Admission Webhook
 name: prometheus-operator-admission-webhook
-version: 0.12.0
-appVersion: 0.73.0
+version: 0.13.0
+appVersion: 0.74.0
 home: https://github.com/prometheus-operator/prometheus-operator
 icon: https://github.com/prometheus-operator/prometheus-operator/raw/main/Documentation/logos/prometheus-operator-logo.png
 keywords: