Merge branch 'improvement/bump-prometheus-adapter-4.11.0' into q/129.0

scality · Nov 8, 2024 · ea7a2d5 · ea7a2d5
2 parents 9f07dac + 8ef0805
commit ea7a2d5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,12 @@
   - 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)
 
+- Bump Prometheus Adapter chart version to
+  [4.11.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.11.0)
+  The prometheus-adapter image has been bumped accordingly to
+  [v0.12.0](https://github.com/kubernetes-sigs/prometheus-adapter/releases/tag/v0.12.0)
+  (PR[#4453](https://github.com/scality/metalk8s/pull/4453))
+
 ## Release 128.0.1 (in development)
 
 ## Release 128.0.0

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -203,8 +203,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-adapter",
-        version="v0.11.2",
-        digest="sha256:4a3148185b8cdd3f938f938843de8a930041e81a6c069a121425344ed8384275",
+        version="v0.12.0",
+        digest="sha256:932eae60e2bcf9c4660d6442da066ef1a79b4ea7cc232c61c7303069216ca006",
     ),
     Image(
         name="prometheus-config-reloader",

diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.11.2
+appVersion: v0.12.0
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter
 keywords:
@@ -17,4 +17,4 @@ name: prometheus-adapter
 sources:
 - https://github.com/kubernetes/charts
 - https://github.com/kubernetes-sigs/prometheus-adapter
-version: 4.10.0
+version: 4.11.0
diff --git a/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls b/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls
@@ -16,8 +16,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -129,8 +129,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -144,8 +144,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -171,8 +171,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-server-resources
   namespace: metalk8s-monitoring
@@ -193,8 +193,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-metrics
   namespace: metalk8s-monitoring
@@ -219,8 +219,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-system-auth-delegator
   namespace: metalk8s-monitoring
@@ -242,8 +242,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -265,8 +265,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller
   namespace: metalk8s-monitoring
@@ -288,8 +288,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller-metrics
   namespace: metalk8s-monitoring
@@ -311,8 +311,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter-auth-reader
   namespace: kube-system
@@ -334,8 +334,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -359,8 +359,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -378,15 +378,15 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 0257f9a40e556d94d2a53c6165da9a11964bb7904ebcb93e03f04da1c8522440
+        checksum/config: 97ca6e9c3c8caba2e2aba1d72f3c8c5da8157421a2682c11ebc7e29c6980835c
       labels:
         app.kubernetes.io/component: metrics
         app.kubernetes.io/instance: prometheus-adapter
         app.kubernetes.io/managed-by: salt
         app.kubernetes.io/name: prometheus-adapter
         app.kubernetes.io/part-of: metalk8s
-        app.kubernetes.io/version: v0.11.2
-        helm.sh/chart: prometheus-adapter-4.10.0
+        app.kubernetes.io/version: v0.12.0
+        helm.sh/chart: prometheus-adapter-4.11.0
         heritage: metalk8s
       name: prometheus-adapter
     spec:
@@ -401,7 +401,7 @@ spec:
         - --v=4
         - --config=/etc/adapter/config.yaml
         image: '{%- endraw -%}{{ build_image_name("prometheus-adapter", False) }}{%-
-          raw -%}:v0.11.2'
+          raw -%}:v0.12.0'
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -466,8 +466,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: v1beta1.custom.metrics.k8s.io
   namespace: metalk8s-monitoring
@@ -490,8 +490,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.11.2
-    helm.sh/chart: prometheus-adapter-4.10.0
+    app.kubernetes.io/version: v0.12.0
+    helm.sh/chart: prometheus-adapter-4.11.0
     heritage: metalk8s
   name: v1beta1.metrics.k8s.io
   namespace: metalk8s-monitoring