Merge pull request #372 from openshift-cherrypick-robot/cherry-pick-371-to-release-4.16

[release-4.16] OCPBUGS-43473: update goimports targets

Author: openshift-merge-bot[bot]

.golangci.yaml

@@ -0,0 +1,13 @@
+linters:
+  # https://golangci-lint.run/usage/linters/#enabled-by-default-linters
+  enable:
+    # default linters
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    # optional linters
+    - goimports
+

Makefile

@@ -59,7 +59,7 @@ manifests:
 # Run go fmt against code
 .PHONY: fmt
 fmt:
-	hack/goimports.sh
+	go fmt ./...
 
 # Run go vet against code
 .PHONY: vet
@@ -69,7 +69,7 @@ vet:
 # Run golangci-lint against code
 .PHONY: lint
 lint:
-	( GOLANGCI_LINT_CACHE=$(PROJECT_DIR)/.cache $(GOLANGCI_LINT) run --timeout 10m )
+	( GOLANGCI_LINT_CACHE=$(PROJECT_DIR)/.cache $(GOLANGCI_LINT) run --timeout 10m -v)
 
 # Run go mod
 .PHONY: vendor