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

charts/prometheus-adapter/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.5.0
+version: 4.6.0
 appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

charts/prometheus-adapter/templates/deployment.yaml

@@ -104,6 +104,9 @@ spec:
           name: volume-serving-cert
           readOnly: true
         {{- end }}
+      {{- with .Values.extraContainers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity:

charts/prometheus-adapter/values.yaml

@@ -213,6 +213,9 @@ extraArguments: []
   # - --tls-private-key-file=/etc/tls/tls.key
   # - --tls-cert-file=/etc/tls/tls.crt
 
+# Additional containers to add to the pod
+extraContainers: []
+
 # Any extra volumes
 extraVolumes: []
   # - name: example-name

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

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

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

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

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

charts/prometheus-node-exporter/Chart.yaml

@@ -6,7 +6,7 @@ keywords:
   - prometheus
   - exporter
 type: application
-version: 4.23.1
+version: 4.23.2
 appVersion: 1.6.1
 home: https://github.com/prometheus/node_exporter/
 sources:

charts/prometheus-node-exporter/README.md

@@ -1,18 +1,18 @@
-# Prometheus `Node Exporter`
+# Prometheus Node Exporter
 
 Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors.
 
-This chart bootstraps a prometheus [`Node Exporter`](http://github.com/prometheus/node_exporter) daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+This chart bootstraps a Prometheus [Node Exporter](http://github.com/prometheus/node_exporter) daemonset on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
 
 ## Get Repository Info
-
+<!-- textlint-disable terminology -->
 ```console
 helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 helm repo update
 ```
 
-_See [`helm repo`](https://helm.sh/docs/helm/helm_repo/) for command documentation._
-
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+<!-- textlint-enable -->
 ## Install Chart
 
 ```console
@@ -36,15 +36,11 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc
 ## Upgrading Chart
 
 ```console
-helm upgrade [RELEASE_NAME] [CHART] --install
+helm upgrade [RELEASE_NAME] prometheus-community/prometheus-node-exporter --install
 ```
 
 _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._
 
-### 4.16 to 4.17+
-
-`containerSecurityContext.readOnlyRootFilesystem` is set to `true` by default.
-
 ### 3.x to 4.x
 
 Starting from version 4.0.0, the `node exporter` chart is using the [Kubernetes recommended labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/). Therefore you have to delete the daemonset before you upgrade.

charts/prometheus-node-exporter/templates/clusterrole.yaml

@@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ include "prometheus-node-exporter.fullname" . }}
-  namespace: {{ include "prometheus-node-exporter.namespace" . }}
   labels:
     {{- include "prometheus-node-exporter.labels" . | nindent 4 }}
 rules:

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