BUILD/MINOR: go: use go 1.25

Author: oktalz

.gitlab-ci.yml

@@ -9,7 +9,7 @@ variables:
   KIND: v0.27.0
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
   DOCKER_VERSION: "26.0"
 
 include:

build/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.24-alpine AS builder
+FROM golang:1.25-alpine AS builder
 
 RUN apk --no-cache add git openssh
 

build/Dockerfile.dev

@@ -31,8 +31,10 @@ RUN mkdir -p /usr/local/hug/aux && \
 RUN apk --no-cache add socat openssl util-linux htop tzdata curl libcap && \
     rm -f /usr/local/bin/dataplaneapi /usr/bin/dataplaneapi /etc/haproxy/dataplaneapi.yml && \
     rm -f /usr/local/bin/dataplaneapi-v2 /usr/bin/dataplaneapi-v2 && \
-    chgrp -R haproxy /usr/local/etc/haproxy /run /var && \
-    chmod -R ug+rwx /usr/local/etc/haproxy /run /var && \
+    rm -f /etc/haproxy/haproxy.cfg && \
+    mkdir -p /usr/local/hug && \
+    chgrp -R haproxy /usr/local/hug /run /var && \
+    chmod -R ug+rwx /usr/local/hug /run /var && \
     setcap 'cap_net_bind_service=+ep' /usr/local/sbin/haproxy && \
     case "${TARGETPLATFORM}" in \
         "linux/arm64")      S6_ARCH=aarch64      ;; \

ci/http-echo/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine AS builder
+FROM golang:1.25-alpine AS builder
 
 COPY *.go /src/
 COPY go.mod /src/go.mod

ci/http-echo/go.mod

@@ -1,3 +1,3 @@
 module echo-http
 
-go 1.24
+go 1.25

go.mod

@@ -1,6 +1,8 @@
 module github.com/haproxytech/kubernetes-controller
 
-go 1.24.0
+// module github.com/haproxytech/haproxy-unified-gateway
+
+go 1.25.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1

k8s/gate/store/object-store_test.go

@@ -227,9 +227,7 @@ func TestObjectStoreImpl_Concurrency(t *testing.T) {
 	var wg sync.WaitGroup
 
 	for i := range numGoroutines {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			for j := range numOpsPerGoroutine {
 				idRoutine := strconv.Itoa(i)
 				idOp := strconv.Itoa(j)
@@ -244,7 +242,7 @@ func TestObjectStoreImpl_Concurrency(t *testing.T) {
 					store.delete(&gatewayv1.GatewayClass{}, nsName)
 				}
 			}
-		}()
+		})
 	}
 	wg.Wait()