Merge branch 'main' into chore/frontend/console-errors

bcgov · Oct 25, 2024 · 9e23351 · 9e23351
2 parents a74ef99 + c779e3e
commit 9e23351
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
@@ -69,7 +69,7 @@ jobs:
           file: database/openshift.deploy.yml
           overwrite: true
           parameters:
-            -p DATABASE_SERVICE_NAME=gwells-pg12-dev-${{ github.event.number }}
+            -p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database
             -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }}
             -p IMAGE_STREAM_NAME=crunchy-postgres-gis
             -p IMAGE_TAG=${{ github.event.number }}

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -203,21 +203,21 @@ objects:
             protocol: TCP
           env:
           - name: DATABASE_SERVICE_NAME
-            value: gwells-pg12${NAME_SUFFIX}
+            value: gwells${NAME_SUFFIX}-database
           - name: DATABASE_NAME
             valueFrom:
               secretKeyRef:
-                name: gwells-pg12${NAME_SUFFIX}
+                name: gwells${NAME_SUFFIX}-database
                 key: database-name
           - name: DATABASE_USER
             valueFrom:
               secretKeyRef:
-                name: gwells-pg12${NAME_SUFFIX}
+                name: gwells${NAME_SUFFIX}-database
                 key: database-user
           - name: DATABASE_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: gwells-pg12${NAME_SUFFIX}
+                name: gwells${NAME_SUFFIX}-database
                 key: database-password
           - name: DATABASE_SCHEMA
             value: public

diff --git a/common/openshift.init.yml b/common/openshift.init.yml
@@ -60,7 +60,7 @@ objects:
   - apiVersion: v1
     kind: Secret
     metadata:
-      name: gwells-pg12${NAME_SUFFIX}
+      name: gwells${NAME_SUFFIX}-database
     stringData:
       database-name: ${POSTGRESQL_DATABASE}
       database-password: ${POSTGRESQL_PASSWORD}
@@ -74,7 +74,7 @@ objects:
     metadata:
       name: minio${NAME_SUFFIX}
       creationTimestamp: 
-    stringdata:
+    stringData:
       MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY}
       MINIO_SECRET_KEY: ${MINIO_SECRET_KEY}
       S3_PUBLIC_ACCESS_KEY: ${S3_PUBLIC_ACCESS_KEY}

diff --git a/minio/openshift.deploy.yml b/minio/openshift.deploy.yml
@@ -118,7 +118,7 @@ objects:
               limits:
                 cpu: 100m
               requests:
-                cpu: 25m
+                cpu: 50m
             terminationMessagePath: /dev/termination-log
             terminationMessagePolicy: File
             volumeMounts: