charts,salt,build: Bump kube-prometheus-stack chart to 57.2.0

Bump the kube-prometheus-stack chart to 57.2.0 and also bump images:
- prometheus to 2.51.0
- grafana to 10.4.0
- k8s-sidecar to 1.26.1
- kube-state-metrics to 2.11.0
- prometheus-config-reloader to v0.72.0
- prometheus-operator to v0.72.0

Upgrade the kube-prometheus-stack chart using:
```
rm -rf charts/kube-prometheus-stack
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo update
helm fetch -d charts --untar prometheus-community/kube-prometheus-stack
```

Re-render prometheus-operator salt state using:
```
./doit.sh codegen:chart_kube-prometheus-stack
```

We also remove darwin dashboard using helm option instead of
rendering removal

CHANGELOG.md

@@ -14,6 +14,29 @@
 - Bump Calico version to [3.27.3](https://github.com/projectcalico/calico/releases/tag/v3.27.3)
   (PR[#4291](https://github.com/scality/metalk8s/pull/4291))
 
+- Bump kube-prometheus-stack chart version to
+  [57.2.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-57.2.0)
+  (PR[#4300](https://github.com/scality/metalk8s/pull/4300))
+
+  This change includes:
+
+  - Bump Prometheus container version to
+    [2.51.0](https://github.com/prometheus/prometheus/releases/tag/v2.51.0)
+  - Bump grafana chart version to
+    [7.3.7](https://github.com/grafana/helm-charts/releases/tag/grafana-7.3.7),
+    Grafana container version to
+    [10.4.0](https://github.com/grafana/grafana/releases/tag/v10.4.0),
+    and kiwigrid/k8s-sidecar container version to
+    [1.26.1](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.26.1)
+  - Bump kube-state-metrics chart version to
+    [5.18.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.18.0)
+    and kube-state-metrics container version to
+    [2.11.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.11.0)
+  - Bump prometheus-node-exporter chart version to
+    [4.32.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.32.0)
+  - Bump prometheus-operator and prometheus-config-reloader containers version to
+    [0.72.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.72.0)
+
 - Bump dex chart version to
   [0.17.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.17.0)
   Dex itself has been bumped accordingly to

buildchain/buildchain/codegen.py

@@ -198,7 +198,6 @@ def codegen_chart_kube_prometheus_stack() -> types.TaskDict:
         "prometheus-operator-kubernetes-system-kubelet,"
         'spec:groups:0:rules:1:for,"5m"\' '
         f"--drop-prometheus-rules {drop_rule_file} "
-        f"--remove-manifest ConfigMap prometheus-operator-nodes-darwin "
         f"--output {target_sls}"
     )
 

buildchain/buildchain/versions.py

@@ -140,13 +140,13 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="grafana",
-        version="10.3.3",
-        digest="sha256:45335e278648fd393e7fe029be1843d15c63db5555eb383d6d614bd94566d0e5",
+        version="10.4.0",
+        digest="sha256:f9811e4e687ffecf1a43adb9b64096c50bc0d7a782f8608530f478b6542de7d5",
     ),
     Image(
         name="k8s-sidecar",
-        version="1.25.2",
-        digest="sha256:cb4c638ffb1fa1eb49678e0f0423564b39254533f63f4ca6a6c24260472e0c4f",
+        version="1.26.1",
+        digest="sha256:b8d5067137fec093cf48670dc3a1dbb38f9e734f3a6683015c2e89a45db5fd16",
     ),
     Image(
         name="kube-apiserver",
@@ -170,8 +170,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="kube-state-metrics",
-        version="v2.10.1",
-        digest="sha256:af8220f534938de121a694cb7314313a6195c9d494fc30bfa6885b08a276bb82",
+        version="v2.11.0",
+        digest="sha256:11da79c0e80e9cc755f84a3fc0cd0269be57148aad2587059abe3296e84b67e9",
     ),
     Image(
         name="nginx",
@@ -197,8 +197,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus",
-        version="v2.50.1",
-        digest="sha256:4371844079427965a14011f20e6d76283059d637775c663c57a5ea3f8d00ef9a",
+        version="v2.51.0",
+        digest="sha256:5ccad477d0057e62a7cd1981ffcc43785ac10c5a35522dc207466ff7e7ec845f",
     ),
     Image(
         name="prometheus-adapter",
@@ -207,13 +207,13 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-config-reloader",
-        version="v0.71.2",
-        digest="sha256:9f0c16b8c95c908f761d45f95bc04da9dd6482adc8dc0d88dcbc24ceeb5879a1",
+        version="v0.72.0",
+        digest="sha256:89a6c7d3fd614ee1ed556f515f5ecf2dba50eec9af418ac8cd129d5fcd2f5c18",
     ),
     Image(
         name="prometheus-operator",
-        version="v0.71.2",
-        digest="sha256:bbf3c671e65b0c115d2196bbe7fed0bcdc59f44b7c93868cd40d1c90cbd3806e",
+        version="v0.72.0",
+        digest="sha256:804d9569455dc278e378456106431a44a70b1342a0837dbacc85429c95cc72c6",
     ),
     Image(
         name="thanos",

charts/kube-prometheus-stack.yaml

@@ -1,6 +1,6 @@
 nameOverride: prometheus-operator
 
-kubeTargetVersionOverride: 1.27.0
+kubeTargetVersionOverride: 1.28.0
 
 commonLabels:
   # This needs to remain 'Tiller' for the render script to work properly
@@ -326,3 +326,8 @@ kubelet:
       #   action: drop
       #   regex: '.+;'
       # END WORKAROUND
+
+nodeExporter:
+  operatingSystems:
+    darwin:
+      enabled: false

charts/kube-prometheus-stack/Chart.lock

@@ -4,15 +4,15 @@ dependencies:
   version: 0.0.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.16.4
+  version: 5.18.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.30.3
+  version: 4.32.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 7.3.3
+  version: 7.3.7
 - name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 0.3.1
-digest: sha256:4e4529627b58e5f6ac7d774085f5a712760fd1b3006a21f384fb26b7921d446d
-generated: "2024-03-06T14:25:36.959144156Z"
+digest: sha256:a4caa4290b104622838fc72e36bfa00bd2318ca7821ed2374585c6d8685737a9
+generated: "2024-03-27T15:52:55.159606534Z"

charts/kube-prometheus-stack/Chart.yaml

@@ -7,7 +7,7 @@ annotations:
       url: https://github.com/prometheus-operator/kube-prometheus
   artifacthub.io/operator: "true"
 apiVersion: v2
-appVersion: v0.71.2
+appVersion: v0.72.0
 dependencies:
 - condition: crds.enabled
   name: crds
@@ -16,11 +16,11 @@ dependencies:
 - condition: kubeStateMetrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.16.*
+  version: 5.18.*
 - condition: nodeExporter.enabled
   name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.30.*
+  version: 4.32.*
 - condition: grafana.enabled
   name: grafana
   repository: https://grafana.github.io/helm-charts
@@ -62,4 +62,4 @@ sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 56.21.2
+version: 57.2.0

charts/kube-prometheus-stack/README.md

@@ -82,6 +82,25 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documen
 
 A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.
 
+### From 56.x to 57.x
+
+This version upgrades Prometheus-Operator to v0.72.0
+
+Run these commands to update the CRDs before applying the upgrade.
+
+```console
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.72.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 55.x to 56.x
 
 This version upgrades Prometheus-Operator to v0.71.0, Prometheus to 2.49.1

charts/kube-prometheus-stack/charts/crds/crds/crd-alertmanagerconfigs.yaml

@@ -1,11 +1,11 @@
-# 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
 metadata:
   annotations:
     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