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

Author: jotak

.github/workflows/pull_request.yml

@@ -8,16 +8,13 @@ jobs:
   build-lint-test:
     name: Build, lint, test
     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: check format
@@ -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
       with:
         files: ./cover.out

.github/workflows/push_image.yml

@@ -15,16 +15,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
@@ -59,16 +56,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

@@ -15,16 +15,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

@@ -14,9 +14,6 @@ jobs:
   push-image:
     name: push image
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ['1.23']
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -42,7 +39,7 @@ jobs:
       - name: set up go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go }}
+          go-version: '1.24'
       - name: build operator
         run: |
           MULTIARCH_TARGETS="${{ env.WF_MULTIARCH_TARGETS }}" IMAGE_ORG=${{ env.WF_ORG }} IMAGE=${{ env.WF_REGISTRY }}/${{ env.WF_IMAGE }}:${{ env.tag }} CLEAN_BUILD=1 make image-build

.golangci.yml

@@ -1,32 +1,56 @@
+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.23"
-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:"
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

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

Dockerfile.downstream

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

Makefile

@@ -76,7 +76,7 @@ BUNDLE_CONFIG ?= config/openshift-olm
 IMAGE ?= $(IMAGE_TAG_BASE):$(VERSION)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.23
-GOLANGCI_LINT_VERSION = v1.61.0
+GOLANGCI_LINT_VERSION = v2.2.1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -314,7 +314,9 @@ clean-generated-conversions: ## Remove files generated by conversion-gen from th
 .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}
+	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: vendors
 vendors: ## Refresh vendors directory.
@@ -327,7 +329,7 @@ fmt: ## Run go fmt against code.
 .PHONY: lint
 lint: prereqs ## Run linter (golangci-lint).
 	@echo "### Linting code"
-	golangci-lint run --timeout 5m ./...
+	./bin/golangci-lint-${GOLANGCI_LINT_VERSION} run --timeout 5m ./...
 
 test: envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverpkg=./... -coverprofile cover.out