From 6687bfb58947fc78ab032e000a45e91cdd044265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 13 Mar 2025 09:20:37 +0100
Subject: [PATCH] MirrorManager: add the secrets mount to all deploymentconfigs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The crawlers need it when they import the Flask app, or we get:
```
FileNotFoundError: [Errno 2] No such file or directory: '/etc/mirrormanager-secrets/client_secrets.json'
```

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 roles/openshift-apps/mirrormanager/templates/_macros.yml.j2 | 6 ++++++
 .../mirrormanager/templates/deploymentconfig.yml.j2         | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/openshift-apps/mirrormanager/templates/_macros.yml.j2 b/roles/openshift-apps/mirrormanager/templates/_macros.yml.j2
index 8aa3a74775..53da9ef404 100644
--- a/roles/openshift-apps/mirrormanager/templates/_macros.yml.j2
+++ b/roles/openshift-apps/mirrormanager/templates/_macros.yml.j2
@@ -2,6 +2,9 @@
             - name: config
               mountPath: "/etc/mirrormanager"
               readOnly: true
+            - name: secrets
+              mountPath: "/etc/mirrormanager-secrets"
+              readOnly: true
             - name: scripts
               mountPath: "/opt/scripts"
               readOnly: true
@@ -39,6 +42,9 @@
         - name: config
           configMap:
             name: config
+        - name: secrets
+          secret:
+            secretName: secrets
         - name: var-lib
           persistentVolumeClaim:
             claimName: data
diff --git a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2 b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2
index a16d2f3097..c395520633 100644
--- a/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2
+++ b/roles/openshift-apps/mirrormanager/templates/deploymentconfig.yml.j2
@@ -56,15 +56,9 @@ spec:
 
           volumeMounts:
             {{ common_volume_mounts() }}
-            - name: secrets
-              mountPath: "/etc/mirrormanager-secrets"
-              readOnly: true
 
       volumes:
         {{ common_volumes() }}
-        - name: secrets
-          secret:
-            secretName: secrets
       {{ security_context() }}
 
   triggers: