buildchain: test pulling prom from cgr

scality · Nov 4, 2024 · a45c2da · a45c2da
1 parent 8fc8b72
commit a45c2da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/buildchain/buildchain/image.py b/buildchain/buildchain/image.py
@@ -205,7 +205,6 @@ def _local_image(name: str, **kwargs: Any) -> targets.LocalImage:
     constants.PROMETHEUS_REPOSITORY: [
         "alertmanager",
         "node-exporter",
-        "prometheus",
     ],
     constants.THANOS_REPOSITORY: [
         "thanos",
@@ -219,6 +218,7 @@ def _local_image(name: str, **kwargs: Any) -> targets.LocalImage:
     constants.CHAINGUARD_REPOSITORY: [
         "cert-manager-controller",
         "etcd",
+        "prometheus",
     ],
 }
 

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -198,8 +198,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus",
-        version="v2.55.0",
-        digest="sha256:378f4e03703557d1c6419e6caccf922f96e6d88a530f7431d66a4c4f4b1000fe",
+        version="2.55.0",
+        digest="sha256:c0907ae3a99e682698d7b539e61649f6479747a356038cbfdffb4ee56cae71b1",
     ),
     Image(
         name="prometheus-adapter",

diff --git a/charts/kube-prometheus-stack.yaml b/charts/kube-prometheus-stack.yaml
@@ -109,6 +109,7 @@ prometheus:
     image:
       registry: '__var__(repo.registry_endpoint)'
       repository: '__image_no_reg__(prometheus)'
+      tag: 2.55.0
 
     tolerations:
       - key: 'node-role.kubernetes.io/bootstrap'

diff --git a/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls b/salt/metalk8s/addons/prometheus-operator/deployed/chart.sls
@@ -72118,7 +72118,7 @@ spec:
   enableAdminAPI: {% endraw -%}{{ prometheus.spec.config.enable_admin_api }}{%- raw %}
   externalUrl: http://prometheus-operator-prometheus.metalk8s-monitoring:9090
   hostNetwork: false
-  image: {% endraw -%}{{ repo.registry_endpoint }}{%- raw %}/{% endraw -%}{{ build_image_name("prometheus", False, False) }}{%- raw %}:v2.55.0
+  image: {% endraw -%}{{ repo.registry_endpoint }}{%- raw %}/{% endraw -%}{{ build_image_name("prometheus", False, False) }}{%- raw %}:2.55.0
   listenLocal: false
   logFormat: logfmt
   logLevel: info
@@ -72182,7 +72182,7 @@ spec:
     operator: Exists
   tsdb:
     outOfOrderTimeWindow: 0s
-  version: v2.55.0
+  version: 2.55.0
   walCompression: true
 ---
 apiVersion: monitoring.coreos.com/v1