build, salt, charts: Bump kube-prometheus-stack to 65.5.1

.devcontainer/Dockerfile

@@ -37,7 +37,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 USER vscode
 
 # Install helm
-ARG HELM_VERSION=3.14.4
+ARG HELM_VERSION=3.16.2
 
 RUN curl --fail -L -o /tmp/helm.tar.gz https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz && \
     sudo tar -zxvf /tmp/helm.tar.gz -C /usr/local/bin/ linux-amd64/helm --strip-components 1 && \

.github/workflows/pre-merge.yaml

@@ -135,7 +135,7 @@ jobs:
           python3.10 -m pip install tox~=4.0.11
       - name: Install Helm
         env:
-          HELM_VERSION: "3.10.0"
+          HELM_VERSION: "3.16.2"
         run: |
           sudo curl -O https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz \
               && sudo tar -zxvf helm-v${HELM_VERSION}-linux-amd64.tar.gz \

CHANGELOG.md

@@ -37,6 +37,33 @@
   [3.1.9](https://github.com/fluent/fluent-bit/releases/tag/v3.1.9)
   (PR[#4447](https://github.com/scality/metalk8s/pull/4447))
 
+- Bump kube-prometheus-stack chart version to
+  [65.5.1](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-65.5.1)
+  (PR[#4458](https://github.com/scality/metalk8s/pull/4458))
+
+  This change includes:
+
+  - Bump Prometheus container version to
+    [2.55.0](https://github.com/prometheus/prometheus/releases/tag/v2.55.0)
+  - Bump Thanos container version to
+    [0.36.1](https://github.com/thanos-io/thanos/releases/tag/v0.36.1)
+  - Bump grafana chart version to
+    [8.5.8](https://github.com/grafana/helm-charts/releases/tag/grafana-8.5.8),
+    Grafana container version to
+    [11.2.2-security-01](https://github.com/grafana/grafana/releases/tag/v11.2.2+security-01),
+    and kiwigrid/k8s-sidecar container version to
+    [1.28.0](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.28.0)
+  - Bump kube-state-metrics chart version to
+    [5.26.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-5.26.0)
+    and kube-state-metrics container version to
+    [2.13.0](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.13.0)
+  - Bump prometheus-node-exporter chart version to
+    [4.40.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.40.0)
+    and node-exporter container version to
+    [1.8.2](https://github.com/prometheus/node_exporter/releases/tag/v1.8.2)
+  - Bump prometheus-operator and prometheus-config-reloader containers version to
+    [0.77.2](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.77.2)
+
 ## Release 128.0.1 (in development)
 
 ## Release 128.0.0

buildchain/buildchain/versions.py

@@ -141,13 +141,13 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="grafana",
-        version="11.1.0",
-        digest="sha256:079600c9517b678c10cda6006b4487d3174512fd4c6cface37df7822756ed7a5",
+        version="11.2.2-security-01",
+        digest="sha256:464eac539793a183381ae198cb3bfcee137f17888ee192b8ac1ae2e867f72a9d",
     ),
     Image(
         name="k8s-sidecar",
-        version="1.26.1",
-        digest="sha256:b8d5067137fec093cf48670dc3a1dbb38f9e734f3a6683015c2e89a45db5fd16",
+        version="1.28.0",
+        digest="sha256:4166a019eeafd1f0fef4d867dc5f224f18d84ec8681dbb31f3ca258ecf07bcf2",
     ),
     Image(
         name="kube-apiserver",
@@ -171,8 +171,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="kube-state-metrics",
-        version="v2.12.0",
-        digest="sha256:b401fae262a5decf83c4311083f8efb4d6ca7b6a733e57b95344cb8dccd14e11",
+        version="v2.13.0",
+        digest="sha256:639a1e2da549210adddc0391ff91e270e83f7873014aec53258462812f741e6f",
     ),
     Image(
         name="nginx",
@@ -188,8 +188,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="node-exporter",
-        version="v1.8.1",
-        digest="sha256:fa7fa12a57eff607176d5c363d8bb08dfbf636b36ac3cb5613a202f3c61a6631",
+        version="v1.8.2",
+        digest="sha256:4032c6d5bfd752342c3e631c2f1de93ba6b86c41db6b167b9a35372c139e7706",
     ),
     Image(
         name="pause",
@@ -198,8 +198,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus",
-        version="v2.53.0",
-        digest="sha256:bc1794e85c9e00293351b967efa267ce6af1c824ac875a9d0c7ac84700a8b53e",
+        version="v2.55.0",
+        digest="sha256:378f4e03703557d1c6419e6caccf922f96e6d88a530f7431d66a4c4f4b1000fe",
     ),
     Image(
         name="prometheus-adapter",
@@ -208,18 +208,18 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-config-reloader",
-        version="v0.75.0",
-        digest="sha256:536f5709c0d8db50188d02c89ba3dd1df7be79124a7f624159ca3564b6168828",
+        version="v0.77.2",
+        digest="sha256:c96d4fb1d57f4e7a6504d8da7d1ee9254018039939842bf65e86563b66e5a14f",
     ),
     Image(
         name="prometheus-operator",
-        version="v0.75.0",
-        digest="sha256:f347f1b2445e486f1fb05c6ab0fa35adafc3b6510af66423d16da068b31a5dec",
+        version="v0.77.2",
+        digest="sha256:af92db7eac86d012085969ba2c4a5fb97b99cc2720dce805038b28ca4395ec4b",
     ),
     Image(
         name="thanos",
-        version="v0.35.1",
-        digest="sha256:567346c3f6ff2927c2c6c0daad977b2213f62d45eca54d48afd19e6deb902181",
+        version="v0.36.1",
+        digest="sha256:e542959e1b36d5046083d1b64a7049c356b68a44a173c58b3ae7c0c9ada932d5",
     ),
     # Local images
     Image(

charts/kube-prometheus-stack.yaml

@@ -1,6 +1,6 @@
 nameOverride: prometheus-operator
 
-kubeTargetVersionOverride: 1.28.0
+kubeTargetVersionOverride: 1.29.8
 
 commonLabels:
   # This needs to remain 'Tiller' for the render script to work properly
@@ -331,3 +331,5 @@ nodeExporter:
   operatingSystems:
     darwin:
       enabled: false
+    aix:
+      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.21.0
+  version: 5.26.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.37.0
+  version: 4.40.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 8.3.2
+  version: 8.5.8
 - name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 0.3.1
-digest: sha256:d0905cfd40198f6e7be6ac365c39f543dc51b13b59cfd5fb98c5308c2b2c59bc
-generated: "2024-07-09T14:48:14.237627583Z"
+  version: 0.7.1
+digest: sha256:7b40fa462f5dc4c9bc4c1013d1b7cac862f723d70df600a5d8c43e2bdf77a3ee
+generated: "2024-10-30T11:02:08.927724079Z"

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.75.0
+appVersion: v0.77.2
 dependencies:
 - condition: crds.enabled
   name: crds
@@ -16,19 +16,19 @@ dependencies:
 - condition: kubeStateMetrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 5.21.*
+  version: 5.26.*
 - condition: nodeExporter.enabled
   name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.37.*
+  version: 4.40.*
 - condition: grafana.enabled
   name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 8.3.*
+  version: 8.5.*
 - condition: windowsMonitoring.enabled
   name: prometheus-windows-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 0.3.*
+  version: 0.7.*
 description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards,
   and Prometheus rules combined with documentation and scripts to provide easy to
   operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus
@@ -62,4 +62,4 @@ sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 61.3.0
+version: 65.5.1

charts/kube-prometheus-stack/README.md

@@ -82,6 +82,83 @@ _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 64.x to 65.x
+
+This version upgrades Prometheus-Operator to v0.77.1
+
+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.77.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
+### From 63.x to 64.x
+
+v64 reverts the v63 release.
+
+All changes mentioned in the v63 release notes must be reverted.
+
+### From 62.x to 63.x
+
+Simplify setting empty selectors, by deprecating `*SelectorNilUsesHelmValues` properties.  
+Instead, setting `*Selector.matchLabels=null` will create an empty selector.
+
+If you set one of the following properties to `false`, you will have to convert them:
+
+- `prometheus.prometheusSpec.podMonitorSelectorNilUsesHelmValues`
+- `prometheus.prometheusSpec.probeSelectorNilUsesHelmValues`
+- `prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues`
+- `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues`
+- `prometheus.prometheusSpec.scrapeConfigSelectorNilUsesHelmValues`
+- `thanosRuler.thanosRulerSpec.ruleSelectorNilUsesHelmValues`
+
+For example:
+
+```yaml
+prometheus:
+  prometheusSpec:
+    scrapeConfigSelectorNilUsesHelmValues: false
+```
+
+Becomes:
+
+```yaml
+prometheus:
+  prometheusSpec:
+    scrapeConfigSelector:
+      matchLabels: null
+```
+
+Note that `externalPrefixNilUsesHelmValues` remains as is.
+
+### From 61.x to 62.x
+
+This version upgrades Prometheus-Operator to v0.76.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.76.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 60.x to 61.x
 
 This version upgrades Prometheus-Operator to v0.75.0