DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Go: Bump to v1.24.1. (#12942)

Browse source 
Co-authored-by: Marco Ebert <marco_ebert@icloud.com>
This commit is contained in:
k8s-infra-cherrypick-robot 2025-03-05 07:33:46 -08:00 committed by GitHub
parent e90815df9f
commit 7502f9dc65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/golangci-lint.yml vendored
View file

@ -30,5 +30,4 @@ jobs:
- name: golangci-lint - name: golangci-lint
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0 uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with: with:
version: v1.62
only-new-issues: true only-new-issues: true

2
GOLANG_VERSION
View file

@ -1 +1 @@
1.23.6 1.24.1

2
go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx module k8s.io/ingress-nginx
go 1.23.6 go 1.24.1
require ( require (
dario.cat/mergo v1.0.1 dario.cat/mergo v1.0.1

2
images/custom-error-pages/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages 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 require github.com/prometheus/client_golang v1.21.1

2
images/ext-auth-example-authsvc/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module example.com/authsvc module example.com/authsvc
go 1.23.6 go 1.24.1
require k8s.io/apimachinery v0.32.2 require k8s.io/apimachinery v0.32.2

2
images/kube-webhook-certgen/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen module github.com/jet/kube-webhook-certgen
go 1.23.6 go 1.24.1
require ( require (
github.com/onrik/logrus v0.11.0 github.com/onrik/logrus v0.11.0

2
internal/ingress/annotations/mirror/main_test.go
View file

@ -117,7 +117,7 @@ func TestParse(t *testing.T) {
ing.SetAnnotations(testCase.annotations) ing.SetAnnotations(testCase.annotations)
result, err := ap.Parse(ing) result, err := ap.Parse(ing)
if err != nil { if err != nil {
t.Errorf(err.Error()) t.Error(err)
} }
if !reflect.DeepEqual(result, testCase.expected) { if !reflect.DeepEqual(result, testCase.expected) {
t.Errorf("expected %+v but returned %+v, annotations: %s", testCase.expected, result, testCase.annotations) t.Errorf("expected %+v but returned %+v, annotations: %s", testCase.expected, result, testCase.annotations)

2
internal/ingress/metric/collectors/nginx_status_test.go
View file

@ -110,7 +110,7 @@ func TestStatusCollector(t *testing.T) {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
if r.URL.Path == "/nginx_status" { if r.URL.Path == "/nginx_status" {
_, err := fmt.Fprintf(w, c.mock) _, err := fmt.Fprint(w, c.mock)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
magefiles/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/magefiles module k8s.io/ingress-nginx/magefiles
go 1.23.6 go 1.24.1
require ( require (
github.com/blang/semver/v4 v4.0.0 github.com/blang/semver/v4 v4.0.0