From 8acb0b90ae2590cb372b824c693687c7e9961292 Mon Sep 17 00:00:00 2001
From: Francois Andrieu <darknao@fedoraproject.org>
Date: Fri, 16 Feb 2024 12:04:36 +0100
Subject: [PATCH] mote: migrate DeploymentConfigs to Deployments

---
 .../mote/templates/fedmsg-dc.yml              | 20 ++++++----------
 .../openshift-apps/mote/templates/mote-dc.yml | 24 ++++++-------------
 .../mote/templates/mote-worker-dc.yml         | 24 ++++++-------------
 .../mote/templates/redis-dc.yml               | 19 ++++++---------
 4 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/roles/openshift-apps/mote/templates/fedmsg-dc.yml b/roles/openshift-apps/mote/templates/fedmsg-dc.yml
index d6725d6b0d..ae9e95b448 100644
--- a/roles/openshift-apps/mote/templates/fedmsg-dc.yml
+++ b/roles/openshift-apps/mote/templates/fedmsg-dc.yml
@@ -1,13 +1,17 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: fedmsg
   labels:
     app: fedmsg
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"mote:latest","namespace":"mote"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedmsg\")].image","pause":"false"}]
 spec:
   replicas: 1
   selector:
-    app: fedmsg
+    matchLabels:
+      app: fedmsg
   template:
     metadata:
       labels:
@@ -49,13 +53,3 @@ spec:
           name: fedora-messaging
         name: fedmsg-config
       restartPolicy: Always
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      from:
-        kind: ImageStreamTag
-        name: mote:latest
-      containerNames:
-      - "fedmsg"
diff --git a/roles/openshift-apps/mote/templates/mote-dc.yml b/roles/openshift-apps/mote/templates/mote-dc.yml
index cc3e9b9c9f..2397ada427 100644
--- a/roles/openshift-apps/mote/templates/mote-dc.yml
+++ b/roles/openshift-apps/mote/templates/mote-dc.yml
@@ -1,14 +1,18 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: mote
   labels:
     app: mote
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"mote:latest","namespace":"mote"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mote\")].image","pause":"false"}]
 spec:
   replicas: 1
   revisionHistoryLimit: 5
   selector:
-    app: mote
+    matchLabels:
+      app: mote
   template:
     metadata:
       labels:
@@ -25,11 +29,7 @@ spec:
               name: redis-password
               key: password
         volumeMounts:
-{% if env == 'staging' %}
         - mountPath: /srv
-{% else %}
-        - mountPath: /srv
-{% endif %}
           name: meetbot
         - mountPath: /opt/app/mote/config.py
           name: mote-config
@@ -71,13 +71,3 @@ spec:
           name: mote
         name: mote-config
       restartPolicy: Always
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      from:
-        kind: ImageStreamTag
-        name: mote:latest
-      containerNames:
-      - "mote"
diff --git a/roles/openshift-apps/mote/templates/mote-worker-dc.yml b/roles/openshift-apps/mote/templates/mote-worker-dc.yml
index 6341cbf740..269c6acacd 100644
--- a/roles/openshift-apps/mote/templates/mote-worker-dc.yml
+++ b/roles/openshift-apps/mote/templates/mote-worker-dc.yml
@@ -1,14 +1,18 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: mote-worker
   labels:
     app: mote-worker
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"mote:latest","namespace":"mote"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mote-worker\")].image","pause":"false"}]
 spec:
   replicas: 1
   revisionHistoryLimit: 5
   selector:
-    app: mote-worker
+    matchLabels:
+      app: mote-worker
   template:
     metadata:
       labels:
@@ -33,11 +37,7 @@ spec:
         name: mote-worker
         imagePullPolicy: IfNotPresent
         volumeMounts:
-{% if env == 'staging' %}
         - mountPath: /srv
-{% else %}
-        - mountPath: /srv
-{% endif %}
           name: meetbot
         - mountPath: /opt/app/mote/config.py
           name: mote-config
@@ -59,13 +59,3 @@ spec:
           name: mote
         name: mote-config
       restartPolicy: Always
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      from:
-        kind: ImageStreamTag
-        name: mote:latest
-      containerNames:
-      - "mote-worker"
diff --git a/roles/openshift-apps/mote/templates/redis-dc.yml b/roles/openshift-apps/mote/templates/redis-dc.yml
index 901b32248e..f026c81a1d 100644
--- a/roles/openshift-apps/mote/templates/redis-dc.yml
+++ b/roles/openshift-apps/mote/templates/redis-dc.yml
@@ -1,13 +1,17 @@
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: redis
   labels:
     app: redis
+  annotations:
+    image.openshift.io/triggers: >-
+      [{"from":{"kind":"ImageStreamTag","name":"redis:latest","namespace":"mote"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image","pause":"false"}]
 spec:
   replicas: 1
   selector:
-    app: redis
+    matchLabels:
+      app: redis
   template:
     metadata:
       labels:
@@ -37,12 +41,3 @@ spec:
       - emptyDir: {}
         name: redis-data
       restartPolicy: Always
-  triggers:
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      from:
-        kind: ImageStreamTag
-        name: redis:latest
-      containerNames:
-      - "redis"