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

CHANGELOG.md

@@ -13,6 +13,35 @@
 - Bump Calico version to [3.26.1](https://github.com/projectcalico/calico/releases/tag/v3.26.1)
   (PR[#4090](https://github.com/scality/metalk8s/pull/4090))
 
+- Bump kube-prometheus-stack chart version to
+  [48.1.1](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-48.1.1)
+  (PR[#4097](https://github.com/scality/metalk8s/pull/4097))
+
+  This change includes:
+
+  - Bump Prometheus container version to
+    [2.45.0](https://github.com/prometheus/prometheus/releases/tag/v2.45.0)
+  - Bump Thanos chart version to 
+    [0.4.9](https://artifacthub.io/packages/helm/banzaicloud-stable/thanos/0.4.9),
+    Thanos container version to
+    [0.31.0](https://github.com/thanos-io/thanos/releases/tag/v0.31.0)
+  - Bump grafana chart version to
+    [6.58.2](https://github.com/grafana/helm-charts/releases/tag/grafana-6.58.2),
+    Grafana container version to
+    [10.0.1](https://github.com/grafana/grafana/releases/tag/v10.0.1),
+    and kiwigrid/k8s-sidecar container version to
+    [1.24.6](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.24.6)
+  - Bump kube-state-metrics chart version to
+    [4.31.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-state-metrics-4.31.0)
+    and kube-state-metrics container version to
+    [2.9.2](https://github.com/kubernetes/kube-state-metrics/releases/tag/v2.9.2)
+  - Bump prometheus-node-exporter chart version to
+    [4.18.1](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-node-exporter-4.18.1)
+    and node-exporter container version to
+    [1.6.0](https://github.com/prometheus/node_exporter/releases/tag/v1.6.0)
+  - Bump prometheus-operator and prometheus-config-reloader containers version to
+    [0.66.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.66.0)
+
 - Bump ingress-nginx chart version to
   [4.7.1](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.7.1)
   The controller image has been bumped accordingly to

buildchain/buildchain/constants.py

@@ -27,7 +27,7 @@
 GRAFANA_REPOSITORY: str = "docker.io/grafana"
 INGRESS_REPOSITORY: str = "k8s.gcr.io/ingress-nginx"
 KIWIGRID_REPOSITORY: str = "quay.io/kiwigrid"
-KUBE_STATE_METRICS_REPOSITORY: str = "k8s.gcr.io/kube-state-metrics"
+KUBE_STATE_METRICS_REPOSITORY: str = f"{K8S_REPOSITORY}/kube-state-metrics"
 PROMETHEUS_ADAPTER_REPOSITORY: str = f"{K8S_REPOSITORY}/prometheus-adapter"
 PROMETHEUS_OPERATOR_REPOSITORY: str = "quay.io/prometheus-operator"
 PROMETHEUS_REPOSITORY: str = "quay.io/prometheus"

buildchain/buildchain/versions.py

@@ -134,13 +134,13 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="grafana",
-        version="9.3.8-ubuntu",
-        digest="sha256:46868e7c0881353e53feb87830abcda380b4d67bff5236948358d4722c422f47",
+        version="10.0.1-ubuntu",
+        digest="sha256:658b92200bef14ded34fd371f0c62551cf1fedf64a6cf4f2bdb9611b7015cd23",
     ),
     Image(
         name="k8s-sidecar",
-        version="1.22.3",
-        digest="sha256:84257a97a259f8143061771f7ccd5c551ca0075d22c2dac175fe6c4ee5101803",
+        version="1.24.6",
+        digest="sha256:3b70b9f1a81e67c97e4cd32c9a918fa44fd2c9f66bdd0d28d8b82d7b502cb5e4",
     ),
     Image(
         name="kube-apiserver",
@@ -164,8 +164,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="kube-state-metrics",
-        version="v2.8.0",
-        digest="sha256:5658d0011a41779ef114f3508143a0e67e4169f64333d0337e731d191ab7edb8",
+        version="v2.9.2",
+        digest="sha256:5ac2e67a862cd3baa0eb4fd7683d54928fd76ea3a61cde50508922c956901d8c",
     ),
     Image(
         name="nginx",
@@ -186,8 +186,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="node-exporter",
-        version="v1.5.0",
-        digest="sha256:39c642b2b337e38c18e80266fb14383754178202f40103646337722a594d984c",
+        version="v1.6.0",
+        digest="sha256:d2e48098c364e61ee62d9016eed863b66331d87cf67146f2068b70ed9d9b4f98",
     ),
     Image(
         name="pause",
@@ -196,8 +196,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus",
-        version="v2.42.0",
-        digest="sha256:d2ab0a27783fd4ad96a8853e2847b99a0be0043687b8a5d1ebfb2dd3fa4fd1b8",
+        version="v2.45.0",
+        digest="sha256:9309deb7c981e8a94584d9ed689fd62f7ac4549d816fd3881550311cf056a237",
     ),
     Image(
         name="prometheus-adapter",
@@ -206,18 +206,18 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-config-reloader",
-        version="v0.63.0",
-        digest="sha256:3f976422884ec7744f69084da7736927eb634914a0c035d5a865cf6a6b8eb1b0",
+        version="v0.66.0",
+        digest="sha256:b7493034219c1465ff84d47dc8a8f337ed15465d1143e6ef3af3ba995d128a5c",
     ),
     Image(
         name="prometheus-operator",
-        version="v0.63.0",
-        digest="sha256:be4fbe0cfcad639e7a9ce40274917e1e30a3cae045ae27cde35ac84739fdef40",
+        version="v0.66.0",
+        digest="sha256:9c55b6970e37fb734c153e6c6acace285be98d095e8b221f93e38a6b179e1222",
     ),
     Image(
         name="thanos",
-        version="v0.30.2",
-        digest="sha256:6b97f63c716781c487da88750850cf5a4e0a1c23af32764e97faefc1383432b1",
+        version="v0.31.0",
+        digest="sha256:e7d337d6ac2aea3f0f9314ec9830291789e16e2b480b9d353be02d05ce7f2a7e",
     ),
     # Local images
     Image(

charts/kube-prometheus-stack.yaml

@@ -1,6 +1,6 @@
 nameOverride: prometheus-operator
 
-kubeTargetVersionOverride: 1.25.0
+kubeTargetVersionOverride: 1.26.0
 
 commonLabels:
   # This needs to remain 'Tiller' for the render script to work properly
@@ -169,12 +169,11 @@ grafana:
 
   image:
     repository: '__image__(grafana)'
-    tag: '9.3.8-ubuntu'
+    tag: '10.0.1-ubuntu'
 
   sidecar:
     image:
       repository: '__image__(k8s-sidecar)'
-      tag: '1.22.3'
 
     dashboards:
       searchNamespace: ALL
@@ -238,7 +237,8 @@ kube-state-metrics:
         metalk8s.scality.com/monitor: ''
 
   image:
-    repository: '__image__(kube-state-metrics)'
+    registry: '__var__(repo.registry_endpoint)'
+    repository: '__image_no_reg__(kube-state-metrics)'
 
   nodeSelector:
     node-role.kubernetes.io/infra: ''

charts/kube-prometheus-stack/Chart.lock

@@ -1,12 +1,18 @@
 dependencies:
+- name: crds
+  repository: ""
+  version: 0.0.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.31.0
+  version: 5.8.2
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.14.0
+  version: 4.18.1
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.51.2
-digest: sha256:691dfd1454d47d1ba0aaf5cd31b37cdc887c086320abc48d6899fe208302aadf
-generated: "2023-03-02T11:53:54.589074835Z"
+  version: 6.58.2
+- name: prometheus-windows-exporter
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 0.1.0
+digest: sha256:7d389fd2ee69d1e9dc486fec6fe8e38f0e88b8891d57b9f284e9ec460a9bc81f
+generated: "2023-07-13T14:08:47.800418365Z"

charts/kube-prometheus-stack/Chart.yaml

@@ -7,20 +7,28 @@ annotations:
       url: https://github.com/prometheus-operator/kube-prometheus
   artifacthub.io/operator: "true"
 apiVersion: v2
-appVersion: v0.63.0
+appVersion: v0.66.0
 dependencies:
+- condition: crds.enabled
+  name: crds
+  repository: ""
+  version: 0.0.0
 - condition: kubeStateMetrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.31.*
+  version: 5.8.*
 - condition: nodeExporter.enabled
   name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
-  version: 4.14.*
+  version: 4.18.*
 - condition: grafana.enabled
   name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.51.*
+  version: 6.58.*
+- condition: windowsMonitoring.enabled
+  name: prometheus-windows-exporter
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 0.1.*
 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
@@ -52,4 +60,4 @@ sources:
 - https://github.com/prometheus-community/helm-charts
 - https://github.com/prometheus-operator/kube-prometheus
 type: application
-version: 45.5.0
+version: 48.1.1

charts/kube-prometheus-stack/README.md

@@ -59,8 +59,10 @@ kubectl delete crd alertmanagerconfigs.monitoring.coreos.com
 kubectl delete crd alertmanagers.monitoring.coreos.com
 kubectl delete crd podmonitors.monitoring.coreos.com
 kubectl delete crd probes.monitoring.coreos.com
+kubectl delete crd prometheusagents.monitoring.coreos.com
 kubectl delete crd prometheuses.monitoring.coreos.com
 kubectl delete crd prometheusrules.monitoring.coreos.com
+kubectl delete crd scrapeconfigs.monitoring.coreos.com
 kubectl delete crd servicemonitors.monitoring.coreos.com
 kubectl delete crd thanosrulers.monitoring.coreos.com
 ```
@@ -80,9 +82,54 @@ _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 47.x to 48.x
+
+This version moved all CRDs into a dedicated sub-chart. No new CRDs are introduced in this version.
+See [#3548](https://github.com/prometheus-community/helm-charts/issues/3548) for more context.
+
+We do not expect any breaking changes in this version.
+
+### From 46.x to 47.x
+
+This version upgrades Prometheus-Operator to v0.66.0 with new CRDs (PrometheusAgent and ScrapeConfig).
+
+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.66.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
+### From 45.x to 46.x
+
+This version upgrades Prometheus-Operator to v0.65.1 with new CRDs (PrometheusAgent and ScrapeConfig), Prometheus to v2.44.0 and Thanos to v0.31.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.65.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
+kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.65.1/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+```
+
 ### From 44.x to 45.x
 
-This version upgrades Prometheus-Operator to v0.63.0, Prometheus to v2.43.0 and Thanos to v0.30.2.
+This version upgrades Prometheus-Operator to v0.63.0, Prometheus to v2.42.0 and Thanos to v0.30.2.
 
 Run these commands to update the CRDs before applying the upgrade.
 

charts/kube-prometheus-stack/charts/crds/Chart.yaml

@@ -0,0 +1,3 @@
+apiVersion: v2
+name: crds
+version: 0.0.0

charts/kube-prometheus-stack/charts/crds/README.md

@@ -0,0 +1,3 @@
+# crds subchart
+
+See: [https://github.com/prometheus-community/helm-charts/issues/3548](https://github.com/prometheus-community/helm-charts/issues/3548)

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

@@ -1,4 +1,4 @@
-# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.66.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -2696,9 +2696,9 @@ spec:
                               signing process to sign requests.
                             properties:
                               accessKey:
-                                description: AccessKey is the AWS API key. If blank,
-                                  the environment variable `AWS_ACCESS_KEY_ID` is
-                                  used.
+                                description: AccessKey is the AWS API key. If not
+                                  specified, the environment variable `AWS_ACCESS_KEY_ID`
+                                  is used.
                                 properties:
                                   key:
                                     description: The key of the secret to select from.  Must
@@ -2731,8 +2731,8 @@ spec:
                                   to authenticate.
                                 type: string
                               secretKey:
-                                description: SecretKey is the AWS API secret. If blank,
-                                  the environment variable `AWS_SECRET_ACCESS_KEY`
+                                description: SecretKey is the AWS API secret. If not
+                                  specified, the environment variable `AWS_SECRET_ACCESS_KEY`
                                   is used.
                                 properties:
                                   key: