From 2577b8fea66caf790bd72ef30602e28dfd626465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 18 Feb 2025 15:35:08 +0100
Subject: [PATCH] Amend 7bc0f837 (rebase FMN to python 3.12 to get a newer
 nodejs)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 roles/openshift-apps/fmn/files/imagestream.yml        | 10 +++++-----
 roles/openshift-apps/fmn/templates/buildconfig.yml.j2 | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/openshift-apps/fmn/files/imagestream.yml b/roles/openshift-apps/fmn/files/imagestream.yml
index 48af749226..255aee7d19 100644
--- a/roles/openshift-apps/fmn/files/imagestream.yml
+++ b/roles/openshift-apps/fmn/files/imagestream.yml
@@ -7,11 +7,11 @@ items:
     kind: ImageStream
     metadata:
       name: fmn
-  # The Python 3.10 builder image
+  # The Python 3.12 builder image
   - apiVersion: image.openshift.io/v1
     kind: ImageStream
     metadata:
-      name: python-310
+      name: python-312
     spec:
       lookupPolicy:
         local: false
@@ -19,16 +19,16 @@ items:
         - name: latest
           from:
             kind: DockerImage
-            name: quay.io/fedora/python-310:latest
+            name: quay.io/fedora/python-312:latest
           importPolicy:
             scheduled: true
           referencePolicy:
             type: Source
-  # The Python 3.10 builder image plus collectd
+  # The Python builder image plus collectd
   - apiVersion: image.openshift.io/v1
     kind: ImageStream
     metadata:
-      name: python-310-collectd
+      name: python-312-collectd
   # Sendria (to view email notifications in staging)
   - apiVersion: image.openshift.io/v1
     kind: ImageStream
diff --git a/roles/openshift-apps/fmn/templates/buildconfig.yml.j2 b/roles/openshift-apps/fmn/templates/buildconfig.yml.j2
index a01a2ac445..09704fdd0b 100644
--- a/roles/openshift-apps/fmn/templates/buildconfig.yml.j2
+++ b/roles/openshift-apps/fmn/templates/buildconfig.yml.j2
@@ -3,10 +3,10 @@
 apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
-  name: python-310-collectd
+  name: python-312-collectd
   labels:
     app: fmn
-    build: python-310-collectd
+    build: python-312-collectd
 spec:
   runPolicy: Serial
   source:
@@ -18,11 +18,11 @@ spec:
     dockerStrategy:
       from:
         kind: ImageStreamTag
-        name: python-310:latest
+        name: python-312:latest
   output:
     to:
       kind: ImageStreamTag
-      name: python-310-collectd:latest
+      name: python-312-collectd:latest
   triggers:
   - type: ImageChange
 ---
@@ -47,7 +47,7 @@ spec:
       from:
         kind: ImageStreamTag
         # Our own ImageStream with collectd added to it
-        name: python-310-collectd:latest
+        name: python-312-collectd:latest
       env:
       # The .s2i/bin/assemble script uses this to build the frontend with the
       # correct API and Ipsilon addresses.