From 257156122233a26f7fa1bb29cb9fcaf9a4ada897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Fri, 18 Nov 2022 12:21:48 +0100
Subject: [PATCH] Apparently we don't need to repeat volume definitions across
 deploymentconfigs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 .../fmn/templates/deploymentconfig.yml        | 46 +------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index 61de80964b..fee1565707 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -171,28 +171,7 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-consumer.sh"
-      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:
-        - name: rabbitmq-ca-volume
-          secret:
-            secretName: rabbitmq-ca
-        - name: rabbitmq-key-volume
-          secret:
-            secretName: rabbitmq-key
-        - name: rabbitmq-crt-volume
-          secret:
-            secretName: rabbitmq-cert
+        # No need to list the volumes again
   triggers:
     - type: ImageChange
       imageChangeParams:
@@ -244,28 +223,7 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-sender-email.sh"
-      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:
-        - name: rabbitmq-ca-volume
-          secret:
-            secretName: rabbitmq-ca
-        - name: rabbitmq-key-volume
-          secret:
-            secretName: rabbitmq-key
-        - name: rabbitmq-crt-volume
-          secret:
-            secretName: rabbitmq-cert
+      # No need to list the volumes again
   triggers:
     - type: ImageChange
       imageChangeParams: