Update github action workflow (#41)

dell · Oct 15, 2024 · 5f2771c · 5f2771c
1 parent 5e0775e
commit 5f2771c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/containerscan/allowedlist.yaml b/.github/containerscan/allowedlist.yaml
@@ -3,6 +3,11 @@ general:
     # list of CVEs that are currently unfixed
     - CVE-2021-3121
     - CVE-2020-29652
+    - CVE-2022-25315
+    - CVE-2022-25235
+    - CVE-2022-25236
+    - CVE-2021-44568
+    - CVE-2022-24407
   bestPracticeViolations:
     # list of best practies violatied that needs a fix
     - DKL-DI-0006

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -46,11 +46,6 @@ jobs:
     steps:
       - name: Checkout the code
         uses: actions/checkout@v2
-      - name: Checkout csm-operator
-        uses: actions/checkout@v2
-        with:
-          repository: 'dell/csm-operator'
-          path: 'csm-operator'
       - name: Run unit tests and check package coverage
         uses: dell/common-github-actions/go-code-tester@csm-operator-drivers
         with:
@@ -92,10 +87,10 @@ jobs:
       - name: Get dependencies
         run: go mod download
       - name: Build Docker Images
-        run: make docker-build
-      #- name: Scan controller Image
-      #  uses: Azure/container-scan@v0
-      #  with:
-      #    image-name: controller:latest
-      #    severity-threshold: HIGH
+        run: DEFAULT_IMG=csm-operator:latest make docker-build
+      - name: Scan controller Image
+        uses: Azure/container-scan@v0
+        with:
+          image-name: csm-operator:latest
+          severity-threshold: HIGH
 
diff --git a/docker.mk b/docker.mk
@@ -22,7 +22,9 @@ TIMESTAMP := $(shell  date +%Y%m%d%H%M%S)
 
 # Image URL to use all building/pushing image targets
 # Local Image
+ifeq ($(DEFAULT_IMG),)
 DEFAULT_IMG ?= "$(IMAGE_TAG_BASE):$(TIMESTAMP)"
+endif
 
 # Operator image name
 IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)"
@@ -33,4 +35,4 @@ IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)"
 BUNDLE_IMG ?= "$(REGISTRY)/$(BUNDLE_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"
 
 # The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0).
-CATALOG_IMG ?= "$(REGISTRY)/$(CATALOG_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"
+CATALOG_IMG ?= "$(REGISTRY)/$(CATALOG_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)"