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

Author: jotak

.github/workflows/pull_request.yml

@@ -8,17 +8,14 @@ jobs:
   unit-tests:
     name: unit-tests
     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: run build
@@ -28,7 +25,6 @@ jobs:
     - name: check clean vendors
       run: go mod vendor
     - name: upload coverage to codecov.io
-      if: ${{ matrix.go == '1.23' }}
       uses: codecov/codecov-action@v4
       with:
         files: ./cover.out

.github/workflows/pull_request_e2e.yml

@@ -10,17 +10,14 @@ jobs:
   e2e-tests:
     name: e2e-tests
     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: run build

.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
     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:

.golangci.yml

@@ -1,32 +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
-run:
-  go: "1.22"
-linters-settings:
-  gocritic:
-    enabled-checks:
-      - hugeParam
-      - rangeExprCopy
-      - rangeValCopy
-      - indexAlloc
-    settings:
-      ifElseChain:
-        minThreshold: 3
-  cyclop:
-    max-complexity: 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$

Makefile

@@ -41,7 +41,7 @@ ifneq ($(CLEAN_BUILD),)
 	LDFLAGS ?= -X 'main.buildVersion=${VERSION}-${BUILD_SHA}' -X 'main.buildDate=${BUILD_DATE}'
 endif
 
-GOLANGCI_LINT_VERSION = v1.61.0
+GOLANGCI_LINT_VERSION = v2.2.1
 KIND_VERSION = v0.22.0
 
 FLP_BIN_FILE=flowlogs-pipeline
@@ -101,7 +101,9 @@ help: ## Display this help.
 .PHONY: prereqs
 prereqs: ## Check if prerequisites are met, and install missing dependencies
 	@echo "### Checking if prerequisites are met, and installing missing 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})
 
 .PHONY: prereqs-kind
 prereqs-kind: ## Check if prerequisites are met for running kind, and install missing dependencies
@@ -117,7 +119,7 @@ vendors: ## Check go vendors
 
 .PHONY: lint
 lint: prereqs ## Lint the code
-	golangci-lint run ./... --timeout=3m
+	./bin/golangci-lint-${GOLANGCI_LINT_VERSION} run ./... --timeout=3m
 
 .PHONY: compile
 compile: ## Compile main flowlogs-pipeline and config generator

contrib/docker/Dockerfile

@@ -1,5 +1,5 @@
 ARG TARGETARCH
-FROM docker.io/library/golang:1.23 as builder
+FROM docker.io/library/golang:1.24 as builder
 
 ARG TARGETARCH=amd64
 ARG LDFLAGS

contrib/docker/Dockerfile.downstream

@@ -1,6 +1,6 @@
 ARG BUILDVERSION
 
-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
 
 WORKDIR /app

go.mod

@@ -1,8 +1,8 @@
 module github.com/netobserv/flowlogs-pipeline
 
-go 1.23.0
+go 1.24.0
 
-toolchain go1.23.4
+toolchain go1.24.4
 
 require (
 	github.com/Knetic/govaluate v3.0.1-0.20250325060307-7625b7f8c03d+incompatible
@@ -45,9 +45,9 @@ require (
 	google.golang.org/grpc v1.73.0
 	google.golang.org/protobuf v1.36.6
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.32.3
-	k8s.io/apimachinery v0.32.3
-	k8s.io/client-go v0.32.3
+	k8s.io/api v0.33.2
+	k8s.io/apimachinery v0.33.2
+	k8s.io/client-go v0.33.2
 	sigs.k8s.io/e2e-framework v0.6.0
 )
 
@@ -87,7 +87,6 @@ require (
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-jsonnet v0.20.0
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect