chore(ci): backend frontend docker

.github/workflows/.deploy.yml

@@ -77,7 +77,9 @@ jobs:
 
   database:
     name: Database
-    needs: init
+    needs: 
+      - init
+    if: success()
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-24.04
     steps:
@@ -96,7 +98,7 @@ jobs:
             -p TAG=${{ inputs.tag }}
             -p ZONE=${{ inputs.target }}
             -p STORAGE_CLASS=netapp-file-standard
-            -p REQUEST_CPU=200m
+            -p REQUEST_CPU=85m
             -p LIMIT_CPU=500m
             -p LIMIT_MEMORY=1Gi
 
@@ -145,21 +147,21 @@ jobs:
               -p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }}
               -p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }}
 
-  # frontend: 
-  #   name: Frontend
-  #   needs: [ init, database, backend ]
-  #   environment: ${{ inputs.environment }}
-  #   runs-on: ubuntu-24.04
-  #   steps:
-  #     - name: Deploy Frontend
-  #       uses: bcgov/[email protected]
-  #       with:
-  #         oc_namespace: ${{ vars.OC_NAMESPACE }}
-  #         oc_server: ${{ vars.OC_SERVER }}
-  #         oc_token: ${{ secrets.OC_TOKEN }}
-  #         oc_version: "4.14.37"
-  #         file: frontend/openshift.deploy.yml
-  #         parameters:
-  #           -p ZONE=${{ inputs.target }}
-  #           -p TAG=${{ inputs.tag }}
+  frontend: 
+    name: Frontend
+    needs: [ init, database, backend ]
+    environment: ${{ inputs.environment }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Deploy Frontend
+        uses: bcgov/[email protected]
+        with:
+          oc_namespace: ${{ vars.OC_NAMESPACE }}
+          oc_server: ${{ vars.OC_SERVER }}
+          oc_token: ${{ secrets.OC_TOKEN }}
+          oc_version: "4.14.37"
+          file: frontend/openshift.deploy.yml
+          parameters:
+            -p ZONE=${{ inputs.target }}
+            -p TAG=${{ inputs.tag }}
 

backend/openshift.deploy.yml

@@ -170,56 +170,72 @@ objects:
           name: ${REPO}-${ZONE}-${COMPONENT}
           deployment: ${REPO}-${ZONE}-${COMPONENT}
       spec:
-        # initContainers:
-        #   - name: check-database
-        #     image: 'ghcr.io/bcgov/${REPO}/database:${TAG}'
-        #     labels: 
-        #       name: ${REPO}-${ZONE}-${COMPONENT}
-        #     command: ["/bin/bash", "-c", "set -x; psql -qtAX -c 'select 1'"]
-        #     env:
-        #       - name: PGDATABASE
-        #         valueFrom:
-        #           secretKeyRef: 
-        #             name: ${REPO}-${ZONE}-database
-        #             key: database-name
-        #       - name: PGUSER
-        #         valueFrom:
-        #           secretKeyRef: 
-        #             name: ${REPO}-${ZONE}-database
-        #             key: database-user
-        #       - name: PGPASSWORD
-        #         valueFrom:
-        #           secretKeyRef: 
-        #             name: ${REPO}-${ZONE}-database
-        #             key: database-password
-        #       - name: PGHOST
-        #         value: ${REPO}-${ZONE}-database
-        #     resources:
-        #       limits:
-        #         cpu: 50m
-        #         memory: 256Mi
-        #       requests:
-        #         cpu: 10m
-        #         memory: 128Mi
+        initContainers:
+          - name: check-database
+            image: 'ghcr.io/bcgov/${REPO}/database:${TAG}'
+            labels: 
+              name: ${REPO}-${ZONE}-${COMPONENT}
+            command:
+              - /bin/bash
+              - "-c"
+              - |
+                echo "Waiting for PostgreSQL..."
+                until PGPASSWORD=$PGPASSWORD psql -h ${PGHOST} -U ${PGUSER} -d ${PGDATABASE} -c "SELECT 1"; do
+                  echo "PostgreSQL is unavailable - sleeping"
+                  sleep 5
+                done
+                echo "PostgreSQL is up!"
+            env:
+              - name: PGDATABASE
+                valueFrom:
+                  secretKeyRef: 
+                    name: ${REPO}-${ZONE}-database
+                    key: database-name
+              - name: PGUSER
+                valueFrom:
+                  secretKeyRef: 
+                    name: ${REPO}-${ZONE}-database
+                    key: database-user
+              - name: PGPASSWORD
+                valueFrom:
+                  secretKeyRef: 
+                    name: ${REPO}-${ZONE}-database
+                    key: database-password
+              - name: PGHOST
+                value: ${REPO}-${ZONE}-database
+            resources:
+              limits:
+                cpu: 50m
+                memory: 256Mi
+              requests:
+                cpu: 10m
+                memory: 128Mi
 
-        # volumes:
-        #   - name: staticfiles
-        #     emptyDir:
-        #       sizeLimit: 250Mi
+        volumes:
+          - name: staticfiles
+            emptyDir:
+              sizeLimit: 250Mi
         containers:
         - name: ${REPO}-${ZONE}-${COMPONENT}-app
           image: 'ghcr.io/bcgov/${REPO}/${COMPONENT}:${TAG}'
-          # volumeMounts:
-          #   - name: staticfiles
-          #     mountPath: /app/staticfiles
+          volumeMounts:
+            - name: staticfiles
+              mountPath: /app/staticfiles
           ports:
           - containerPort: 8000
             protocol: TCP
           env:
-          - name: DATABASE_SERVICE_NAME
-            value: ${REPO}-${ZONE}-database
-          - name: DATABASE_PORT
-            value: "5432"
+            - name: DATABASE_SERVICE_NAME
+              value: ${REPO}-${ZONE}-database
+            - name: DATABASE_PORT
+              value: "5432"
+            - name: DATABASE_HOST
+            valueFrom:
+              secretKeyRef:
+                name: ${REPO}-${ZONE}-database
+                key: database-host
+            - name: PGHOST
+              value: ${REPO}-${ZONE}-database
           - name: DATABASE_NAME
             valueFrom:
               secretKeyRef:
@@ -487,7 +503,7 @@ objects:
           capabilities:
             add: ["NET_BIND_SERVICE"]
         schedulerName: default-scheduler
-- apiVersion: autoscaling/v1
+- apiVersion: autoscaling/v2
   kind: HorizontalPodAutoscaler
   metadata:
     creationTimestamp: 
@@ -499,7 +515,7 @@ objects:
     maxReplicas: 5
     minReplicas: 1
     scaleTargetRef:
-      apiVersion: v1
+      apiVersion: apps/v1
       kind: Deployment
       name: ${REPO}-${ZONE}-${COMPONENT}
     targetCPUUtilizationPercentage: 90
@@ -520,23 +536,23 @@ objects:
       name: ${REPO}-${ZONE}-${COMPONENT}
     type: ClusterIP
     sessionAffinity: None
-# - kind: Route
-#   apiVersion: v1
-#   metadata:
-#     name: ${REPO}-${ZONE}-${COMPONENT}
-#     labels:
-#       frontend: 'true'
-#       app: ${REPO}-${ZONE}-${COMPONENT}
-#   spec:
-#     host: ${REPO}-${ZONE}-${COMPONENT}.apps.silver.devops.gov.bc.ca
-#     path: "/gwells"
-#     to:
-#       kind: Service
-#       name: ${REPO}-${ZONE}-${COMPONENT}
-#       weight: 100
-#     port:
-#       targetPort: web
-#     tls:
-#       insecureEdgeTerminationPolicy: Redirect
-#       termination: edge
-#     wildcardPolicy: None
+- kind: Route
+  apiVersion: v1
+  metadata:
+    name: ${REPO}-${ZONE}-${COMPONENT}
+    labels:
+      frontend: 'true'
+      app: ${REPO}-${ZONE}-${COMPONENT}
+  spec:
+    host: ${REPO}-${ZONE}-${COMPONENT}.apps.silver.devops.gov.bc.ca
+    path: "/gwells"
+    to:
+      kind: Service
+      name: ${REPO}-${ZONE}-${COMPONENT}
+      weight: 100
+    port:
+      targetPort: web
+    tls:
+      insecureEdgeTerminationPolicy: Redirect
+      termination: edge
+    wildcardPolicy: None

database/openshift.deploy.yml

@@ -47,6 +47,11 @@ parameters:
     value: gluster-file-db
 objects:
   - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: ${REPO}-${ZONE}-${COMPONENT}-config
+      labels:
+        app: ${REPO}-${ZONE}
     data:
       setup.sql: |-
         SET application_name="container_setup";
@@ -104,13 +109,6 @@ objects:
         grant usage on schema postgis_ftw to ftw_reader;
         ALTER DEFAULT PRIVILEGES IN SCHEMA postgis_ftw GRANT SELECT ON TABLES TO ftw_reader;
 
-    kind: ConfigMap
-    metadata:
-      labels:
-        app: ${REPO}-${ZONE}
-        name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
-        appver: ${REPO}-${ZONE}-${COMPONENT}
-      name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
   - apiVersion: v1
     kind: Service
     metadata:
@@ -240,11 +238,11 @@ objects:
                     - >-
                       psql -q -d
                       $PG_DATABASE -c 'SELECT 1'
-                failureThreshold: 5
-                initialDelaySeconds: 30
-                periodSeconds: 15
+                initialDelaySeconds: 180
+                periodSeconds: 30
                 successThreshold: 1
-                timeoutSeconds: 1
+                failureThreshold: 15
+                timeoutSeconds: 10
               resources:
                 requests:
                   cpu: ${REQUEST_CPU}
@@ -257,7 +255,7 @@ objects:
                 privileged: false
               terminationMessagePath: /dev/termination-log
               volumeMounts:
-                - mountPath: /pgdata
+                - mountPath: /pgdata/userdata
                   name: ${REPO}-${ZONE}-${COMPONENT}-data
                 - mountPath: /var/run/postgresql
                   name: ${REPO}-${ZONE}-${COMPONENT}-run
@@ -271,6 +269,43 @@ objects:
                 claimName: ${REPO}-${ZONE}-${COMPONENT}
             - name: ${REPO}-${ZONE}-${COMPONENT}-run
               emptyDir: {}
-            - configMap:
+            - name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
+              configMap:
                 name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
-              name: ${REPO}-${ZONE}-${COMPONENT}-setupcfg
+  - apiVersion: networking.k8s.io/v1
+    kind: NetworkPolicy
+    metadata:
+      name: allow-same-namespace
+      labels:
+        template: nr-gwells-backend-network-security-policy
+    spec:
+      podSelector: {}
+      ingress:
+        - from:
+            - namespaceSelector:
+                matchLabels:
+                  environment: dev
+                  name: cd43d9
+      policyTypes:
+        - Ingress
+  - apiVersion: autoscaling/v2
+    kind: HorizontalPodAutoscaler
+    metadata:
+      name: ${REPO}-${ZONE}-${COMPONENT}
+      labels:
+        app: ${REPO}-${ZONE}
+        appver: ${REPO}-${ZONE}-${COMPONENT}
+    spec:
+      scaleTargetRef:
+        apiVersion: apps/v1
+        kind: Deployment
+        name: ${REPO}-${ZONE}-${COMPONENT}
+      minReplicas: 1
+      maxReplicas: 5
+      metrics:
+        - type: Resource
+          resource:
+            name: cpu
+            target:
+              type: Utilization
+              averageUtilization: 90