From 80fc41acbfeb900ced1b81e58040b3a51347b0c0 Mon Sep 17 00:00:00 2001
From: EliseCastle23 <109446148+EliseCastle23@users.noreply.github.com>
Date: Thu, 7 Nov 2024 08:42:11 -0700
Subject: [PATCH] adding changes for new al image changes (#2661)

* adding changes for new al image changes
---
 .../audit-service/audit-service-deploy.yaml        | 13 ++++++++++++-
 kube/services/metadata/metadata-deploy.yaml        | 14 +++++++++++++-
 kube/services/requestor/requestor-deploy.yaml      | 13 ++++++++++++-
 kube/services/wts/wts-deploy.yaml                  |  3 ++-
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/kube/services/audit-service/audit-service-deploy.yaml b/kube/services/audit-service/audit-service-deploy.yaml
index b7081a7f5..b0cf5c661 100644
--- a/kube/services/audit-service/audit-service-deploy.yaml
+++ b/kube/services/audit-service/audit-service-deploy.yaml
@@ -94,6 +94,11 @@ spec:
             readOnly: true
             mountPath: "/src/audit-service-config.yaml"
             subPath: "audit-service-config.yaml"
+          # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibility.
+          - name: "config-volume"
+            readOnly: true
+            mountPath: "/audit/audit-service-config.yaml"
+            subPath: "audit-service-config.yaml"
         resources:
           requests:
             cpu: 100m
@@ -109,6 +114,11 @@ spec:
               readOnly: true
               mountPath: "/src/audit-service-config.yaml"
               subPath: "audit-service-config.yaml"
+            # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibility.
+            - name: "config-volume"
+              readOnly: true
+              mountPath: "/audit/audit-service-config.yaml"
+              subPath: "audit-service-config.yaml"
           resources:
             limits:
               cpu: 0.8
@@ -117,4 +127,5 @@ spec:
           args:
             - "-c"
             - |
-              /env/bin/alembic upgrade head
+              # Managing virtual environments via poetry instead of python since the AL base image update, but retaining backwards compatibility 
+              poetry run alembic upgrade head || /env/bin/alembic upgrade head
diff --git a/kube/services/metadata/metadata-deploy.yaml b/kube/services/metadata/metadata-deploy.yaml
index 68a83078e..71ab7b484 100644
--- a/kube/services/metadata/metadata-deploy.yaml
+++ b/kube/services/metadata/metadata-deploy.yaml
@@ -117,6 +117,11 @@ spec:
             readOnly: true
             mountPath: /src/.env
             subPath: metadata.env
+          # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibility.
+          - name: config-volume-g3auto
+            readOnly: true
+            mountPath: /mds/.env
+            subPath: metadata.env
           - name: config-volume
             readOnly: true
             mountPath: /aggregate_config.json
@@ -140,6 +145,11 @@ spec:
               readOnly: true
               mountPath: /src/.env
               subPath: metadata.env
+            # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibility.
+            - name: config-volume-g3auto
+              readOnly: true
+              mountPath: /mds/.env
+              subPath: metadata.env
           resources:
             limits:
               cpu: 0.8
@@ -148,4 +158,6 @@ spec:
           args:
             - "-c"
             - |
-              /env/bin/alembic upgrade head
+              # Managing virtual environments via poetry instead of python since the AL base image update, but retaining backwards compatibility 
+              poetry run alembic upgrade head || /env/bin/alembic upgrade head
+
diff --git a/kube/services/requestor/requestor-deploy.yaml b/kube/services/requestor/requestor-deploy.yaml
index 2ed886638..954cb847c 100644
--- a/kube/services/requestor/requestor-deploy.yaml
+++ b/kube/services/requestor/requestor-deploy.yaml
@@ -91,6 +91,11 @@ spec:
             readOnly: true
             mountPath: "/src/requestor-config.yaml"
             subPath: "requestor-config.yaml"
+          # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibilit
+          - name: "config-volume"
+            readOnly: true
+            mountPath: "/requestor/requestor-config.yaml"
+            subPath: "requestor-config.yaml"
         resources:
           requests:
             cpu: 100m
@@ -106,6 +111,11 @@ spec:
               readOnly: true
               mountPath: "/src/requestor-config.yaml"
               subPath: "requestor-config.yaml"
+            # Added an additional volume mount for new images using the /<app-name> directory, while retaining the 'src' mount for backward compatibilit
+            - name: "config-volume"
+              readOnly: true
+              mountPath: "/requestor/requestor-config.yaml"
+              subPath: "requestor-config.yaml"
           resources:
             limits:
               cpu: 0.8
@@ -114,4 +124,5 @@ spec:
           args:
             - "-c"
             - |
-              /env/bin/alembic upgrade head
+              # Managing virtual environments via poetry instead of python since the AL base image update, but retaining backwards compatibility 
+              poetry run alembic upgrade head || /env/bin/alembic upgrade head
diff --git a/kube/services/wts/wts-deploy.yaml b/kube/services/wts/wts-deploy.yaml
index 06f43fe01..a3e63f19b 100644
--- a/kube/services/wts/wts-deploy.yaml
+++ b/kube/services/wts/wts-deploy.yaml
@@ -166,7 +166,8 @@ spec:
               if hash alembic 2>/dev/null; then
                 echo "Running DB migration"
                 cd /wts
-                alembic upgrade head
+                # Managing virtual environments via poetry instead of python since the AL base image update, but retaining backwards compatibility
+                poetry run alembic upgrade head || alembic upgrade head
               else
                 # WTS < 0.3.0 does not have the DB migration setup
                 echo "Alembic not installed - not running DB migration"