chore: clamav docker folder move, adjust resources, cleanup helm values

Author: AdvSol-Darrel

.github/workflows/publish-clamav.yml

@@ -3,10 +3,10 @@ name: Build and Publish ClamAV Image
 on:
   push:
     branches:
-    - main
+      - main
     paths:
-    - .github/workflows/publish-clamav.yml
-    - clamav/**
+      - .github/workflows/publish-clamav.yml
+      - ./devops/docker/clamav/**
 
 env:
   GITHUB_REGISTRY: ghcr.io
@@ -20,18 +20,18 @@ jobs:
       packages: write
 
     steps:
-    - uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
-    - uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
+      - uses: hmarr/debug-action@f7318c783045ac39ed9bb497e22ce835fdafbfe6
+      - uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
 
-    - name: Build and Push
-      uses: egose/actions/docker-build-push@46d589997e49cae4a8a3d06644ae8b04351a30f2
-      with:
-        registry-url: ${{ env.GITHUB_REGISTRY }}
-        registry-username: ${{ github.actor }}
-        registry-password: ${{ secrets.GITHUB_TOKEN }}
-        image-name: bcgov/hesp-clamav
-        docker-context: clamav
-        docker-file: clamav/Dockerfile
-        metadata-tags: |
-          type=ref,event=branch
-          type=sha,format=long,prefix=,suffix=
+      - name: Build and Push
+        uses: egose/actions/docker-build-push@46d589997e49cae4a8a3d06644ae8b04351a30f2
+        with:
+          registry-url: ${{ env.GITHUB_REGISTRY }}
+          registry-username: ${{ github.actor }}
+          registry-password: ${{ secrets.GITHUB_TOKEN }}
+          image-name: bcgov/hesp-clamav
+          docker-context: clamav
+          docker-file: devops/docker/clamav/Dockerfile
+          metadata-tags: |
+            type=ref,event=branch
+            type=sha,format=long,prefix=,suffix=

clamav/Dockerfile devops/docker/clamav/Dockerfileclamav/Dockerfile renamed to devops/docker/clamav/Dockerfile

@@ -227,18 +227,3 @@ anycableGo:
 # ClamAV Configuration for Dev
 clamav:
   enabled: true
-
-  resources:
-    requests:
-      cpu: 50m
-      memory: 256Mi
-    limits:
-      cpu: 200m
-      memory: 1Gi
-
-  persistence:
-    size: 512Mi
-
-  virusScanTempVolume:
-    enabled: true
-    size: 512Mi

…cripts/docker-entrypoint-unprivileged.sh …cripts/docker-entrypoint-unprivileged.shclamav/scripts/docker-entrypoint-unprivileged.sh renamed to devops/docker/clamav/scripts/docker-entrypoint-unprivileged.sh clamav/scripts/docker-entrypoint-unprivileged.sh renamed to devops/docker/clamav/scripts/docker-entrypoint-unprivileged.sh

@@ -189,18 +189,3 @@ anycableGo:
 # ClamAV Configuration for Production
 clamav:
   enabled: true
-
-  resources:
-    requests:
-      cpu: 50m
-      memory: 256Mi
-    limits:
-      cpu: 200m
-      memory: 1Gi
-
-  persistence:
-    size: 512Mi
-
-  virusScanTempVolume:
-    enabled: true
-    size: 512Mi

helm/main/values-bfc7dd-dev.yaml

@@ -219,18 +219,3 @@ anycableGo:
 # ClamAV Configuration for Test
 clamav:
   enabled: true
-
-  resources:
-    requests:
-      cpu: 50m
-      memory: 256Mi
-    limits:
-      cpu: 200m
-      memory: 1Gi
-
-  persistence:
-    size: 512Mi
-
-  virusScanTempVolume:
-    enabled: true
-    size: 512Mi

helm/main/values-bfc7dd-prod.yaml

@@ -352,9 +352,18 @@ anycableGo:
       cpu: 20m
       memory: 128Mi
 
-# ClamAV antivirus service
+# ClamAV antivirus service, default settings
 clamav:
   enabled: true
+
+  resources:
+    requests:
+      cpu: 100m
+      memory: 1Gi
+    limits:
+      cpu: 200m
+      memory: 2Gi
+
   image:
     repository: ghcr.io/bcgov/hesp-clamav
     tag: main