Merge pull request #431 from dave-tucker/golangci-lint-v2

chore: Update to golang-ci-lint v2

Author: dave-tucker

.golangci.yaml

@@ -0,0 +1,23 @@
+version: "2"
+run:
+  allow-parallel-runners: true
+linters:
+  enable:
+    - loggercheck
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - staticcheck
+        text: "QF1008:"
+      # Exclude `lll` issues for long lines with `go:generate`.
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax

Makefile

@@ -145,7 +145,7 @@ OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
 KUSTOMIZE_VERSION ?= v3.8.7
 CONTROLLER_TOOLS_VERSION ?= v0.15.0
 OPERATOR_SDK_VERSION ?= v1.27.0
-GOLANGCI_LINT_VERSION = v1.64.2
+GOLANGCI_LINT_VERSION = v2.0.2
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -285,7 +285,7 @@ verify: ## Verify all the autogenerated code
 .PHONY: prereqs
 prereqs:
 	@echo "### Test if prerequisites are met, and installing missing dependencies"
-	GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
+	GOFLAGS="" go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
 
 .PHONY: lint
 lint: prereqs ## Run linter (golangci-lint).

controllers/bpfman-agent/cl_application_program.go

@@ -696,7 +696,7 @@ func (r *ClBpfApplicationReconciler) isLoaded(ctx context.Context) bool {
 		// This should never happen because the bpfman load is all or nothing,
 		// and we aren't allowing users to add or remove programs from an
 		// existing BpfApplication.  However, if it does happen, log an error.
-		r.Logger.Error(fmt.Errorf("inconsistent program load state"),
+		r.Logger.Error(fmt.Errorf("inconsistent program load state"), "inconsistent program load state",
 			"allProgramsLoaded", allProgramsLoaded, "someProgramsLoaded", someProgramsLoaded)
 	}
 

controllers/bpfman-agent/ns_application_program.go

@@ -613,7 +613,7 @@ func (r *NsBpfApplicationReconciler) isLoaded(ctx context.Context) bool {
 		// This should never happen because the bpfman load is all or nothing,
 		// and we aren't allowing users to add or remove programs from an
 		// existing BpfApplication.  However, if it does happen, log an error.
-		r.Logger.Error(fmt.Errorf("inconsistent program load state"),
+		r.Logger.Error(fmt.Errorf("inconsistent program load state"), "inconsistent program load state",
 			"allProgramsLoaded", allProgramsLoaded, "someProgramsLoaded", someProgramsLoaded)
 	}
 

controllers/bpfman-operator/configmap.go

@@ -324,11 +324,11 @@ func LoadAndConfigureBpfmanDs(config *corev1.ConfigMap, path string, isOpenshift
 	staticBpfmanDeployment.Namespace = config.Namespace
 	staticBpfmanDeployment.Spec.Template.Spec.AutomountServiceAccountToken = ptr.To(true)
 	for cindex, container := range staticBpfmanDeployment.Spec.Template.Spec.Containers {
-		if container.Name == internal.BpfmanContainerName {
+		switch container.Name {
+		case internal.BpfmanContainerName:
 			staticBpfmanDeployment.Spec.Template.Spec.Containers[cindex].Image = bpfmanImage
-		} else if container.Name == internal.BpfmanAgentContainerName {
+		case internal.BpfmanAgentContainerName:
 			staticBpfmanDeployment.Spec.Template.Spec.Containers[cindex].Image = bpfmanAgentImage
-
 			for aindex, arg := range container.Args {
 				if bpfmanHealthProbeAddr != "" {
 					if strings.Contains(arg, "health-probe-bind-address") {
@@ -343,6 +343,8 @@ func LoadAndConfigureBpfmanDs(config *corev1.ConfigMap, path string, isOpenshift
 					}
 				}
 			}
+		default:
+			// Do nothing
 		}
 	}