Merge branch 'main' into kube-state-metrics/global-image-registries

Signed-off-by: Yann Soubeyrand <[email protected]>
prometheus-community · Mar 30, 2024 · b184ab3 · b184ab3
2 parents 0312760 + e908c1a
commit b184ab3
Show file tree

Hide file tree

Showing 43 changed files with 2,506 additions and 418 deletions.
diff --git a/.github/workflows/check-codeowners.yaml b/.github/workflows/check-codeowners.yaml
@@ -3,7 +3,7 @@ name: Check CODEOWNERS
 on: pull_request
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

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: 57.0.0
+version: 57.2.0
 appVersion: v0.72.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus
@@ -45,11 +45,11 @@ dependencies:
     version: "0.0.0"
     condition: crds.enabled
   - name: kube-state-metrics
-    version: "5.16.*"
+    version: "5.18.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: kubeStateMetrics.enabled
   - name: prometheus-node-exporter
-    version: "4.30.*"
+    version: "4.32.*"
     repository: https://prometheus-community.github.io/helm-charts
     condition: nodeExporter.enabled
   - name: grafana

diff --git a/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml b/charts/kube-prometheus-stack/ci/03-non-defaults-values.yaml
@@ -79,5 +79,9 @@ kubeProxy:
         k8s-app: kube-proxy
 
 nodeExporter:
-  enabled: false
+  enabled: true
   forceDeployDashboards: true
+
+prometheus-node-exporter:
+  kubeRBACProxy:
+    enabled: true
diff --git a/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py
@@ -535,7 +535,7 @@ def write_rules_names_template():
         f.write('{{- define "rules.names" }}\n')
         f.write('rules:\n')
         for rule in condition_map:
-            f.write('  - "%s"\n' % rule)
+            f.write('  - "%s"\n' % sanitize_name(rule))
         f.write('{{- end }}')
 
 def main():

diff --git a/charts/kube-prometheus-stack/templates/prometheus/_rules.tpl b/charts/kube-prometheus-stack/templates/prometheus/_rules.tpl
@@ -8,13 +8,13 @@ rules:
   - "config-reloaders"
   - "etcd"
   - "general.rules"
-  - "k8s.rules.container_cpu_usage_seconds_total"
-  - "k8s.rules.container_memory_cache"
-  - "k8s.rules.container_memory_rss"
-  - "k8s.rules.container_memory_swap"
-  - "k8s.rules.container_memory_working_set_bytes"
-  - "k8s.rules.container_resource"
-  - "k8s.rules.pod_owner"
+  - "k8s.rules.container-cpu-usage-seconds-total"
+  - "k8s.rules.container-memory-cache"
+  - "k8s.rules.container-memory-rss"
+  - "k8s.rules.container-memory-swap"
+  - "k8s.rules.container-memory-working-set-bytes"
+  - "k8s.rules.container-resource"
+  - "k8s.rules.pod-owner"
   - "kube-apiserver-availability.rules"
   - "kube-apiserver-burnrate.rules"
   - "kube-apiserver-histogram.rules"

diff --git a/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml
@@ -24,6 +24,13 @@ rules:
   verbs: ["get", "list", "watch"]
 - nonResourceURLs: ["/metrics", "/metrics/cadvisor"]
   verbs: ["get"]
+{{/* fix(#3338): add required rules to use node-exporter with the RBAC proxy */}}
+{{- if and .Values.nodeExporter.enabled (index .Values "prometheus-node-exporter").kubeRBACProxy.enabled }}
+- apiGroups: [ "" ]
+  resources:
+  - services/{{ include "prometheus-node-exporter.fullname" (index .Subcharts "prometheus-node-exporter") }}
+  verbs: [ "get", "list", "watch" ]
+{{- end }}
 {{- if .Values.prometheus.additionalRulesForClusterRole }}
 {{ toYaml .Values.prometheus.additionalRulesForClusterRole | indent 0 }}
 {{- end }}

diff --git a/charts/kube-prometheus-stack/templates/prometheus/secret.yaml b/charts/kube-prometheus-stack/templates/prometheus/secret.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.prometheus.enabled }}
+{{- if and .Values.prometheus.enabled .Values.prometheus.prometheusSpec.thanos .Values.prometheus.prometheusSpec.thanos.objectStorageConfig}}
+{{- if and .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.secret (not .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.existingSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,9 +10,6 @@ metadata:
     app.kubernetes.io/component: prometheus
 {{ include "kube-prometheus-stack.labels" . | indent 4 }}
 data:
-  {{- with .Values.prometheus.prometheusSpec.thanos.objectStorageConfig }}
-  {{- if and .secret (not .existingSecret) }}
-  object-storage-configs.yaml: {{ toYaml .secret | b64enc | quote }}
-  {{- end }}
-  {{- end }}
+  object-storage-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.thanos.objectStorageConfig.secret | b64enc | quote }}
+{{- end }}
 {{- end }}
diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -286,8 +286,6 @@ alertmanager:
 
   ## Configure pod disruption budgets for Alertmanager
   ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
-  ## This configuration is immutable once created and will require the PDB to be deleted to be changed
-  ## https://github.com/kubernetes/kubernetes/issues/45398
   ##
   podDisruptionBudget:
     enabled: false
@@ -3076,8 +3074,6 @@ prometheus:
 
   ## Configure pod disruption budgets for Prometheus
   ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
-  ## This configuration is immutable once created and will require the PDB to be deleted to be changed
-  ## https://github.com/kubernetes/kubernetes/issues/45398
   ##
   podDisruptionBudget:
     enabled: false
@@ -3354,7 +3350,7 @@ prometheus:
     image:
       registry: quay.io
       repository: prometheus/prometheus
-      tag: v2.50.1
+      tag: v2.51.0
       sha: ""
 
     ## Tolerations for use with node taints
@@ -4176,8 +4172,6 @@ thanosRuler:
 
   ## Configure pod disruption budgets for ThanosRuler
   ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
-  ## This configuration is immutable once created and will require the PDB to be deleted to be changed
-  ## https://github.com/kubernetes/kubernetes/issues/45398
   ##
   podDisruptionBudget:
     enabled: false

diff --git a/charts/kube-state-metrics/Chart.yaml b/charts/kube-state-metrics/Chart.yaml
@@ -2,23 +2,23 @@ apiVersion: v2
 name: kube-state-metrics
 description: Install kube-state-metrics to generate and expose cluster-level metrics
 keywords:
-- metric
-- monitoring
-- prometheus
-- kubernetes
+  - metric
+  - monitoring
+  - prometheus
+  - kubernetes
 type: application
-version: 5.17.0
-appVersion: 2.10.1
+version: 5.19.0
+appVersion: 2.11.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:
-- https://github.com/kubernetes/kube-state-metrics/
+  - https://github.com/kubernetes/kube-state-metrics/
 maintainers:
-- name: tariq1890
-  email: [email protected]
-- name: mrueg
-  email: [email protected]
-- name: dotdc
-  email: [email protected]
+  - name: tariq1890
+    email: [email protected]
+  - name: mrueg
+    email: [email protected]
+  - name: dotdc
+    email: [email protected]
 annotations:
   "artifacthub.io/license": Apache-2.0
   "artifacthub.io/links": |

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.14.0
+    tag: v0.16.0
     sha: ""
     pullPolicy: IfNotPresent
 

diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.9.0
+version: 4.9.1
 appVersion: v0.11.2
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

diff --git a/charts/prometheus-adapter/templates/service.yaml b/charts/prometheus-adapter/templates/service.yaml
@@ -21,6 +21,7 @@ spec:
 {{- end }}
   ports:
   - port: {{ .Values.service.port }}
+    name: https
     protocol: TCP
     targetPort: https
   selector:

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.6.0
+version: 5.7.0
 kubeVersion: ">=1.10.0-0"
 appVersion: "v1.7.0"
 home: https://github.com/prometheus-community/elasticsearch_exporter

diff --git a/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/podmonitor.yaml
@@ -1,7 +1,7 @@
 {{- if and .Values.podMonitor.enabled .Values.serviceMonitor.enabled }}
 {{- fail "Either .Values.podMonitor.enabled or .Values.serviceMonitor.enabled can be enabled at a time, but not both." }}
 {{- else if .Values.podMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.podMonitor.apiVersion }}
 kind: PodMonitor
 metadata:
   name: {{ template "elasticsearch-exporter.fullname" . }}

diff --git a/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml b/charts/prometheus-elasticsearch-exporter/templates/servicemonitor.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.serviceMonitor.enabled }}
 ---
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.serviceMonitor.apiVersion }}
 kind: ServiceMonitor
 metadata:
   name: {{ template "elasticsearch-exporter.fullname" . }}

diff --git a/charts/prometheus-elasticsearch-exporter/values.yaml b/charts/prometheus-elasticsearch-exporter/values.yaml
@@ -242,6 +242,7 @@ serviceMonitor:
   ## https://github.com/coreos/prometheus-operator
   ##
   enabled: false
+  apiVersion: "monitoring.coreos.com/v1"
   #  namespace: monitoring
   labels: {}
   interval: 10s
@@ -258,6 +259,7 @@ podMonitor:
   ## https://prometheus-operator.dev/docs/operator/api/#monitoring.coreos.com/v1.PodMonitor
   ##
   enabled: false
+  apiVersion: "monitoring.coreos.com/v1"
   namespace: ""
   labels: {}
   interval: 60s

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.9.0
+version: 2.10.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/servicemonitor.yaml b/charts/prometheus-kafka-exporter/templates/servicemonitor.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.prometheus.serviceMonitor.enabled }}
-apiVersion: monitoring.coreos.com/v1
+apiVersion: {{ .Values.prometheus.serviceMonitor.apiVersion }}
 kind: ServiceMonitor
 metadata:
   name: {{ include "prometheus-kafka-exporter.fullname" . }}

diff --git a/charts/prometheus-kafka-exporter/values.yaml b/charts/prometheus-kafka-exporter/values.yaml
@@ -101,6 +101,7 @@ prometheus:
   serviceMonitor:
     enabled: false
     namespace: monitoring
+    apiVersion: "monitoring.coreos.com/v1"
     interval: "30s"
     # If serviceMonitor is enabled and you want prometheus to automatically register
     # target using serviceMonitor, add additionalLabels with prometheus release name

diff --git a/charts/prometheus-mysql-exporter/Chart.yaml b/charts/prometheus-mysql-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for prometheus mysql exporter with cloudsqlproxy
 name: prometheus-mysql-exporter
-version: 2.5.0
+version: 2.5.1
 home: https://github.com/prometheus/mysqld_exporter
 appVersion: v0.15.1
 sources:

diff --git a/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml b/charts/prometheus-mysql-exporter/templates/servicemonitor.yaml
@@ -72,7 +72,7 @@ spec:
           - client.{{ .name }}
         {{- end }}
   {{- end }}
-  {{- else }}
+  {{- end }}
     - path: /metrics
       port: {{ .Values.service.name }}
   {{- if .Values.serviceMonitor.interval }}
@@ -87,5 +87,4 @@ spec:
   {{- if .Values.serviceMonitor.relabelings }}
       relabelings: {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }}
   {{- end }}
-  {{- end }}
 {{- end }}
diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - prometheus
   - exporter
 type: application
-version: 4.31.0
+version: 4.32.0
 appVersion: 1.7.0
 home: https://github.com/prometheus/node_exporter/
 sources:

diff --git a/charts/prometheus-node-exporter/values.yaml b/charts/prometheus-node-exporter/values.yaml
@@ -45,7 +45,7 @@ kubeRBACProxy:
   image:
     registry: quay.io
     repository: brancz/kube-rbac-proxy
-    tag: v0.15.0
+    tag: v0.16.0
     sha: ""
     pullPolicy: IfNotPresent
 

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.10.1
-appVersion: 0.71.2
+version: 0.11.0
+appVersion: 0.72.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:

diff --git a/charts/prometheus-operator-crds/Chart.yaml b/charts/prometheus-operator-crds/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 type: application
-version: 9.0.1
+version: 10.0.0
 name: prometheus-operator-crds
 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
 description: |
@@ -9,7 +9,7 @@ description: |
 keywords:
   - prometheus
   - crds
-appVersion: v0.71.2
+appVersion: v0.72.0
 kubeVersion: ">=1.16.0-0"
 sources:
   - https://github.com/prometheus-community/helm-charts

diff --git a/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml b/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.71.2/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -8,7 +8,7 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
     controller-gen.kubebuilder.io/version: v0.13.0
-    operator.prometheus.io/version: 0.71.2
+    operator.prometheus.io/version: 0.72.0
   name: alertmanagerconfigs.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com