BUILD/MINOR: upgrade go version

oktalz · oktalz · commit b2266668ba9f · 2025-02-25T14:10:05.000+01:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
   KIND: v0.26.0
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.24"
   DOCKER_VERSION: "26.0"
 diff:
   stage: diff
diff --git a/.golangci.yml b/.golangci.yml
@@ -26,7 +26,6 @@ linters:
     - goconst
     - gocyclo
     - godot
-    - gomnd
     - lll
     - nestif
     - nlreturn
@@ -39,12 +38,13 @@ linters:
     - exhaustruct
     - nonamedreturns
     - forcetypeassert
-    - execinquery #deprecated
     - depguard
     - mnd
     - inamedparam
+    - asasalint
     - err113 # maybe tmp disable
-    - exportloopref #deprecated
+    - recvcheck # maybe tmp disable
+    - tenv # deprecated
 issues:
   exclude:
     - "tag is not aligned, should be:" # this is harder to read
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ PROJECT_PATH=${PWD}
 TARGETPLATFORM?=linux/amd64
 GOOS?=linux
 GOARCH?=amd64
-GOLANGCI_LINT_VERSION=1.61.0
+GOLANGCI_LINT_VERSION=1.64.5
 CHECK_COMMIT=5.0.4
 
 .PHONY: test
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 
 RUN apk --no-cache add git openssh
 
diff --git a/build/Dockerfile.pebble b/build/Dockerfile.pebble
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 
 RUN apk --no-cache add git openssh
 
diff --git a/deploy/tests/e2e/client.go b/deploy/tests/e2e/client.go
@@ -259,7 +259,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {
 		case strings.HasPrefix(line, "Used:"):
 			used, convErr := strconv.ParseBool(strings.Split(line, ": ")[1])
 			if convErr != nil {
-				return
+				return //nolint:nilnesserr
 			}
 			certInfo.Used = used
 		case strings.HasPrefix(line, "Subject:"):
diff --git a/deploy/tests/images/http-echo/Dockerfile b/deploy/tests/images/http-echo/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine AS builder
+FROM golang:1.24-alpine AS builder
 
 COPY *.go /src/
 COPY go.mod /src/go.mod
diff --git a/deploy/tests/images/http-echo/go.mod b/deploy/tests/images/http-echo/go.mod
@@ -1,3 +1,3 @@
 module echo-http
 
-go 1.23
+go 1.24
diff --git a/deploy/tests/integration/base-suite.go b/deploy/tests/integration/base-suite.go
@@ -15,7 +15,6 @@
 package integration
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -171,5 +170,5 @@ func (suite *BaseSuite) ExpectHaproxyConfigContains(s string, count int) {
 		suite.T().Error(err.Error())
 	}
 	c := strings.Count(string(content), s)
-	suite.Exactly(count, c, fmt.Sprintf("%s is repeated %d times but expected %d", s, c, count))
+	suite.Exactly(count, c, "%s is repeated %d times but expected %d", s, c, count)
 }
diff --git a/documentation/gen/go.mod b/documentation/gen/go.mod
@@ -1,6 +1,6 @@
 module doc-gen
 
-go 1.23
+go 1.24
 
 require (
 	github.com/google/renameio v1.0.1
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/haproxytech/kubernetes-ingress
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
diff --git a/pkg/haproxy/api/backend_switching_rule.go b/pkg/haproxy/api/backend_switching_rule.go
@@ -19,7 +19,7 @@ func (c *clientNative) BackendSwitchingRuleDeleteAll(frontend string) (err error
 	if err != nil {
 		return
 	}
-	for range len(switchingRules) {
+	for range switchingRules {
 		if err = configuration.DeleteBackendSwitchingRule(0, frontend, c.activeTransaction, 0); err != nil {
 			break
 		}
diff --git a/pkg/haproxy/api/capture.go b/pkg/haproxy/api/capture.go
@@ -19,7 +19,7 @@ func (c *clientNative) CaptureDeleteAll(frontend string) (err error) {
 	if err != nil {
 		return
 	}
-	for range len(rules) {
+	for range rules {
 		if err = configuration.DeleteDeclareCapture(0, frontend, c.activeTransaction, 0); err != nil {
 			break
 		}
diff --git a/pkg/haproxy/api/filters.go b/pkg/haproxy/api/filters.go
@@ -19,7 +19,7 @@ func (c *clientNative) FilterDeleteAll(parentType, parentName string) (err error
 	if err != nil {
 		return
 	}
-	for range len(rules) {
+	for range rules {
 		if err = configuration.DeleteFilter(0, parentType, parentName, c.activeTransaction, 0); err != nil {
 			break
 		}
diff --git a/pkg/haproxy/api/log_target.go b/pkg/haproxy/api/log_target.go
@@ -19,7 +19,7 @@ func (c *clientNative) LogTargetDeleteAll(parentType, parentName string) (err er
 	if err != nil {
 		return
 	}
-	for range len(rules) {
+	for range rules {
 		if err = configuration.DeleteLogTarget(0, parentType, parentName, c.activeTransaction, 0); err != nil {
 			break
 		}
diff --git a/pkg/haproxy/api/tcp_request_rule.go b/pkg/haproxy/api/tcp_request_rule.go
@@ -19,7 +19,7 @@ func (c *clientNative) TCPRequestRuleDeleteAll(parentType, parentName string) (e
 	if err != nil {
 		return
 	}
-	for range len(rules) {
+	for range rules {
 		if err = configuration.DeleteTCPRequestRule(0, parentType, parentName, c.activeTransaction, 0); err != nil {
 			break
 		}

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func GetCertSubject(filename string) (certInfo CertInfo, err error) {`
`259`	`259`	`case strings.HasPrefix(line, "Used:"):`
`260`	`260`	`used, convErr := strconv.ParseBool(strings.Split(line, ": ")[1])`
`261`	`261`	`if convErr != nil {`
`262`		`- return`
	`262`	`+ return //nolint:nilnesserr`
`263`	`263`	`}`
`264`	`264`	`certInfo.Used = used`
`265`	`265`	`case strings.HasPrefix(line, "Subject:"):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.23-alpine AS builder`
	`1`	`+FROM golang:1.24-alpine AS builder`
`2`	`2`
`3`	`3`	`COPY *.go /src/`
`4`	`4`	`COPY go.mod /src/go.mod`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`module echo-http`
`2`	`2`
`3`		`-go 1.23`
	`3`	`+go 1.24`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`package integration`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "fmt"`
`19`	`18`	`"os"`
`20`	`19`	`"path/filepath"`
`21`	`20`	`"strings"`
`@@ -171,5 +170,5 @@ func (suite *BaseSuite) ExpectHaproxyConfigContains(s string, count int) {`
`171`	`170`	`suite.T().Error(err.Error())`
`172`	`171`	`}`
`173`	`172`	`c := strings.Count(string(content), s)`
`174`		`- suite.Exactly(count, c, fmt.Sprintf("%s is repeated %d times but expected %d", s, c, count))`
	`173`	`+ suite.Exactly(count, c, "%s is repeated %d times but expected %d", s, c, count)`
`175`	`174`	`}`