From c49c6489de35af89b62ac414ac2490491d7c04e8 Mon Sep 17 00:00:00 2001
From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:44:32 -0700
Subject: [PATCH] making changes for heal pre-prod to use IRSA for the
 batch-export job (#8093)

---
 .secrets.baseline                  | 11 +----------
 preprod.healdata.org/manifest.json | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 587c5d1efa..74037211ee 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -7756,15 +7756,6 @@
         "line_number": 6
       }
     ],
-    "preprod.healdata.org/manifest.json": [
-      {
-        "type": "Secret Keyword",
-        "filename": "preprod.healdata.org/manifest.json",
-        "hashed_secret": "ae4a2a671a528744059cd818de9af9e13005563b",
-        "is_verified": false,
-        "line_number": 81
-      }
-    ],
     "preprod.healdata.org/manifests/hatchery/hatchery.json": [
       {
         "type": "Base64 High Entropy String",
@@ -9588,5 +9579,5 @@
       }
     ]
   },
-  "generated_at": "2024-11-07T16:06:43Z"
+  "generated_at": "2024-11-12T19:58:12Z"
 }
diff --git a/preprod.healdata.org/manifest.json b/preprod.healdata.org/manifest.json
index 1ea2371d86..f12cfa641a 100644
--- a/preprod.healdata.org/manifest.json
+++ b/preprod.healdata.org/manifest.json
@@ -44,10 +44,11 @@
     {
       "name": "batch-export",
       "action": "batch-export",
+      "serviceAccountName": "batch-export-sa",
       "activeDeadlineSeconds": 600,
       "container": {
         "name": "job-task",
-        "image": "quay.io/cdis/batch-export:2024.10",
+        "image": "quay.io/cdis/batch-export:feat_GPE-1219",
         "pull_policy": "Always",
         "labels": {
           "internet": "yes"
@@ -61,27 +62,20 @@
                 "key": "hostname"
               }
             }
-          }
-        ],
-        "volumeMounts": [
+          },
           {
-            "name": "batch-export-creds-volume",
-            "readOnly": true,
-            "mountPath": "/batch-export-creds.json",
-            "subPath": "config.json"
+            "name": "BUCKET",
+            "valueFrom": {
+              "configMapKeyRef": {
+                "name": "batch-export-g3auto",
+                "key": "bucket_name"
+              }
+            }
           }
         ],
         "cpu-limit": "1",
         "memory-limit": "1Gi"
       },
-      "volumes": [
-        {
-          "name": "batch-export-creds-volume",
-          "secret": {
-            "secretName": "batch-export-g3auto"
-          }
-        }
-      ],
       "restart_policy": "Never"
     }
   ],