Merge branch 'main' into feature/#4076-schedulers-refactor-part-3

bcgov · Dec 18, 2024 · 0afa735 · 0afa735
2 parents 757bb07 + c8a8695
commit 0afa735
Show file tree

Hide file tree

Showing 26 changed files with 281 additions and 298 deletions.
diff --git a/.github/workflows/clamav.yml b/.github/workflows/clamav.yml
@@ -33,6 +33,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/crunchy-db.yml b/.github/workflows/crunchy-db.yml
@@ -38,6 +38,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/env-setup-build-forms-server.yml b/.github/workflows/env-setup-build-forms-server.yml
@@ -18,10 +18,15 @@ jobs:
       BUILD_NAMESPACE: ${{ vars.BUILD_NAMESPACE }}
       FORMIO_SOURCE_REPO_TAG: ${{ inputs.formioTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: $BUILD_REF
+          echo OC CLI Version: $(oc version)
       # Checkout the PR branch
       - name: Checkout Target Branch
         uses: actions/checkout@v4

diff --git a/.github/workflows/env-setup-delete-redis.yml b/.github/workflows/env-setup-delete-redis.yml
@@ -23,6 +23,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/env-setup-deploy-forms-server.yml b/.github/workflows/env-setup-deploy-forms-server.yml
@@ -32,10 +32,15 @@ jobs:
       TLS_KEY: ${{ secrets.TLS_KEY }}
       TLS_CA_CERTIFICATE: ${{ secrets.TLS_CA_CERTIFICATE }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo NAMESPACE: $NAMESPACE
           echo HOST_PREFIX: $HOST_PREFIX
+          echo OC CLI Version: $(oc version)
       # Checkout the PR branch
       - name: Checkout Target Branch
         uses: actions/checkout@v4

diff --git a/.github/workflows/env-setup-deploy-redis.yml b/.github/workflows/env-setup-deploy-redis.yml
@@ -23,6 +23,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/env-setup-deploy-secrets.yml b/.github/workflows/env-setup-deploy-secrets.yml
@@ -60,6 +60,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/env-setup-init-redis-cluster-redis.yml b/.github/workflows/env-setup-init-redis-cluster-redis.yml
@@ -23,6 +23,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref_name }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/env-setup-redis-recovery.yml b/.github/workflows/env-setup-redis-recovery.yml
@@ -27,6 +27,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}

diff --git a/.github/workflows/prune-images.yml b/.github/workflows/prune-images.yml
@@ -18,9 +18,9 @@ on:
         required: true
         default: "web-sims, api-sims, queue-consumers-sims, workers-sims"
       ocjobs:
-          description: "Comma seperated list of job Image Streams to prune"
-          required: true
-          default: "db.migrations"
+        description: "Comma seperated list of job Image Streams to prune"
+        required: true
+        default: "db.migrations"
       prefix:
         description: "Branch prefix to restrict pruning to"
         required: false
@@ -44,13 +44,19 @@ jobs:
           echo "PREFIX=${{ inputs.prefix || 'main' }}" >> $GITHUB_ENV
           echo "MIN_TAGS=${{ inputs.minTags || '10' }}" >> $GITHUB_ENV
 
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
+
       - name: Print env
         run: |
           echo "Environment: ${ENVIRONMENT}"
           echo "Applications: ${APPLICATIONS}"
           echo "Jobs: ${OCJOBS}"
           echo "Prefix: ${PREFIX}"
           echo "Minimum Tags: ${MIN_TAGS}"
+          echo "OC CLI Version: $(oc version)"
 
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -80,4 +86,4 @@ jobs:
               --prefix=${PREFIX} \
               --min_tags=${MIN_TAGS} \
               --type=JOB
-          popd
+          popd
diff --git a/.github/workflows/release-build-all.yml b/.github/workflows/release-build-all.yml
@@ -26,7 +26,6 @@ jobs:
           echo Git Ref Name: ${{ github.ref_name }}
           echo Git Head: ${{ github.event.pull_request.head.sha }}
           echo Run Number: ${{ github.run_number }}
-          echo OC CLI Version: $(oc version)
 
   # Create new tag.
   createTag:
@@ -64,10 +63,15 @@ jobs:
     env:
       BUILD_REF: ${{ needs.createTag.outputs.newTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
@@ -88,10 +92,15 @@ jobs:
     env:
       BUILD_REF: ${{ needs.createTag.outputs.newTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
@@ -112,10 +121,15 @@ jobs:
     env:
       BUILD_REF: ${{ needs.createTag.outputs.newTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
@@ -136,10 +150,15 @@ jobs:
     env:
       BUILD_REF: ${{ needs.createTag.outputs.newTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
@@ -160,10 +179,15 @@ jobs:
     env:
       BUILD_REF: ${{ needs.createTag.outputs.newTag }}
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
           echo BRANCH: ${{ needs.createTag.outputs.newTag }}
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/release-deploy-all.yml b/.github/workflows/release-deploy-all.yml
@@ -106,21 +106,23 @@ jobs:
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-latest
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo Deploy Environment: ${{ inputs.environment }}
           echo GIT REF: ${{ inputs.gitRef }}
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
-
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
-
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}
-
       - name: Run db-migrations
         working-directory: "./devops/"
         run: |
@@ -133,21 +135,23 @@ jobs:
     runs-on: ubuntu-latest
     needs: run-db-migrations
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo Deploy ENVIRONMENT: ${{ inputs.environment }}
           echo GIT REF: ${{ inputs.gitRef }}
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
-
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
-
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}
-
       - name: Deploy SIMS-API
         working-directory: "./devops/"
         run: |
@@ -162,20 +166,22 @@ jobs:
     runs-on: ubuntu-latest
     needs: run-db-migrations
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo BUILD ENVIRONMENT: ${{ inputs.environment }}
           echo GIT REF: ${{ inputs.gitRef }}
-
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
-
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}
-
       - name: Deploy Workers
         working-directory: "./devops/"
         run: |
@@ -188,21 +194,23 @@ jobs:
     runs-on: ubuntu-latest
     needs: run-db-migrations
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo Deploy ENVIRONMENT: ${{ inputs.environment }}
           echo GIT REF: ${{ inputs.gitRef }}
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
-
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
-
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}
-
       - name: Deploy Queue Consumers
         working-directory: "./devops/"
         run: |
@@ -215,21 +223,23 @@ jobs:
     runs-on: ubuntu-latest
     needs: run-db-migrations
     steps:
+      - name: Install CLI tools from OpenShift Mirror
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
       - name: Print env
         run: |
           echo Deploy ENVIRONMENT: ${{ inputs.environment }}
           echo GIT REF: ${{ inputs.gitRef }}
           echo BUILD NAMESPACE: $BUILD_NAMESPACE
-
+          echo OC CLI Version: $(oc version)
       - name: Checkout Target Branch
         uses: actions/checkout@v4
         with:
           ref: ${{ inputs.gitRef }}
-
       - name: Log in to OpenShift
         run: |
           oc login --token=${{ secrets.SA_TOKEN }} --server=${{ vars.OPENSHIFT_CLUSTER_URL }}
-
       - name: Deploy Web/Frontend
         working-directory: "./devops/"
         run: |

diff --git a/devops/helm/clam-av/_clamav/configurations/1.0/clamd.conf b/devops/helm/clam-av/_clamav/configurations/1.0/clamd.conf
@@ -562,7 +562,7 @@ MaxRecursion 10
 # Note: disabling this limit or setting it too high may result in severe damage
 # to the system.
 # Default: 10000
-MaxFiles 100
+# MaxFiles 10000
 
 # Maximum size of a file to check for embedded PE. Files larger than this value
 # will skip the additional analysis step.

diff --git a/devops/helm/clam-av/_clamav/values.yaml b/devops/helm/clam-av/_clamav/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: ghcr.io/bcgov/clamav-unprivileged
-  tag: ca3d42f3dde3c5aa9bcab636f752119bbe6a67e8 # pragma: allowlist secret
+  tag: 3a352496562953dc0d371f265d122a6bc06b2b44 # pragma: allowlist secret
   pullPolicy: IfNotPresent
 
 priorityClassName: ""

diff --git a/...ers/src/processors/assessment/_tests_/cancel-application-assessment.processor.e2e-spec.ts b/...ers/src/processors/assessment/_tests_/cancel-application-assessment.processor.e2e-spec.ts
@@ -179,7 +179,7 @@ describe(
       expect(result).toEqual([
         "Assessment cancelled with success.",
         "Attention, process finalized with success but some errors and/or warnings messages may require some attention.",
-        "Error(s): 0, Warning(s): 1, Info: 7",
+        "Error(s): 0, Warning(s): 1, Info: 8",
       ]);
       expect(
         mockedJob.containLogMessage(