Update golangci-lint to v1.60.2

This should fix the hanging prow tests.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

.golangci.yml

@@ -18,7 +18,6 @@ linters:
     - canonicalheader
     - containedctx
     - contextcheck
-    - copyloopvar
     - decorder
     - dogsled
     - dupl
@@ -29,7 +28,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - fatcontext
     - forcetypeassert
     - gci
@@ -99,8 +97,10 @@ linters:
     - wastedassign
     - whitespace
     - zerologlint
+    # - copyloopvar
     # - cyclop
     # - depguard
+    # - err113
     # - exhaustruct
     # - forbidigo
     # - funlen
@@ -129,6 +129,9 @@ linters-settings:
       - golang.org/x/sys
   gocognit:
     min-complexity: 40
+  gosec:
+    excludes:
+      - G115  # Potential integer overflow when converting between types
   nestif:
     min-complexity: 15
   gci:

Makefile

@@ -14,7 +14,7 @@
 
 GO ?= go
 
-GOLANGCI_LINT_VERSION = v1.59.1
+GOLANGCI_LINT_VERSION = v1.60.2
 REPO_INFRA_VERSION = v0.2.5
 KUSTOMIZE_VERSION = 5.2.1
 OPERATOR_SDK_VERSION ?= v1.25.0

dependencies.yaml

@@ -12,7 +12,7 @@ dependencies:
       match: CI_IMAGE
 
   - name: golangci-lint
-    version: 1.59.1
+    version: 1.60.2
     refPaths:
     - path: Makefile
       match: GOLANGCI_LINT_VERSION

test/tc_apparmor_base_usage_test.go

@@ -127,7 +127,7 @@ func (e *e2e) assertAppArmorProfileIsInstalled(
 					profile, missingPolName,
 				))
 			} else {
-				e.logf(fmt.Sprintf("The profile %s wasn't found, trying again", profile))
+				e.logf("The profile %s wasn't found, trying again", profile)
 				time.Sleep(sleep)
 			}
 		}

test/tc_webhook_config_test.go

@@ -48,7 +48,7 @@ func (e *e2e) testCaseWebhookOptionsChange([]string) {
 	whDefault := e.getAllWebhookAttributes()
 
 	whPatch := fmt.Sprintf(`{"spec":{"webhookOptions":[{"name":"binding.spo.io","failurePolicy":"Ignore","namespaceSelector":%s, "objectSelector":%s}]}}`, whNamespaceSelector, whObjectSelector) //nolint:lll // very long patch line
-	e.logf(whPatch)
+	e.logf("Using patch: %s", whPatch)
 	e.kubectlOperatorNS("patch", "spod", "spod", "-p", whPatch, "--type=merge")
 	time.Sleep(defaultWaitTime)