From 9f1ef2a5886162931d39e3c4fdec7f5f5dcc2c0b Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 2 Oct 2019 15:46:10 +0200
Subject: [PATCH] Koschei: Use tagged upstream releases for deployments

---
 roles/openshift-apps/koschei/templates/backend-deployment.yml  | 2 +-
 roles/openshift-apps/koschei/templates/cronjob.yml             | 2 +-
 roles/openshift-apps/koschei/templates/frontend-deployment.yml | 2 +-
 roles/openshift-apps/koschei/templates/job.yml                 | 2 +-
 roles/openshift-apps/koschei/vars/production.yml               | 2 ++
 roles/openshift-apps/koschei/vars/staging.yml                  | 2 ++
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml
index 26ff521aae..56458ad555 100644
--- a/roles/openshift-apps/koschei/templates/backend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: {{service}}
-        image: quay.io/koschei/koschei:latest
+        image: "{{ koschei_container_image }}"
         command: [/usr/bin/koschei-{{service}}]
         env:
           - name: KRB5_CONFIG
diff --git a/roles/openshift-apps/koschei/templates/cronjob.yml b/roles/openshift-apps/koschei/templates/cronjob.yml
index ab5444e0af..80d821e518 100644
--- a/roles/openshift-apps/koschei/templates/cronjob.yml
+++ b/roles/openshift-apps/koschei/templates/cronjob.yml
@@ -11,7 +11,7 @@ spec:
         spec:
           containers:
           - name: "cron-{{name}}"
-            image: quay.io/koschei/koschei:latest
+            image: "{{ koschei_container_image }}"
             command: ["/bin/bash", "-euxc", "{{command}}"]
             env:
               - name: SUDO_USER
diff --git a/roles/openshift-apps/koschei/templates/frontend-deployment.yml b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
index 30c107c99e..e2ecc460e5 100644
--- a/roles/openshift-apps/koschei/templates/frontend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/frontend-deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: frontend
-        image: quay.io/koschei/koschei:latest
+        image: "{{ koschei_container_image }}"
         command: [/usr/bin/koschei-frontend]
         ports:
         - containerPort: 8080
diff --git a/roles/openshift-apps/koschei/templates/job.yml b/roles/openshift-apps/koschei/templates/job.yml
index b6807b44f0..935117789a 100644
--- a/roles/openshift-apps/koschei/templates/job.yml
+++ b/roles/openshift-apps/koschei/templates/job.yml
@@ -7,7 +7,7 @@ spec:
     spec:
       containers:
       - name: "job-{{name}}"
-        image: quay.io/koschei/koschei:latest
+        image: "{{ koschei_container_image }}"
         command: ["/bin/bash", "-euxc", "{{command}}"]
         env:
           - name: SUDO_USER
diff --git a/roles/openshift-apps/koschei/vars/production.yml b/roles/openshift-apps/koschei/vars/production.yml
index 370eb2c384..96084c75c2 100644
--- a/roles/openshift-apps/koschei/vars/production.yml
+++ b/roles/openshift-apps/koschei/vars/production.yml
@@ -1,3 +1,5 @@
+koschei_container_image: quay.io/koschei/koschei:fedora-prod
+
 koschei_topurl: https://koschei.fedoraproject.org
 koschei_pgsql_hostname: db01.phx2.fedoraproject.org
 koschei_koji_hub: koji.fedoraproject.org
diff --git a/roles/openshift-apps/koschei/vars/staging.yml b/roles/openshift-apps/koschei/vars/staging.yml
index 4a4bec009a..1561c51d51 100644
--- a/roles/openshift-apps/koschei/vars/staging.yml
+++ b/roles/openshift-apps/koschei/vars/staging.yml
@@ -1,3 +1,5 @@
+koschei_container_image: quay.io/koschei/koschei:fedora-stage
+
 koschei_topurl: https://koschei.stg.fedoraproject.org
 # koschei database on pgbdr.stg is in inconsistent state, so we're
 # using non-BDR db01.stg for now.