chore: bump go to 1.24 (#5287)

* chore: bump go to 1.24 Signed-off-by: zirain <[email protected]> * fix Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]>
envoyproxy · Feb 18, 2025 · f4bafe2 · f4bafe2
1 parent 22eb14f
commit f4bafe2
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 29 deletions.
diff --git a/examples/envoy-als/Dockerfile b/examples/envoy-als/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.0 AS builder
 
 ARG GO_LDFLAGS=""
 

diff --git a/examples/envoy-als/go.mod b/examples/envoy-als/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway-envoy-als
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/envoyproxy/go-control-plane v0.13.1

diff --git a/examples/envoy-ext-auth/Dockerfile b/examples/envoy-ext-auth/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.0 AS builder
 
 ARG GO_LDFLAGS=""
 

diff --git a/examples/envoy-ext-auth/go.mod b/examples/envoy-ext-auth/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway-grcp-ext-auth
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/envoyproxy/go-control-plane v0.13.1

diff --git a/examples/extension-server/go.mod b/examples/extension-server/go.mod
@@ -1,6 +1,6 @@
 module github.com/exampleorg/envoygateway-extension
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/envoyproxy/gateway v1.0.2

diff --git a/examples/extension-server/tools/src/controller-gen/go.mod b/examples/extension-server/tools/src/controller-gen/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require sigs.k8s.io/controller-tools v0.17.1
 

diff --git a/examples/grpc-ext-proc/Dockerfile b/examples/grpc-ext-proc/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.0 AS builder
 
 ARG GO_LDFLAGS=""
 

diff --git a/examples/grpc-ext-proc/go.mod b/examples/grpc-ext-proc/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway-grpc-ext-proc
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/envoyproxy/go-control-plane v0.13.1

diff --git a/examples/preserve-case-backend/Dockerfile b/examples/preserve-case-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.0 AS builder
 
 ARG GO_LDFLAGS=""
 

diff --git a/examples/preserve-case-backend/go.mod b/examples/preserve-case-backend/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway-preserve-case-backend
 
-go 1.23.6
+go 1.24.0
 
 require github.com/valyala/fasthttp v1.51.0
 

diff --git a/examples/static-file-server/Dockerfile b/examples/static-file-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.0 AS builder
 
 ARG GO_LDFLAGS=""
 

diff --git a/examples/static-file-server/go.mod b/examples/static-file-server/go.mod
@@ -1,3 +1,3 @@
 module github.com/envoyproxy/static-file-server
 
-go 1.23.6
+go 1.24.0
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/envoyproxy/gateway
 
-go 1.23.6
-
-replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
+go 1.24.0
 
 require (
 	fortio.org/fortio v1.68.0

diff --git a/go.sum b/go.sum
@@ -488,7 +488,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=

diff --git a/site/go.mod b/site/go.mod
@@ -1,6 +1,6 @@
 module github.com/google/docsy-example
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect

diff --git a/tools/hack/bump-golang.sh b/tools/hack/bump-golang.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC2038
+
+FROM_GOLANG_VERSION=${1:-"1.23.6"}
+TO_GOLANG_VERSION=${2:-"1.24.0"}
+
+echo "Bumping golang version from $FROM_GOLANG_VERSION to $TO_GOLANG_VERSION"
+
+# detect gnu-sed or sed
+GNU_SED=$(sed --version >/dev/null 2>&1 && echo "yes" || echo "no")
+if [ "$GNU_SED" == "yes" ]; then
+    find . -type f -name "Dockerfile" | xargs sed -i'' "s/FROM golang:$FROM_GOLANG_VERSION AS builder/FROM golang:$TO_GOLANG_VERSION AS builder/g"
+    find . -type f -name "go.mod" | xargs sed -i'' "s/go $FROM_GOLANG_VERSION/go $TO_GOLANG_VERSION/g"
+else
+    find . -type f -name "Dockerfile" | xargs sed -i '' "s/FROM golang:$FROM_GOLANG_VERSION AS builder/FROM golang:$TO_GOLANG_VERSION AS builder/g"
+    find . -type f -name "go.mod" | xargs sed -i '' "s/go $FROM_GOLANG_VERSION/go $TO_GOLANG_VERSION/g"
+fi
diff --git a/tools/src/buf/go.mod b/tools/src/buf/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require github.com/bufbuild/buf v1.50.0
 

diff --git a/tools/src/controller-gen/go.mod b/tools/src/controller-gen/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require sigs.k8s.io/controller-tools v0.17.1
 

diff --git a/tools/src/crd-ref-docs/go.mod b/tools/src/crd-ref-docs/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require github.com/elastic/crd-ref-docs v0.1.0
 

diff --git a/tools/src/gci/go.mod b/tools/src/gci/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require github.com/daixiang0/gci v0.13.4
 

diff --git a/tools/src/golangci-lint/go.mod b/tools/src/golangci-lint/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require github.com/golangci/golangci-lint v1.63.4
 

diff --git a/tools/src/helm-docs/go.mod b/tools/src/helm-docs/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway/tools/src/helm-docs
 
-go 1.23.6
+go 1.24.0
 
 require github.com/norwoodj/helm-docs v1.14.2
 

diff --git a/tools/src/jb/go.mod b/tools/src/jb/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway/tools/src/jb
 
-go 1.23.6
+go 1.24.0
 
 require github.com/jsonnet-bundler/jsonnet-bundler v0.5.1
 

diff --git a/tools/src/jsonnet/go.mod b/tools/src/jsonnet/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway/tools/src/jsonnet
 
-go 1.23.6
+go 1.24.0
 
 require github.com/google/go-jsonnet v0.20.0
 

diff --git a/tools/src/kind/go.mod b/tools/src/kind/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway/tools/src/kind
 
-go 1.23.6
+go 1.24.0
 
 require sigs.k8s.io/kind v0.26.0
 

diff --git a/tools/src/protoc-gen-go-grpc/go.mod b/tools/src/protoc-gen-go-grpc/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway/tools/src/protoc-gen-go-grpc
 
-go 1.23.6
+go 1.24.0
 
 require google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
 

diff --git a/tools/src/protoc-gen-go/go.mod b/tools/src/protoc-gen-go/go.mod
@@ -1,5 +1,5 @@
 module github.com/envoyproxy/gateway/tools/src/protoc-gen-go
 
-go 1.23.6
+go 1.24.0
 
 require google.golang.org/protobuf v1.33.0
diff --git a/tools/src/setup-envtest/go.mod b/tools/src/setup-envtest/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.6
+go 1.24.0
 
 require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240813183042-b901db121e1f