From 1939f7e011c570b0ea6939502f82e4d2f9e6e41d Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Mon, 14 Nov 2022 17:15:16 +0100
Subject: [PATCH] build,charts,salt: Bump k8s-sidecar image to 1.21.0

---
 CHANGELOG.md                                                | 6 ++++++
 buildchain/buildchain/versions.py                           | 4 ++--
 charts/kube-prometheus-stack.yaml                           | 1 +
 salt/metalk8s/addons/prometheus-operator/deployed/chart.sls | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca4ec5e21d..f3dc047d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # CHANGELOG
 ## Release 124.1.0 (in development)
 
+### Enhancements
+
+- Bump k8s-sidecar version to
+  [1.21.0](https://github.com/kiwigrid/k8s-sidecar/releases/tag/1.21.0)
+  (PR[#3910](https://github.com/scality/metalk8s/pull/3910))
+
 ## Release 124.0.1 (in development)
 
 ## Release 124.0.0
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index 4212e59b18..5618d59d28 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -139,8 +139,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="k8s-sidecar",
-        version="1.15.6",
-        digest="sha256:1f025ae37b7b20d63bffd179e5e6f972039dd53d9646388c0a8c456229c7bbcb",
+        version="1.21.0",
+        digest="sha256:710e23b489c5cad305fdcffd6ee3b5578f6a5a1bb73b7c181a05b5be068a0d6b",
     ),
     Image(
         name="kube-apiserver",
diff --git a/charts/kube-prometheus-stack.yaml b/charts/kube-prometheus-stack.yaml
index 13f771b611..eef15ba687 100644
--- a/charts/kube-prometheus-stack.yaml
+++ b/charts/kube-prometheus-stack.yaml
@@ -165,6 +165,7 @@ grafana:
   sidecar:
     image:
       repository: '__image__(k8s-sidecar)'
+      tag: 1.21.0
 
     dashboards:
       searchNamespace: ALL
diff --git a/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls b/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
index d7455f987c..03f5e1d8c0 100644
--- a/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
+++ b/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
@@ -64445,7 +64445,7 @@ spec:
           value: ALL
         - name: FOLDER_ANNOTATION
           value: metalk8s.scality.com/grafana-folder-name
-        image: {% endraw -%}{{ build_image_name("k8s-sidecar", False) }}{%- raw %}:1.15.6
+        image: {% endraw -%}{{ build_image_name("k8s-sidecar", False) }}{%- raw %}:1.21.0
         imagePullPolicy: IfNotPresent
         name: grafana-sc-dashboard
         resources: {}
@@ -64477,7 +64477,7 @@ spec:
           value: http://localhost:3000/api/admin/provisioning/datasources/reload
         - name: REQ_METHOD
           value: POST
-        image: {% endraw -%}{{ build_image_name("k8s-sidecar", False) }}{%- raw %}:1.15.6
+        image: {% endraw -%}{{ build_image_name("k8s-sidecar", False) }}{%- raw %}:1.21.0
         imagePullPolicy: IfNotPresent
         name: grafana-sc-datasources
         resources: {}