Use go 1.24 and golangci-lint v2 (#330)

Author: jotak

.github/workflows/pull_request.yml

@@ -8,16 +8,13 @@ jobs:
   build-test:
     name: Build, lint, test
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
 
     steps:
     - uses: actions/checkout@v3
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ matrix.go }}
+        go-version: '1.24'
     - name: Install make
       run: sudo apt -y install make
     - name: run build
@@ -27,7 +24,6 @@ jobs:
     - name: check clean vendors
       run: go mod vendor
     - name: Report coverage
-      if: ${{ matrix.go == '1.23' }}
       uses: codecov/codecov-action@v4
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/pull_request_e2e.yml

@@ -23,7 +23,7 @@ jobs:
     - name: set up go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.23'
+        go-version: '1.24'
     - name: checkout
       uses: actions/checkout@v3
     - name: get kernel version

.github/workflows/push_image.yml

@@ -13,16 +13,13 @@ jobs:
   push-image:
     name: push image
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
     steps:
       - name: install make
         run: sudo apt-get install make
       - name: set up go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go }}
+          go-version: '1.24'
       - name: checkout
         uses: actions/checkout@v3
       - name: docker login to quay.io
@@ -44,16 +41,13 @@ jobs:
   codecov:
     name: Codecov upload
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
     steps:
     - name: install make
       run: sudo apt-get install make
     - name: set up go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ matrix.go }}
+        go-version: '1.24'
     - name: checkout
       uses: actions/checkout@v3
     - name: Test

.github/workflows/push_image_pr.yml

@@ -14,16 +14,13 @@ jobs:
     if: ${{ github.event.label.name == 'ok-to-test' }}
     name: push PR image
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
     steps:
       - name: install make
         run: sudo apt-get install make
       - name: set up go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go }}
+          go-version: '1.24'
       - name: checkout
         uses: actions/checkout@v3
         with:

.github/workflows/release.yml

@@ -12,9 +12,6 @@ jobs:
   push-image:
     name: push image and prepare release
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -34,7 +31,7 @@ jobs:
       - name: set up go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go }}
+          go-version: '1.24'
       - name: docker login to quay.io
         uses: docker/login-action@v2
         with:

.gitignore

@@ -8,3 +8,4 @@ cli-e2e-img.tar
 e2e/commands
 e2e/output
 e2e-logs
+bin/

.golangci.yml

@@ -1,33 +1,59 @@
+version: "2"
+run:
+  go: "1.23"
 linters:
   enable:
-    - errcheck
-    - errorlint
+    - copyloopvar
     - cyclop
+    - errcheck
     - errname
+    - errorlint
     - exhaustive
-    - copyloopvar
     - gocritic
-    - gofmt
-    - gosimple
     - govet
     - ineffassign
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unused
-    - ginkgolinter
-run:
-  go: "1.22"
-linters-settings:
-  gocritic:
-    enabled-checks:
-      - hugeParam
-      - rangeExprCopy
-      - rangeValCopy
-      - indexAlloc
-    settings:
-      ifElseChain:
-        minThreshold: 3
-  cyclop:
-    max-complexity: 150 # TODO: reduce that to 20
+  settings:
+    cyclop:
+      max-complexity: 20
+    gocritic:
+      enabled-checks:
+        - hugeParam
+        - rangeExprCopy
+        - rangeValCopy
+        - indexAlloc
+      settings:
+        ifElseChain:
+          minThreshold: 3
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+    rules:
+      - linters:
+        - staticcheck
+        text: "QF1003:"
+      - linters:
+        - staticcheck
+        text: "QF1008:"
+      - linters:
+        - revive
+        text: "avoid meaningless package names"
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -2,7 +2,7 @@
 ARG TARGETARCH=amd64
 
 # Build the manager binary
-FROM docker.io/library/golang:1.23 as builder
+FROM docker.io/library/golang:1.24 as builder
 
 ARG TARGETARCH
 ARG LDFLAGS

Dockerfile.downstream

@@ -4,7 +4,7 @@ ARG BUILDVERSION
 FROM registry.redhat.io/openshift4/ose-cli-rhel9:v4.18.0-202502040032.p0.ga50d4c0.assembly.stream.el9 as ose-cli
 
 # Build the manager binary
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.24 as builder
 ARG BUILDVERSION
 ARG IMAGE=registry.redhat.io/network-observability/network-observability-cli-rhel9:${BUILDVERSION}
 ARG AGENT_IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9:${BUILDVERSION}

Makefile

@@ -51,7 +51,7 @@ ifneq ($(CLEAN_BUILD),)
 	LDFLAGS ?= -X 'main.buildVersion=${VERSION}-${BUILD_SHA}' -X 'main.buildDate=${BUILD_DATE}'
 endif
 
-GOLANGCI_LINT_VERSION = v1.64.6
+GOLANGCI_LINT_VERSION = v2.2.1
 BASH_VERSION = v4.2.0
 YQ_VERSION = v4.45.1
 
@@ -83,7 +83,9 @@ prepare:
 .PHONY: prereqs
 prereqs: ## Install dependencies
 	@echo "### Installing dependencies"
-	GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
+	test -f ./bin/golangci-lint-${GOLANGCI_LINT_VERSION} || ( \
+		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s ${GOLANGCI_LINT_VERSION} \
+		&& mv ./bin/golangci-lint ./bin/golangci-lint-${GOLANGCI_LINT_VERSION})
 	GOFLAGS="" go install github.com/mikefarah/yq/v4@${YQ_VERSION}
 
 .PHONY: vendors
@@ -134,7 +136,7 @@ fmt: ## Run go fmt against code.
 .PHONY: lint
 lint: prereqs ## Lint code
 	@echo "### Linting code"
-	golangci-lint run ./... --timeout=3m
+	./bin/golangci-lint-${GOLANGCI_LINT_VERSION} run ./... --timeout=3m
 ifeq (, $(shell which shellcheck))
 	@echo "### shellcheck could not be found, skipping shell lint"
 else