Testing refrencing secrets from github env secrets. Allows us to kee…

.github/workflows/merge-main.yml

@@ -68,14 +68,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [backend, database, frontend, init]
+        name: [backend, frontend, init]
         include:
           - name: backend
             file: backend/openshift.deploy.yml
             overwrite: true
-          - name: database
-            file: database/openshift.deploy.yml
-            overwrite: false
           - name: frontend
             file: frontend/openshift.deploy.yml
             overwrite: true
@@ -103,14 +100,11 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [backend, database, frontend, init]
+        name: [backend, frontend, init]
         include:
           - name: backend
             file: backend/openshift.deploy.yml
             overwrite: true
-          - name: database
-            file: database/openshift.deploy.yml
-            overwrite: false
           - name: frontend
             file: frontend/openshift.deploy.yml
             overwrite: true

.github/workflows/pr-close.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        package: [backend, database, frontend]
+        package: [backend, frontend]
     steps:
       - uses: shrink/actions-docker-registry-tag@v3
         with:

.github/workflows/pr-open.yml

@@ -50,12 +50,10 @@ jobs:
       packages: write
     strategy:
       matrix:
-        package: [backend, database, frontend]
+        package: [backend, frontend]
         include:
           - package: backend
             triggers: ('backend/')
-          - package: database
-            triggers: ('database/')
           - package: frontend
             triggers: ('frontend/')
     steps:
@@ -75,22 +73,24 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        name: [backend, database, init, frontend]
+        name: [backend, init, frontend]
         include:
           - name: backend
             file: backend/openshift.deploy.yml
             overwrite: true
             parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
-          - name: database
-            file: database/openshift.deploy.yml
-            overwrite: false
           - name: frontend
             file: frontend/openshift.deploy.yml
             overwrite: true
             parameters: -p MIN_REPLICAS=1 -p MAX_REPLICAS=2
           - name: init
             file: common/openshift.init.yml
             overwrite: false
+            #parameters: 
+            #-p DATABASE_NAME=${{secrets.OC_DATABASE_NAME}}
+            #-p DATABASE_USER=${{secrets.OC_DATABASE_USER}}
+            #-p DATABASE_PASSWORD=${{secrets.OC_DATABASE_PASSWORD}}
+            #-p DATABASE_HOST=${{secrets.OC_DATABASE_HOST}}
     steps:
       - uses: bcgov-nr/[email protected]
         with:
@@ -101,6 +101,11 @@ jobs:
           overwrite: ${{ matrix.overwrite }}
           penetration_test: false
           parameters:
-            -p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
-            -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }}
+            -p ZONE=${{ github.event.number }} 
+            -p NAME=${{ github.event.repository.name }}
+            -p PROMOTE=${{ github.repository }}/${{ matrix.name }}:${{ github.event.number }} 
+            -p DATABASE_NAME=${{secrets.OC_DATABASE_NAME}}
+            -p DATABASE_USER=${{secrets.OC_DATABASE_USER}}
+            -p DATABASE_PASSWORD=${{secrets.OC_DATABASE_PASSWORD}}
+            -p DATABASE_HOST=${{secrets.OC_DATABASE_HOST}}
             ${{ matrix.parameters }}

backend/openshift.deploy.yml

@@ -38,7 +38,40 @@ parameters:
   - name: PROMOTE
     description: Image (namespace/name:tag) to promote/import
     value: bcgov/onroutebc:prod-backend
+  - name: DATABASE_NAME
+    description: Name of Database to connect to 
+    required: true
+  - name: DATABASE_USER
+    description: User connecting to database
+    required: true
+  - name: DATABASE_PASSWORD
+    description: Password of user connecting to database
+    required: true
+  - name: DATABASE_HOST
+    description: Host url/service of database connection
+    required: true
 objects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      labels:
+        app: ${NAME}-${ZONE}
+      name: ${NAME}-${ZONE}-${COMPONENT}
+    data:
+      database-type: mssql
+      database-name: "${DATABASE_NAME}"
+      database-host: "${DATABASE_HOST}"
+      database-encrypt: "false"
+      database-port: "1433"
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      labels:
+        app: ${NAME}-${ZONE}
+      name: ${NAME}-${ZONE}-${COMPONENT}
+    stringData:
+      database-user: "${DATABASE_USER}"
+      database-password: "${DATABASE_PASSWORD}"
   - apiVersion: v1
     kind: ImageStream
     metadata:
@@ -88,22 +121,40 @@ objects:
               imagePullPolicy: Always
               name: ${NAME}
               env:
-                - name: POSTGRESQL_HOST
-                  value: ${NAME}-${ZONE}-database
-                - name: POSTGRESQL_DATABASE
+                - name: DB_TYPE
                   valueFrom:
-                    secretKeyRef:
-                      name: ${NAME}-${ZONE}-database
+                    configMapKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: database-type
+                - name: MSSQL_HOST
+                  valueFrom:
+                    configMapKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: database-host
+                - name: MSSQL_PORT
+                  valueFrom:
+                    configMapKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: database-port
+                - name: MSSQL_DB
+                  valueFrom:
+                    configMapKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
                       key: database-name
-                - name: POSTGRESQL_PASSWORD
+                - name: MSSQL_ENCRYPT
+                  valueFrom:
+                    configMapKeyRef:
+                      name: ${NAME}-${ZONE}-${COMPONENT}
+                      key: database-encrypt
+                - name: MSSQL_SA_PASSWORD
                   valueFrom:
                     secretKeyRef:
-                      name: ${NAME}-${ZONE}-database
+                      name: ${NAME}-${ZONE}-${COMPONENT}
                       key: database-password
-                - name: POSTGRESQL_USER
+                - name: MSSQL_SA_USER
                   valueFrom:
                     secretKeyRef:
-                      name: ${NAME}-${ZONE}-database
+                      name: ${NAME}-${ZONE}-${COMPONENT}
                       key: database-user
               ports:
                 - containerPort: 5000

common/openshift.init.yml

@@ -4,29 +4,24 @@ parameters:
   - name: NAME
     description: Product name
     value: onroutebc
-  - name: PG_DATABASE
-    description: Postgres database name
-    value: database
   - name: ZONE
     description: Deployment zone, e.g. pr-### or prod
     required: true
   - name: PROMOTE
     description: Dummy param, for convenience in deployments
-  - name: DB_PASSWORD
-    description: Password for the PostgreSQL connection user.
-    from: "[a-zA-Z0-9]{16}"
-    generate: expression
+  - name: DATABASE_NAME
+    description: Name of Database to connect to 
+    required: true
+  - name: DATABASE_USER
+    description: User connecting to database
+    required: true
+  - name: DATABASE_PASSWORD
+    description: Password of user connecting to database
+    required: true
+  - name: DATABASE_HOST
+    description: Host url/service of database connection
+    required: true
 objects:
-  - apiVersion: v1
-    kind: Secret
-    metadata:
-      name: ${NAME}-${ZONE}-${PG_DATABASE}
-      labels:
-        app: ${NAME}-${ZONE}
-    stringData:
-      database-name: ${NAME}
-      database-password: ${DB_PASSWORD}
-      database-user: ${NAME}
   - apiVersion: networking.k8s.io/v1
     kind: NetworkPolicy
     metadata:

database/openshift.deploy.yml

@@ -81,6 +81,18 @@ parameters:
   - name: PROMOTE
     description: Image (namespace/name:tag) to promote/import
     required: true
+  - name: DATABASE_NAME
+    description: Name of Database to connect to 
+    required: true
+  - name: DATABASE_USER
+    description: User connecting to database
+    required: true
+  - name: DATABASE_PASSWORD
+    description: Password of user connecting to database
+    required: true
+  - name: DATABASE_HOST
+    description: Host url/service of database connection
+    required: true
 objects:
   - kind: PersistentVolumeClaim
     apiVersion: v1

frontend/openshift.deploy.yml

@@ -38,6 +38,18 @@ parameters:
   - name: PROMOTE
     description: Image (namespace/name:tag) to promote/import
     value: bcgov/onroutebc:prod-frontend
+  - name: DATABASE_NAME
+    description: Name of Database to connect to 
+    required: true
+  - name: DATABASE_USER
+    description: User connecting to database
+    required: true
+  - name: DATABASE_PASSWORD
+    description: Password of user connecting to database
+    required: true
+  - name: DATABASE_HOST
+    description: Host url/service of database connection
+    required: true
 objects:
   - apiVersion: v1
     kind: ImageStream