Merge branch 'main' into 211-xtoolmap

bcgov · Dec 17, 2024 · c7f1de8 · c7f1de8
2 parents 3f514be + 26372c7
commit c7f1de8
Show file tree

Hide file tree

Showing 136 changed files with 301 additions and 13,410 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -34,7 +34,7 @@ jobs:
           file: common/openshift.init.yml
           overwrite: true
           parameters:
-            -p NAME_SUFFIX=${{ inputs.target }}
+            -p ZONE=${{ inputs.target }}
             -p POSTGRESQL_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
             -p POSTGRESQL_USER=${{ secrets.POSTGRES_USER }}
             -p FDW_DATABASE_PASSWORD=${{ secrets.FDW_DATABASE_PASSWORD }}
@@ -70,7 +70,7 @@ jobs:
           oc_version: "4.14.37"
           file: minio/openshift.deploy.yml
           parameters:
-            -p NAME_SUFFIX=${{ inputs.target }}
+            -p ZONE=${{ inputs.target }}
             -p IMAGE_TAG=${{ inputs.tag }}
             # ${{ inputs.environment && '' || '-p MINIO_DATA_DIR=/tmp/data' }}
             # ${{ inputs.environment && '' || '-p DEST_PVC_SIZE=1Mi' }}
@@ -94,7 +94,7 @@ jobs:
             -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }}
             -p IMAGE_STREAM_NAME=crunchy-postgres-gis
             -p IMAGE_TAG=${{ inputs.tag }}
-            -p NAME_SUFFIX=${{ inputs.target }}
+            -p ZONE=${{ inputs.target }}
             -p STORAGE_CLASS=netapp-file-standard
             -p REQUEST_CPU=200m
             -p LIMIT_CPU=500m
@@ -115,7 +115,7 @@ jobs:
           oc_version: "4.14.37"
           file: backend/openshift.deploy.yml
           parameters:
-              -p NAME_SUFFIX=${{ inputs.target }}
+              -p ZONE=${{ inputs.target }}
               -p IMAGE_TAG=${{ inputs.tag }}
               -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }}
               -p DB_REPLICATE=${{ vars.DB_REPLICATE }}
@@ -160,6 +160,6 @@ jobs:
           oc_version: "4.14.37"
           file: frontend/openshift.deploy.yml
           parameters:
-            -p NAME_SUFFIX=${{ inputs.target }}
+            -p ZONE=${{ inputs.target }}
             -p IMAGE_TAG=${{ inputs.tag }}