From 7502f9dc65705825887daedea52109f79feddf85 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Wed, 5 Mar 2025 07:33:46 -0800 Subject: [PATCH] Go: Bump to v1.24.1. (#12942) Co-authored-by: Marco Ebert --- .github/workflows/golangci-lint.yml | 1 - GOLANG_VERSION | 2 +- go.mod | 2 +- images/custom-error-pages/rootfs/go.mod | 2 +- images/ext-auth-example-authsvc/rootfs/go.mod | 2 +- images/kube-webhook-certgen/rootfs/go.mod | 2 +- internal/ingress/annotations/mirror/main_test.go | 2 +- internal/ingress/metric/collectors/nginx_status_test.go | 2 +- magefiles/go.mod | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index f57878084..6b66a9afa 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -30,5 +30,4 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0 with: - version: v1.62 only-new-issues: true diff --git a/GOLANG_VERSION b/GOLANG_VERSION index d8c40e539..f9e8384bb 100644 --- a/GOLANG_VERSION +++ b/GOLANG_VERSION @@ -1 +1 @@ -1.23.6 +1.24.1 diff --git a/go.mod b/go.mod index cfb63d5c9..52d7c8654 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/ingress-nginx -go 1.23.6 +go 1.24.1 require ( dario.cat/mergo v1.0.1 diff --git a/images/custom-error-pages/rootfs/go.mod b/images/custom-error-pages/rootfs/go.mod index 7e7408948..65612b8d2 100644 --- a/images/custom-error-pages/rootfs/go.mod +++ b/images/custom-error-pages/rootfs/go.mod @@ -1,6 +1,6 @@ module k8s.io/ingress-nginx/custom-error-pages -go 1.23.6 +go 1.24.1 require github.com/prometheus/client_golang v1.21.1 diff --git a/images/ext-auth-example-authsvc/rootfs/go.mod b/images/ext-auth-example-authsvc/rootfs/go.mod index 5f33a86ff..57607c938 100644 --- a/images/ext-auth-example-authsvc/rootfs/go.mod +++ b/images/ext-auth-example-authsvc/rootfs/go.mod @@ -1,6 +1,6 @@ module example.com/authsvc -go 1.23.6 +go 1.24.1 require k8s.io/apimachinery v0.32.2 diff --git a/images/kube-webhook-certgen/rootfs/go.mod b/images/kube-webhook-certgen/rootfs/go.mod index 2b8567748..662a01732 100644 --- a/images/kube-webhook-certgen/rootfs/go.mod +++ b/images/kube-webhook-certgen/rootfs/go.mod @@ -1,6 +1,6 @@ module github.com/jet/kube-webhook-certgen -go 1.23.6 +go 1.24.1 require ( github.com/onrik/logrus v0.11.0 diff --git a/internal/ingress/annotations/mirror/main_test.go b/internal/ingress/annotations/mirror/main_test.go index 805f1ef6d..9dc1e6e7c 100644 --- a/internal/ingress/annotations/mirror/main_test.go +++ b/internal/ingress/annotations/mirror/main_test.go @@ -117,7 +117,7 @@ func TestParse(t *testing.T) { ing.SetAnnotations(testCase.annotations) result, err := ap.Parse(ing) if err != nil { - t.Errorf(err.Error()) + t.Error(err) } if !reflect.DeepEqual(result, testCase.expected) { t.Errorf("expected %+v but returned %+v, annotations: %s", testCase.expected, result, testCase.annotations) diff --git a/internal/ingress/metric/collectors/nginx_status_test.go b/internal/ingress/metric/collectors/nginx_status_test.go index ec535745d..aef72dcca 100644 --- a/internal/ingress/metric/collectors/nginx_status_test.go +++ b/internal/ingress/metric/collectors/nginx_status_test.go @@ -110,7 +110,7 @@ func TestStatusCollector(t *testing.T) { w.WriteHeader(http.StatusOK) if r.URL.Path == "/nginx_status" { - _, err := fmt.Fprintf(w, c.mock) + _, err := fmt.Fprint(w, c.mock) if err != nil { t.Fatal(err) } diff --git a/magefiles/go.mod b/magefiles/go.mod index f11ab740e..fb16884a8 100644 --- a/magefiles/go.mod +++ b/magefiles/go.mod @@ -1,6 +1,6 @@ module k8s.io/ingress-nginx/magefiles -go 1.23.6 +go 1.24.1 require ( github.com/blang/semver/v4 v4.0.0