Merge branch 'master' into chore/update-sdk-1.17.0

Author: lucacome

.github/workflows/ci.yml

@@ -189,8 +189,7 @@ jobs:
         continue-on-error: true
         with:
           image-ref: nginx/nginx-ingress-operator:${{ steps.meta.outputs.version }}
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
+          format: 'sarif'
           output: 'trivy-results.sarif'
           ignore-unfixed: 'true'
       - name: Upload Trivy scan results to GitHub Security tab

.github/workflows/lint.yml

@@ -21,9 +21,6 @@ concurrency:
   group: ${{ github.ref_name }}-lint
   cancel-in-progress: true
 
-env:
-  GOLANGCI_TIMEOUT: 10m0s
-
 jobs:
 
   lint:
@@ -32,7 +29,12 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Lint Code
-        uses: golangci/golangci-lint-action@v2
+      - name: Output Variables
+        id: vars
+        run: echo "::set-output name=go_version::$(grep "go 1." go.mod | cut -d " " -f 2)"
+      - name: Setup Golang Environment
+        uses: actions/setup-go@v2
         with:
-          args: --timeout ${{ env.GOLANGCI_TIMEOUT }}
+          go-version: ${{ steps.vars.outputs.go_version }}
+      - name: Lint Code
+        uses: golangci/golangci-lint-action@v3

.golangci.yml

@@ -60,3 +60,5 @@ linters:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+run:
+  timeout: 5m

Dockerfile

@@ -19,6 +19,8 @@ COPY controllers/ controllers/
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.version=${VERSION}" -a -o manager main.go
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as base
+# temporary fix for CVE-2022-24407
+RUN microdnf --nodocs upgrade -y cyrus-sasl-lib
 ARG VERSION
 WORKDIR /
 COPY config/crd/kic ./config/crd/kic

Makefile

@@ -129,7 +129,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: test ## Build docker image with the manager.
-	docker build -t ${IMG} -f ${DOCKERFILE} . --build-arg VERSION=${VERSION} --target local
+	docker build -t ${IMG} . --build-arg VERSION=${VERSION} --target local
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.