From d855f9eeff52bd5407027df054a5129a73ad86ba Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Mon, 8 Apr 2024 11:23:31 +1000
Subject: [PATCH] badges: use tahrir crt and key in frontend

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 playbooks/openshift-apps/badges.yml                  | 11 +++++++++++
 .../openshift-apps/badges/files/deploymentconfig.yml | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml
index 900fbd209c..cbddc6615d 100644
--- a/playbooks/openshift-apps/badges.yml
+++ b/playbooks/openshift-apps/badges.yml
@@ -129,6 +129,17 @@
       key: fedbadges-key.pem
       privatefile: "rabbitmq/{{env}}/pki/private/fedbadges{{env_suffix}}.key"
 
+    - role: openshift/secret-file
+      app: badges
+      secret_name: tahrir-fedora-messaging-crt
+      key: tahrir-cert.pem
+      privatefile: "rabbitmq/{{env}}/pki/issued/tahrir{{env_suffix}}.crt"
+    - role: openshift/secret-file
+      app: badges
+      secret_name: tahrir-fedora-messaging-key
+      key: tahrir-key.pem
+      privatefile: "rabbitmq/{{env}}/pki/private/tahrir{{env_suffix}}.key"
+
     # FASJSON access
     - role: openshift/ipa-client
       app: badges
diff --git a/roles/openshift-apps/badges/files/deploymentconfig.yml b/roles/openshift-apps/badges/files/deploymentconfig.yml
index db213b2666..0d9e5fbd59 100644
--- a/roles/openshift-apps/badges/files/deploymentconfig.yml
+++ b/roles/openshift-apps/badges/files/deploymentconfig.yml
@@ -52,10 +52,10 @@ spec:
             - name: fedora-messaging-ca-volume
               mountPath: /etc/pki/fedora-messaging/ca
               readOnly: true
-            - name: fedora-messaging-key-volume
+            - name: tahrir-fedora-messaging-key-volume
               mountPath: /etc/pki/fedora-messaging/key
               readOnly: true
-            - name: fedora-messaging-crt-volume
+            - name: tahrir-fedora-messaging-crt-volume
               mountPath: /etc/pki/fedora-messaging/crt
               readOnly: true
 
@@ -103,12 +103,12 @@ spec:
         - name: fedora-messaging-ca-volume
           secret:
             secretName: fedora-messaging-ca
-        - name: fedora-messaging-key-volume
+        - name: tahrir-fedora-messaging-key-volume
           secret:
-            secretName: fedora-messaging-key
-        - name: fedora-messaging-crt-volume
+            secretName: tahrir-fedora-messaging-key
+        - name: tahrir-fedora-messaging-crt-volume
           secret:
-            secretName: fedora-messaging-crt
+            secretName: tahrir-fedora-messaging-crt
   triggers:
     - type: ConfigChange
     - type: ImageChange