From bd5b622b6de21598152cca91a16ab86871fba17b Mon Sep 17 00:00:00 2001
From: "Fergus MacConnell WLRS:EX" <f.macconnell@gmail.com>
Date: Tue, 5 Nov 2024 10:32:58 -0800
Subject: [PATCH 1/2] Remove dev prefix to simplify PR cleanup.

---
 .github/workflows/.deploy.yml | 13 ++++++-------
 backend/openshift.deploy.yml  |  2 --
 frontend/openshift.deploy.yml |  2 --
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index 61938ad50..da24a541f 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -33,7 +33,7 @@ jobs:
           file: common/openshift.init.yml
           overwrite: true
           parameters:
-            -p NAME_SUFFIX=-dev-${{ github.event.number }}
+            -p NAME_SUFFIX=-${{ github.event.number }}
             -p POSTGRESQL_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
             -p FDW_DATABASE_PASSWORD=${{ secrets.FDW_DATABASE_PASSWORD }}
             -p DJANGO_ADMIN_PASSWORD=${{ secrets.DJANGO_ADMIN_PASSWORD }}
@@ -67,7 +67,7 @@ jobs:
   #         oc_version: "4.14.37"
   #         file: minio/openshift.deploy.yml
   #         parameters:
-  #           -p NAME_SUFFIX=-dev-${{ github.event.number }}
+  #           -p NAME_SUFFIX=-${{ github.event.number }}
   #           -p IMAGE_TAG=${{ github.event.number }}
   #           -p ENV_NAME=dev
   #           -p MINIO_DATA_DIR=/data
@@ -88,11 +88,11 @@ jobs:
           file: database/openshift.deploy.yml
           overwrite: true
           parameters:
-            -p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database
+            -p DATABASE_SERVICE_NAME=gwells-${{ github.event.number }}-database
             -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }}
             -p IMAGE_STREAM_NAME=crunchy-postgres-gis
             -p IMAGE_TAG=${{ github.event.number }}
-            -p NAME_SUFFIX=-dev-${{ github.event.number }}
+            -p NAME_SUFFIX=-${{ github.event.number }}
             -p STORAGE_CLASS=netapp-file-standard
             -p REQUEST_CPU=200m
             -p LIMIT_CPU=500m
@@ -113,7 +113,7 @@ jobs:
           oc_version: "4.14.37"
           file: backend/openshift.deploy.yml
           parameters:
-              -p NAME_SUFFIX=-dev-${{ github.event.number }}
+              -p NAME_SUFFIX=-${{ github.event.number }}
               -p IMAGE_TAG=${{ github.event.number }}
               -p ENV_NAME=dev
               -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }}
@@ -159,6 +159,5 @@ jobs:
           oc_version: "4.14.37"
           file: frontend/openshift.deploy.yml
           parameters:
-            -p NAME_SUFFIX=-dev-${{ github.event.number }}
+            -p NAME_SUFFIX=-${{ github.event.number }}
             -p IMAGE_TAG=${{ github.event.number }}
-            -p ENV_NAME=dev
diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index 339caf2b1..f04e3afb5 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -7,8 +7,6 @@ parameters:
   required: true
 - name: IMAGE_TAG
   required: true
-- name: ENV_NAME
-  required: true
 - name: HOST
   required: false
   value: ''
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 585b32fd2..f852ebe78 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -7,8 +7,6 @@ parameters:
     required: true
   - name: IMAGE_TAG
     required: true
-  - name: ENV_NAME
-    required: true
 objects:
   - kind: Service
     apiVersion: v1

From 68cc8a4ea90cb713605b83032996e72f3c286cad Mon Sep 17 00:00:00 2001
From: "Fergus MacConnell WLRS:EX" <f.macconnell@gmail.com>
Date: Tue, 5 Nov 2024 10:54:21 -0800
Subject: [PATCH 2/2] Update deployment params.

---
 .github/workflows/.deploy.yml | 2 --
 minio/openshift.deploy.yml    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index da24a541f..01ac92437 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -69,7 +69,6 @@ jobs:
   #         parameters:
   #           -p NAME_SUFFIX=-${{ github.event.number }}
   #           -p IMAGE_TAG=${{ github.event.number }}
-  #           -p ENV_NAME=dev
   #           -p MINIO_DATA_DIR=/data
           
   database:
@@ -115,7 +114,6 @@ jobs:
           parameters:
               -p NAME_SUFFIX=-${{ github.event.number }}
               -p IMAGE_TAG=${{ github.event.number }}
-              -p ENV_NAME=dev
               -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }}
               -p DB_REPLICATE=${{ vars.DB_REPLICATE }}
               -p DJANGO_DEBUG=${{ vars.DJANGO_DEBUG }}
diff --git a/minio/openshift.deploy.yml b/minio/openshift.deploy.yml
index b669d2830..17ea50fde 100644
--- a/minio/openshift.deploy.yml
+++ b/minio/openshift.deploy.yml
@@ -36,8 +36,6 @@ parameters:
     required: true
   - name: "MINIO_DATA_DIR"
     required: true
-  - name: "ENV_NAME"
-    required: true
   - name: "NAME_SUFFIX"
     required: false
 objects: