Bump golangci-lint (#605)

ormergi · web-flow · commit 4adace92f29c · 2026-03-22T11:14:41.000+01:00
* lint: Upgrade golangci-lint Upgrade to -1 minor latest version. Run or install golangci-lint using Go is no longer the recommended way [1]. Change installation method to recommended one [2]. Following changes were done to have Makefile install golnagci-lint: - GOLANGCI_LINT_VERSION - var, control version to install. - GOLANGCI_LINT_BIN - var, control path where the binary is stored. Defaults to the project binary dir. The target ensure binary is installed only when not exist. The config will be migrated to V2 and following linter issues will be resolved in follow-up commits. [1] https://golangci-lint.run/docs/welcome/install/local/#:~:text=Warning [2] https://golangci-lint.run/docs/welcome/install/local/#binaries Signed-off-by: Or Mergi <ormergi@redhat.com> * lint: Migrate config to V2 This commit changes is the result for the following command: $ make install-golangci-lint $ ./build/_output/bin/golangci-lint migrate Migration failed with the following errors, requiring manual changes: - jsonschema: "linters-settings.nolintlint" does not validate with "/properties/linters-settings/properties/nolintlint/additionalProperties": additional properties 'allow-leading-space' not allowed Rm linters-settings.nolintlint.[].allow-leading-space setting. - jsonschema: "linters-settings.goimports" does not validate with "/properties/linters-settings/properties/goimports/type": got null, want object Rm empty goimports stanza. - jsonschema: "linters-settings.mnd" does not validate with "/properties/linters-settings/properties/mnd/additionalProperties": additional properties 'settings' not allowed Change mnd spec from 'mnd.settings.mnd.checks' to 'mnd.checks'. Config no longer support timeout. Update lint make targets to specify timeout flag. Signed-off-by: Or Mergi <ormergi@redhat.com> * tests: Fix linter issues Signed-off-by: Or Mergi <ormergi@redhat.com> --------- Signed-off-by: Or Mergi <ormergi@redhat.com>
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,121 +1,124 @@
-run:
-  timeout: 3m
-
-linters-settings:
-  dupl:
-    threshold: 150
-
-  funlen:
-    lines: 150
-    statements: 50
-
-  gci:
-    sections:
-    - Prefix(github.com/k8snetworkplumbingwg/kubemacpool)
-
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-
-  gocritic:
-    enabled-tags: [diagnostic, experimental, opinionated, performance, style]
-    disabled-checks:
-      - dupImport        # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
-    settings:
-      hugeParam:
-        sizeThreshold: 1024
-      rangeValCopy:
-        sizeThreshold: 1024
-
-  gocyclo:
-    min-complexity: 15
-
-  goimports:
-
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "github.com/sirupsen/logrus"
-            desc: "logging is allowed only by logutils.Log"
-        allow:
-          - $gostd
-          - github.com/onsi/ginkgo/v2
-          - github.com/onsi/gomega
-          - github.com/k8snetworkplumbingwg/kubemacpool
-          - k8s.io
-          - kubevirt.io
-          - sigs.k8s.io
-          - github.com/pkg/errors
-          - github.com/prometheus/client_golang
-          - github.com/prometheus/common
-
-  mnd:
-    settings:
-      mnd:
-        checks:
-          - argument
-          - case
-          - condition
-          - return
-
-  govet:
-    enable:
-      - shadow
-
-  lll:
-    line-length: 140
-
-  misspell:
-    locale: US
-
-  nolintlint:
-    allow-leading-space: true
-    allow-unused: false
-    require-explanation: false
-    require-specific: false
-
-  stylecheck:
-    dot-import-whitelist:
-      - github.com/onsi/ginkgo/v2
-      - github.com/onsi/gomega
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
-  - bodyclose
-  - dogsled
-  - dupl
-  - errcheck
-  - funlen
-  - gochecknoinits
-  - goconst
-  - gofmt
-  - goheader
-  - goimports
-  - goprintffuncname
-  - govet
-  - ineffassign
-  - misspell
-  - nakedret
-  - noctx
-  - nolintlint
-  - rowserrcheck
-  - unparam
-  - unused
-  - whitespace
-  - exhaustive
-  - gocritic
-  - gocyclo
-  - gosec
-  - gosimple
-  - lll
-  - mnd
-  - depguard
-  - staticcheck
-  - stylecheck
-  - unconvert
+    - bodyclose
+    - depguard
+    - dogsled
+    - dupl
+    - errcheck
+    - exhaustive
+    - funlen
+    - gochecknoinits
+    - goconst
+    - gocritic
+    - gocyclo
+    - goheader
+    - goprintffuncname
+    - gosec
+    - govet
+    - ineffassign
+    - lll
+    - misspell
+    - mnd
+    - nakedret
+    - noctx
+    - nolintlint
+    - rowserrcheck
+    - staticcheck
+    - unconvert
+    - unparam
+    - unused
+    - whitespace
+  settings:
+    depguard:
+      rules:
+        main:
+          allow:
+            - $gostd
+            - github.com/onsi/ginkgo/v2
+            - github.com/onsi/gomega
+            - github.com/k8snetworkplumbingwg/kubemacpool
+            - k8s.io
+            - kubevirt.io
+            - sigs.k8s.io
+            - github.com/pkg/errors
+            - github.com/prometheus/client_golang
+            - github.com/prometheus/common
+          deny:
+            - pkg: github.com/sirupsen/logrus
+              desc: logging is allowed only by logutils.Log
+    dupl:
+      threshold: 150
+    funlen:
+      lines: 150
+      statements: 50
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocritic:
+      disabled-checks:
+        - dupImport
+        - ifElseChain
+        - octalLiteral
+        - whyNoLint
+        - wrapperFunc
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+      settings:
+        hugeParam:
+          sizeThreshold: 1024
+        rangeValCopy:
+          sizeThreshold: 1024
+    gocyclo:
+      min-complexity: 15
+    govet:
+      enable:
+        - shadow
+    lll:
+      line-length: 140
+    misspell:
+      locale: US
+    mnd:
+      checks:
+        - argument
+        - case
+        - condition
+        - return
+    nolintlint:
+      require-explanation: false
+      require-specific: false
+      allow-unused: false
+    staticcheck:
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - Prefix(github.com/k8snetworkplumbingwg/kubemacpool)
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -34,7 +34,8 @@ GOFMT := GOFLAGS=-mod=mod $(GO)fmt
 VET := GOFLAGS=-mod=mod $(GO) vet
 DEEPCOPY_GEN := GOFLAGS=-mod=mod $(GO) install k8s.io/code-generator/cmd/deepcopy-gen@latest
 GO_VERSION = $(shell hack/go-version.sh)
-GOLANGICI_LINT ?= GOFLAGS=-mod=mod $(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
+GOLANGCI_LINT_VERSION := v2.10.1
+GOLANGCI_LINT_BIN := $(BIN_DIR)/golangci-lint
 LINTER_COVERAGE ?= tests/...
 
 E2E_TEST_EXTRA_ARGS ?=
@@ -101,13 +102,16 @@ fmt: $(GO)
 vet: $(GO)
 	$(VET) ./pkg/... ./cmd/... ./tests/...
 
-lint:
-	GOTOOLCHAIN=$$(grep '^toolchain' go.mod | awk '{print $$2}' | sed 's/go//' | awk -F. '{print $$1"."$$2}' || echo ""); \
-	$(GOLANGICI_LINT) run --verbose $(LINTER_COVERAGE)
+$(GOLANGCI_LINT_BIN):
+	@echo "Installing golangci-lint $(GOLANGCI_LINT_VERSION)..."
+	@mkdir -p $(BIN_DIR)
+	curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b $(BIN_DIR) $(GOLANGCI_LINT_VERSION)
+
+lint: $(GOLANGCI_LINT_BIN)
+	$(GOLANGCI_LINT_BIN) run --timeout=10m --verbose $(LINTER_COVERAGE)
 
-lint-fix:
-	GOTOOLCHAIN=$$(grep '^toolchain' go.mod | awk '{print $$2}' | sed 's/go//' | awk -F. '{print $$1"."$$2}' || echo ""); \
-	$(GOLANGICI_LINT) run --verbose --fix $(LINTER_COVERAGE)
+lint-fix: $(GOLANGCI_LINT_BIN)
+	$(GOLANGCI_LINT_BIN) run --timeout=10m --verbose --fix $(LINTER_COVERAGE)
 
 lint-metrics: $(GO)
 	OCI_BIN=$(OCI_BIN) ./hack/prom_metric_linter.sh --operator-name="kmp" --sub-operator-name="kmp"
diff --git a/tests/alert_collision_test.go b/tests/alert_collision_test.go
@@ -192,7 +192,8 @@ func expectAlertNotFiring(p *PromClient, alertName string) {
 func waitForPortForwardReady(port int) {
 	By("Waiting for Prometheus port-forward to be ready")
 	Eventually(func() bool {
-		conn, err := net.DialTimeout("tcp", fmt.Sprintf("127.0.0.1:%d", port), time.Second)
+		d := net.Dialer{Timeout: timeout}
+		conn, err := d.DialContext(context.Background(), "tcp", fmt.Sprintf("127.0.0.1:%d", port))
 		if err != nil {
 			return false
 		}
diff --git a/tests/kubectl/kubectl.go b/tests/kubectl/kubectl.go
@@ -2,14 +2,15 @@ package kubectl
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
 )
 
 func Kubectl(command ...string) (stdout, stderr string, err error) {
 	var stdoutBuf, stderrBuf bytes.Buffer
-	cmd := exec.Command("./cluster/kubectl.sh", command...)
+	cmd := exec.CommandContext(context.Background(), "./cluster/kubectl.sh", command...)
 	cmd.Dir = getClusterRootDirectory()
 	cmd.Stderr = &stderrBuf
 	cmd.Stdout = &stdoutBuf
@@ -30,7 +31,7 @@ func getClusterRootDirectory() string {
 // StartPortForwardCommand starts a port-forward command in the background and returns the process
 func StartPortForwardCommand(namespace, podName string, sourcePort, targetPort int) (*exec.Cmd, error) {
 	// #nosec G204 -- test code with controlled inputs
-	cmd := exec.Command("./cluster/kubectl.sh", "port-forward", "-n", namespace,
+	cmd := exec.CommandContext(context.Background(), "./cluster/kubectl.sh", "port-forward", "-n", namespace,
 		fmt.Sprintf("pod/%s", podName), fmt.Sprintf("%d:%d", sourcePort, targetPort))
 	cmd.Dir = getClusterRootDirectory()
 
diff --git a/tests/tests.go b/tests/tests.go
@@ -19,7 +19,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
+	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/client-go/kubernetes"
@@ -164,7 +164,7 @@ func findManagerNamespace() string {
 	pods, err := getKubemacpoolPods()
 	ExpectWithOffset(1, err).ToNot(HaveOccurred(), "should be able to retrieve manager pods")
 	ExpectWithOffset(1, pods.Items).ToNot(BeEmpty(), "should have multiple manager pods")
-	namespace := pods.Items[0].ObjectMeta.Namespace
+	namespace := pods.Items[0].Namespace
 	ExpectWithOffset(1, namespace).ToNot(BeEmpty(), "should be a namespace at manager pods")
 	return namespace
 }
@@ -272,7 +272,7 @@ func enableKubeVirtFeatureGate(featureGate string) error {
 }
 
 func restartVirtualMachine(namespace, name string) error {
-	cmd := exec.Command("virtctl", "restart", name, "-n", namespace)
+	cmd := exec.CommandContext(context.Background(), "virtctl", "restart", name, "-n", namespace)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		return fmt.Errorf("failed to restart VM %s/%s: %v, output: %s", namespace, name, err, string(output))
@@ -353,7 +353,7 @@ func restartPodsFromDeployment(deploymentName string) error {
 	if err != nil {
 		return err
 	}
-	labelSelector := labels.Set(deployment.Spec.Selector.MatchLabels).String()
+	labelSelector := k8slabels.Set(deployment.Spec.Selector.MatchLabels).String()
 
 	podList, err := testClient.K8sClient.CoreV1().Pods(managerNamespace).List(context.TODO(),
 		metav1.ListOptions{LabelSelector: labelSelector})
@@ -578,7 +578,7 @@ func addFinalizer(virtualMachine *kubevirtv1.VirtualMachine, finalizerName strin
 		if helper.ContainsString(finalizersList, finalizerName) {
 			return nil
 		}
-		virtualMachine.ObjectMeta.Finalizers = append(virtualMachine.ObjectMeta.Finalizers, finalizerName)
+		virtualMachine.Finalizers = append(virtualMachine.Finalizers, finalizerName)
 		err = testClient.CRClient.Update(context.TODO(), virtualMachine)
 		return err
 	})
diff --git a/tests/tests_suite_test.go b/tests/tests_suite_test.go
