mage:alertmanager: Use RH image (#722)

rhobs · Jan 17, 2025 · 54682de · 54682de
1 parent 7bee8d7
commit 54682de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/magefiles/alertmanager.go b/magefiles/alertmanager.go
@@ -28,9 +28,8 @@ const (
 
 	defaultAlertmanagerReplicas = 2
 
-	defaultAlertManagerImage    = "quay.io/prometheus/alertmanager"
-	defaultAlertManagerImageTag = "v0.26.0"
-
+	defaultAlertManagerImage     = "registry.redhat.io/openshift4/ose-prometheus-alertmanager"
+	defaultAlertManagerImageTag  = "v4.15"
 	alertmanagerConfigSecretName = "alertmanager-config"
 	alertmanagerConfigSecretKey  = "alertmanager.yaml"
 	alertmanagerTLSSecret        = "alertmanager-tls"

diff --git a/resources/services/alertmanager/staging/alertmanager-template.yaml b/resources/services/alertmanager/staging/alertmanager-template.yaml
@@ -41,7 +41,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.26.0
+      app.kubernetes.io/version: v4.15
     name: alertmanager
     namespace: rhobs-stage
   spec:
@@ -139,7 +139,7 @@ objects:
       app.kubernetes.io/instance: observatorium
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: observatorium
-      app.kubernetes.io/version: v0.26.0
+      app.kubernetes.io/version: v4.15
     name: alertmanager
     namespace: rhobs-stage
   spec:
@@ -159,7 +159,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: alertmanager
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.26.0
+          app.kubernetes.io/version: v4.15
         namespace: rhobs-stage
       spec:
         affinity:
@@ -187,7 +187,7 @@ objects:
           - --cluster.reconnect-timeout=5m0s
           - --log.level=${ALERTMANAGER_LOG_LEVEL}
           - --log.format=logfmt
-          image: quay.io/prometheus/alertmanager:v0.26.0
+          image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:v4.15
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 8
@@ -276,7 +276,7 @@ objects:
           app.kubernetes.io/instance: observatorium
           app.kubernetes.io/name: alertmanager
           app.kubernetes.io/part-of: observatorium
-          app.kubernetes.io/version: v0.26.0
+          app.kubernetes.io/version: v4.15
         name: alertmanager-data
         namespace: rhobs-stage
       spec: