From 4e3fccf6cf6435feff288f826ba4e8c5c6b37343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Fri, 18 Nov 2022 12:25:07 +0100
Subject: [PATCH] Revert "Apparently we don't need to repeat volume definitions
 across deploymentconfigs"

Well, yes we do :-(

This reverts commit 257156122233a26f7fa1bb29cb9fcaf9a4ada897.
---
 .../fmn/templates/deploymentconfig.yml        | 40 +++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index e38414ac7f..1fa9ca6632 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -88,6 +88,16 @@ spec:
             - name: etc-fmn
               mountPath: "/etc/fmn"
               readOnly: true
+            - name: rabbitmq-ca-volume
+              mountPath: /etc/pki/rabbitmq/ca
+              readOnly: true
+            - name: rabbitmq-key-volume
+              mountPath: /etc/pki/rabbitmq/key
+              readOnly: true
+            - name: rabbitmq-crt-volume
+              mountPath: /etc/pki/rabbitmq/crt
+              readOnly: true
+
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-api.sh"
@@ -109,7 +119,7 @@ spec:
           readOnly: true
         - name: rabbitmq-crt-volume
           mountPath: /etc/pki/rabbitmq/crt
-          readOnly:
+          readOnly: true
   triggers:
     - type: ImageChange
       imageChangeParams:
@@ -162,7 +172,19 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-consumer.sh"
-        # No need to list the volumes again
+      volumes:
+        - name: etc-fmn
+          configMap:
+            name: fmn-config
+        - name: rabbitmq-ca-volume
+          mountPath: /etc/pki/rabbitmq/ca
+          readOnly: true
+        - name: rabbitmq-key-volume
+          mountPath: /etc/pki/rabbitmq/key
+          readOnly: true
+        - name: rabbitmq-crt-volume
+          mountPath: /etc/pki/rabbitmq/crt
+          readOnly: true
   triggers:
     - type: ImageChange
       imageChangeParams:
@@ -214,7 +236,19 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-sender-email.sh"
-      # No need to list the volumes again
+      volumes:
+        - name: etc-fmn
+          configMap:
+            name: fmn-config
+        - name: rabbitmq-ca-volume
+          mountPath: /etc/pki/rabbitmq/ca
+          readOnly: true
+        - name: rabbitmq-key-volume
+          mountPath: /etc/pki/rabbitmq/key
+          readOnly: true
+        - name: rabbitmq-crt-volume
+          mountPath: /etc/pki/rabbitmq/crt
+          readOnly: true
   triggers:
     - type: ImageChange
       imageChangeParams: