Fix deployment triggers

The annotations must be on the deployment's metadata, not on the pod
template's metadata.

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

roles/openshift-apps/badges/templates/deployment.yml.j2

@@ -205,6 +205,8 @@ metadata:
     app: badges
     service: redis
     deployment: redis
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -218,8 +220,6 @@ spec:
         app: badges
         service: redis
         deployment: redis
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image"}]'
     spec:
       containers:
         - name: redis

roles/openshift-apps/bodhi/templates/deployment.yml.j2

@@ -3,9 +3,11 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: bodhi-web
   labels:
     app: bodhi-web
-  name: bodhi-web
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-web\")].image"}]'
 spec:
   replicas: {{ bodhi_openshift_pods }}
   selector:
@@ -20,8 +22,6 @@ spec:
 {% if env == "staging" %}
         monitoring-key: cpe
 {% endif %}
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-web\")].image"}]'
     spec:
       initContainers:
       - name: alembic-upgrade
@@ -125,9 +125,11 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: bodhi-consumer
   labels:
     app: bodhi-consumer
-  name: bodhi-consumer
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-consumer\")].image"}]'
 spec:
 {% if env == 'staging' %}
   replicas: {{ bodhi_openshift_pods_stg_consumers }}
@@ -146,8 +148,6 @@ spec:
     metadata:
       labels:
         app: bodhi-consumer
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-consumer\")].image"}]'
     spec:
       containers:
       - name: bodhi-consumer
@@ -207,14 +207,16 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: bodhi-celery
   labels:
     app: bodhi-celery
-  name: bodhi-celery
 spec:
   replicas: {{ bodhi_openshift_pods }}
   selector:
     matchLabels:
       app: bodhi-celery
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-celery\")].image"}]'
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -224,8 +226,6 @@ spec:
     metadata:
       labels:
         app: bodhi-celery
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-celery\")].image"}]'
     spec:
       containers:
       - name: bodhi-celery
@@ -288,6 +288,8 @@ metadata:
   labels:
     app: bodhi-celery-beat
   name: bodhi-celery-beat
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-celery-beat\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -302,8 +304,6 @@ spec:
     metadata:
       labels:
         app: bodhi-celery-beat
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-base:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-celery-beat\")].image"}]'
     spec:
       containers:
       - name: bodhi-celery-beat
@@ -365,9 +365,11 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: bodhi-valkey
   labels:
     app: bodhi-valkey
-  name: bodhi-valkey
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-valkey:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-valkey\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -379,8 +381,6 @@ spec:
     metadata:
       labels:
         app: bodhi-valkey
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bodhi-valkey:latest","namespace":"bodhi"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bodhi-valkey\")].image"}]'
     spec:
       containers:
       - name: bodhi-valkey

roles/openshift-apps/bugzilla2fedmsg/templates/deployment.yml.j2

@@ -6,6 +6,8 @@ metadata:
   labels:
     app: bugzilla2fedmsg
     service: bugzilla2fedmsg
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bugzilla2fedmsg:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bugzilla2fedmsg\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -16,8 +18,6 @@ spec:
     metadata:
       labels:
         app: bugzilla2fedmsg
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"bugzilla2fedmsg:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"bugzilla2fedmsg\")].image"}]'
     spec:
       containers:
       - name: bugzilla2fedmsg

roles/openshift-apps/datagrepper/templates/deployment.yml.j2

@@ -5,6 +5,8 @@ metadata:
   name: datagrepper
   labels:
     app: Datagrepper
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"datagrepper:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"datagrepper\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -19,8 +21,6 @@ spec:
     metadata:
       labels:
         app: Datagrepper
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"datagrepper:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"datagrepper\")].image"}]'
     spec:
       containers:
       - name: datagrepper

roles/openshift-apps/datanommer/templates/deployment.yml.j2

@@ -5,6 +5,8 @@ metadata:
   name: datanommer
   labels:
     app: Datanommer
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"datanommer:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"datanommer\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -16,8 +18,6 @@ spec:
     metadata:
       labels:
         app: Datanommer
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"datanommer:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"datanommer\")].image"}]'
     spec:
       initContainers:
       - name: alembic-upgrade

roles/openshift-apps/discourse2fedmsg/templates/deployment.yml.j2

@@ -2,10 +2,12 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: discourse2fedmsg
   labels:
     app: discourse2fedmsg
     service: discourse2fedmsg
-  name: discourse2fedmsg
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"discourse2fedmsg:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"discourse2fedmsg\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -16,8 +18,6 @@ spec:
     metadata:
       labels:
         app: discourse2fedmsg
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"discourse2fedmsg:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"discourse2fedmsg\")].image"}]'
     spec:
       containers:
       - name: discourse2fedmsg

roles/openshift-apps/fasjson/templates/deployment.yml.j2

@@ -5,6 +5,8 @@ metadata:
   name: fasjson
   labels:
     app: fasjson
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fasjson:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fasjson\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -19,8 +21,6 @@ spec:
     metadata:
       labels:
         app: fasjson
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fasjson:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fasjson\")].image"}]'
     spec:
       containers:
         - name: fasjson

roles/openshift-apps/fedora-packages-static/templates/deployment.yml.j2

@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: fedora-packages-static
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fedora-packages-static:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedora-packages-static\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -14,8 +16,6 @@ spec:
     metadata:
       labels:
         app: fedora-packages-static
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fedora-packages-static:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedora-packages-static\")].image"}]'
     spec:
       initContainers:
       - name: init-solr

roles/openshift-apps/flatpak-indexer/templates/deployment.yml.j2

@@ -2,9 +2,11 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: flatpak-indexer
   labels:
     app: flatpak-indexer
-  name: flatpak-indexer
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"flatpak-indexer:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"flatpak-indexer\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -19,8 +21,6 @@ spec:
     metadata:
       labels:
         app: flatpak-indexer
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"flatpak-indexer:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"flatpak-indexer\")].image"}]'
     spec:
       containers:
       - name: flatpak-indexer

roles/openshift-apps/fmn/templates/deployment.yml.j2

@@ -7,6 +7,8 @@ metadata:
   labels:
     app: fmn
     component: frontend
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"frontend\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -23,8 +25,6 @@ spec:
       labels:
         app: fmn
         component: frontend
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"frontend\")].image"}]'
     spec:
       containers:
         - name: frontend
@@ -62,6 +62,8 @@ metadata:
   labels:
     app: fmn
     component: api
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"api\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -78,8 +80,6 @@ spec:
       labels:
         app: fmn
         component: api
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"api\")].image"}]'
     spec:
       containers:
         - name: api
@@ -170,6 +170,8 @@ metadata:
   labels:
     app: fmn
     component: consumer
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"consumer\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -183,8 +185,6 @@ spec:
       labels:
         app: fmn
         component: consumer
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"consumer\")].image"}]'
     spec:
       initContainers:
         - name: database-sync
@@ -262,6 +262,8 @@ metadata:
   labels:
     app: fmn
     component: sender-email
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-email\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -275,8 +277,6 @@ spec:
       labels:
         app: fmn
         component: sender-email
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-email\")].image"}]'
     spec:
       containers:
         - name: sender-email
@@ -320,6 +320,8 @@ metadata:
   labels:
     app: fmn
     component: sender-irc
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-irc\")].image"}]'
 spec:
   replicas: {{ (env == 'production')|ternary('1', '0') }}
   selector:
@@ -333,8 +335,6 @@ spec:
       labels:
         app: fmn
         component: sender-irc
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-irc\")].image"}]'
     spec:
       containers:
         - name: sender-irc
@@ -378,6 +378,8 @@ metadata:
   labels:
     app: fmn
     component: sender-matrix
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-matrix\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -391,8 +393,6 @@ spec:
       labels:
         app: fmn
         component: sender-matrix
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sender-matrix\")].image"}]'
     spec:
       containers:
         - name: sender-matrix
@@ -436,6 +436,8 @@ metadata:
   labels:
     app: fmn
     component: redis
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -448,8 +450,6 @@ spec:
       labels:
         app: fmn
         component: redis
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image"}]'
     spec:
       containers:
         - name: redis
@@ -479,6 +479,8 @@ metadata:
   labels:
     app: fmn
     component: collectd
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"collectd\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -492,8 +494,6 @@ spec:
       labels:
         app: fmn
         component: collectd
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"fmn:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"collectd\")].image"}]'
     spec:
       containers:
         - name: collectd
@@ -526,10 +526,12 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: sendria
   labels:
     app: fmn
     component: sendria
-  name: sendria
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"sendria:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sendria\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -543,8 +545,6 @@ spec:
       labels:
         app: fmn
         component: sendria
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"sendria:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sendria\")].image"}]'
     spec:
       containers:
         - name: sendria

roles/openshift-apps/greenwave/templates/deployment.yml.j2

@@ -6,6 +6,8 @@ metadata:
   labels:
     app: greenwave
     service: web
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"greenwave:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"web\")].image"}]'
 spec:
   replicas: 2
   selector:
@@ -18,8 +20,6 @@ spec:
       labels:
         app: greenwave
         service: web
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"greenwave:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"web\")].image"}]'
     spec:
       containers:
       - name: web
@@ -57,6 +57,8 @@ metadata:
   labels:
     app: greenwave
     service: fedmsg-consumers
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"greenwave:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedmsg-consumers\")].image"}]'
 spec:
   replicas: 0
   selector:
@@ -68,8 +70,6 @@ spec:
       labels:
         app: greenwave
         service: fedmsg-consumers
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"greenwave:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"fedmsg-consumers\")].image"}]'
     spec:
       containers:
       - name: fedmsg-consumers

roles/openshift-apps/mirrormanager/templates/deployment.yml.j2

@@ -6,6 +6,8 @@ metadata:
   name: frontend
   labels:
     app: mirrormanager
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"mirrormanager2:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirrormanager\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -20,8 +22,6 @@ spec:
     metadata:
       labels:
         app: mirrormanager
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"mirrormanager2:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirrormanager\")].image"}]'
     spec:
       containers:
         - name: mirrormanager

roles/openshift-apps/noggin/templates/deployment.yml.j2

@@ -5,6 +5,8 @@ metadata:
   name: noggin
   labels:
     app: {{ object_app }}
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"noggin:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"noggin\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -19,8 +21,6 @@ spec:
     metadata:
       labels:
         app: {{ object_app }}
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"noggin:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"noggin\")].image"}]'
     spec:
       containers:
       - name: noggin

roles/openshift-apps/poddlers/templates/deployment.yml.j2

@@ -7,6 +7,8 @@ metadata:
   name: {{ toddler.name }}
   labels:
     app: poddlers
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"toddlers:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"toddlers\")].image"}]'
 spec:
   replicas: {{ toddler.replicas|default(1) }}
   selector:
@@ -20,8 +22,6 @@ spec:
       labels:
         app: poddlers
         deployment: {{ toddler.name }}
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"toddlers:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"toddlers\")].image"}]'
     spec:
       containers:
         - name: toddlers

roles/openshift-apps/release-monitoring/templates/deployment.yml.j2

@@ -2,10 +2,12 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: release-monitoring-web
   labels:
     app: release-monitoring-web
     service: web
-  name: release-monitoring-web
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"release-monitoring-web:latest","namespace":"release-monitoring"},"fieldPath":"spec.template.spec.containers[?(@.name==\"release-monitoring-web\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -18,8 +20,6 @@ spec:
       labels:
         app: release-monitoring-web
         service: web
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"release-monitoring-web:latest","namespace":"release-monitoring"},"fieldPath":"spec.template.spec.containers[?(@.name==\"release-monitoring-web\")].image"}]'
     spec:
       initContainers:
       - name: alembic-upgrade
@@ -88,10 +88,12 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: release-monitoring-check-service
   labels:
     app: release-monitoring-check-service
     service: web
-  name: release-monitoring-check-service
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"release-monitoring-web:latest","namespace":"release-monitoring"},"fieldPath":"spec.template.spec.containers[?(@.name==\"release-monitoring-web\")].image"}]'
 spec:
 {% if env == 'staging' %}
   replicas: 0
@@ -108,8 +110,6 @@ spec:
       labels:
         app: release-monitoring-check-service
         service: web
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"release-monitoring-web:latest","namespace":"release-monitoring"},"fieldPath":"spec.template.spec.containers[?(@.name==\"release-monitoring-web\")].image"}]'
     spec:
       initContainers:
       - name: alembic-check

roles/openshift-apps/the-new-hotness/templates/deployment.yml.j2

@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: the-new-hotness
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"the-new-hotness:latest","namespace":"the-new-hotness"},"fieldPath":"spec.template.spec.containers[?(@.name==\"the-new-hotness\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -14,8 +16,6 @@ spec:
     metadata:
       labels:
         app: the-new-hotness
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"the-new-hotness:latest","namespace":"the-new-hotness"},"fieldPath":"spec.template.spec.containers[?(@.name==\"the-new-hotness\")].image"}]'
     spec:
       containers:
       - name: the-new-hotness
@@ -71,6 +71,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: the-new-hotness-redis
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"the-new-hotness-redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"the-new-hotness-redis\")].image"}]'
 spec:
   replicas: 1
   selector:
@@ -81,8 +83,6 @@ spec:
     metadata:
       labels:
         app: the-new-hotness-redis
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"the-new-hotness-redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"the-new-hotness-redis\")].image"}]'
     spec:
       containers:
       - name: the-new-hotness-redis

roles/openshift-apps/waiverdb/templates/deployment.yml.j2

@@ -6,6 +6,8 @@ metadata:
   labels:
     app: waiverdb
     service: web
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"waiverdb:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"web\")].image"}]'
 spec:
   replicas: 2
   selector:
@@ -20,8 +22,6 @@ spec:
       labels:
         app: waiverdb
         service: web
-      annotations:
-        image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"waiverdb:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"web\")].image"}]'
     spec:
       initContainers:
       - name: db-upgrade