merge main

GovAlta · Nov 4, 2024 · ee24ee0 · ee24ee0
1 parent 22ece3c
commit ee24ee0
Show file tree

Hide file tree

Showing 170 changed files with 9,748 additions and 4,154 deletions.
diff --git a/.github/workflows/delivery-ci.yml b/.github/workflows/delivery-ci.yml
@@ -120,8 +120,16 @@ jobs:
           oc apply -f ${{ matrix.app }}.dev.json -l apply-dev=true,component!=database
       - name: Deploy Dev
         run: |
-          oc rollout latest dc/${{ matrix.app }}
-          oc rollout status dc/${{ matrix.app }}
+          if oc get dc/${{ matrix.app }} ; then
+            oc rollout latest dc/${{ matrix.app }}
+            oc rollout status dc/${{ matrix.app }}
+          elif oc get deployment/${{ matrix.app }} ; then
+            oc set triggers deployment/${{ matrix.app }} --auto
+            oc rollout status deployment/${{ matrix.app }}
+            oc set triggers deployment/${{ matrix.app }} --manual
+          else
+            echo 'No DeploymentConfig or Deployment found for ${{ matrix.app }}.'
+          fi
 
   devSmokeTest:
     runs-on: ubuntu-22.04
@@ -186,8 +194,16 @@ jobs:
           oc apply -f ${{ matrix.app }}.uat.json -l apply-staging=true,component!=database
       - name: Deploy Staging
         run: |
-          oc rollout latest dc/${{ matrix.app }}
-          oc rollout status dc/${{ matrix.app }}
+          if oc get dc/${{ matrix.app }} ; then
+            oc rollout latest dc/${{ matrix.app }}
+            oc rollout status dc/${{ matrix.app }}
+          elif oc get deployment/${{ matrix.app }} ; then
+            oc set triggers deployment/${{ matrix.app }} --auto
+            oc rollout status deployment/${{ matrix.app }}
+            oc set triggers deployment/${{ matrix.app }} --manual
+          else
+            echo 'No DeploymentConfig or Deployment found for ${{ matrix.app }}.'
+          fi
 
   stagingSmokeTest:
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
@@ -108,8 +108,16 @@ jobs:
           oc apply -f ${{ matrix.app }}.prod.json -l apply-prod=true,component!=database
       - name: Deploy Production
         run: |
-          oc rollout latest dc/${{ matrix.app }}
-          oc rollout status dc/${{ matrix.app }}
+          if oc get dc/${{ matrix.app }} ; then
+            oc rollout latest dc/${{ matrix.app }}
+            oc rollout status dc/${{ matrix.app }}
+          elif oc get deployment/${{ matrix.app }} ; then
+            oc set triggers deployment/${{ matrix.app }} --auto
+            oc rollout status deployment/${{ matrix.app }}
+            oc set triggers deployment/${{ matrix.app }} --manual
+          else
+            echo 'No DeploymentConfig or Deployment found for ${{ matrix.app }}.'
+          fi
 
   smokeTestProd:
     runs-on: ubuntu-22.04

diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@ Thumbs.db
 **/cypress.json
 **/cypress.*.local.json
 **/cypress.*.local.config.js
+**/cypress.*.local.js
 apps/tenant-management-webapp-e2e/cypress/
 
 # Artillery csv for environments not to be checked in

diff --git a/.openshift/configuration/export-service.yml b/.openshift/configuration/export-service.yml
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: List
+items:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      labels:
+        app: export-service
+        component: api
+      name: export-service
+    data:
+      KEYCLOAK_ROOT_URL: https://access.adsp-dev.gov.ab.ca
+      DIRECTORY_URL: https://directory-service.adsp-dev.gov.ab.ca
+      AMQP_HOST: event-service-rabbitmq-balancer
+      LOG_LEVEL: debug
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      labels:
+        app: export-service
+        component: api
+      name: export-service
+    stringData:
+      CLIENT_ID: urn:ads:platform:export-service
+      CLIENT_SECRET:
+      AMQP_USER: export-service
+      AMQP_PASSWORD:
diff --git a/.openshift/managed/event-service.yml b/.openshift/managed/event-service.yml
@@ -415,6 +415,103 @@ objects:
               name: event-service:${DEPLOY_TAG}
               namespace: ${INFRA_NAMESPACE}
           type: ImageChange
+  - apiVersion: apps/v1
+    kind: Deployment
+    metadata:
+      labels:
+        app: event-service
+        component: job
+        apply-dev: "true"
+        apply-test: "true"
+        apply-staging: "true"
+        apply-prod: "true"
+      name: event-service-job
+      annotations:
+        image.openshift.io/triggers: |-
+          [
+            {
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "event-service:${DEPLOY_TAG}",
+                "namespace": "${INFRA_NAMESPACE}"
+              },
+              "fieldPath": "spec.template.spec.containers[0].image"
+            }
+          ]
+    spec:
+      replicas: 1
+      selector:
+        matchLabels:
+          app: event-service
+          component: job
+      template:
+        metadata:
+          labels:
+            app: event-service
+            component: job
+        spec:
+          containers:
+            - image: >-
+                image-registry.openshift-image-registry.svc:5000/adsp-build/event-service@${DEPLOY_TAG}
+              envFrom:
+                - configMapRef:
+                    name: event-service
+                - configMapRef:
+                    name: directory-overrides
+                - secretRef:
+                    name: event-service
+              env:
+                - name: PORT
+                  value: "3333"
+                - name: AMQP_CONSUMER_PRIORITY
+                  value: "1"
+              imagePullPolicy: IfNotPresent
+              name: event-service
+              ports:
+                - containerPort: 3333
+                  name: http
+                  protocol: TCP
+              resources:
+                limits:
+                  cpu: 100m
+                  memory: 200Mi
+                requests:
+                  cpu: 20m
+                  memory: 50Mi
+              terminationMessagePath: /dev/termination-log
+              terminationMessagePolicy: File
+              readinessProbe:
+                httpGet:
+                  path: /
+                  port: 3333
+                  scheme: HTTP
+                initialDelaySeconds: 2
+                timeoutSeconds: 1
+                periodSeconds: 5
+                successThreshold: 1
+                failureThreshold: 20
+              livenessProbe:
+                httpGet:
+                  path: /
+                  port: 3333
+                  scheme: HTTP
+                initialDelaySeconds: 60
+                timeoutSeconds: 2
+                periodSeconds: 60
+                successThreshold: 1
+                failureThreshold: 5
+          dnsPolicy: ClusterFirst
+          restartPolicy: Always
+          schedulerName: default-scheduler
+          securityContext: {}
+          terminationGracePeriodSeconds: 30
+      strategy:
+        type: RollingUpdate
+        rollingUpdate:
+          maxUnavailable: 25%
+          maxSurge: 25%
+      revisionHistoryLimit: 10
+      progressDeadlineSeconds: 600
   - apiVersion: v1
     kind: Service
     metadata: