chore: bump golang to 1.23.3 (#4716)

Signed-off-by: zirain <[email protected]>
envoyproxy · Nov 14, 2024 · 7989667 · 7989667
1 parent 639a441
commit 7989667
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 22 deletions.
diff --git a/examples/envoy-als/Dockerfile b/examples/envoy-als/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.1 AS builder
+FROM golang:1.23.3 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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 require (
 	github.com/envoyproxy/gateway v1.0.2

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

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

diff --git a/examples/grpc-ext-proc/Dockerfile b/examples/grpc-ext-proc/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.1 AS builder
+FROM golang:1.23.3 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.1
+go 1.23.3
 
 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.1 AS builder
+FROM golang:1.23.3 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.1
+go 1.23.3
 
 require github.com/valyala/fasthttp v1.51.0
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/gateway
 
-go 1.23.1
+go 1.23.3
 
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
 

diff --git a/tools/make/examples.mk b/tools/make/examples.mk
@@ -17,4 +17,13 @@ kube-install-examples-image: kube-build-examples-image
 	@$(LOG_TARGET)
 	@for app in $(EXAMPLE_APPS); do \
 		tools/hack/kind-load-image.sh $(EXAMPLE_IMAGE_PREFIX)$$app $(EXAMPLE_TAG); \
+	done
+
+.PHONY: go.mod.tidy.examples
+go.mod.tidy.examples:
+	@$(LOG_TARGET)
+	@for app in $(EXAMPLE_APPS); do \
+		pushd $(ROOT_DIR)/examples/$$app; \
+		go mod tidy -compat=$(GO_VERSION); \
+		popd; \
 	done
diff --git a/tools/make/golang.mk b/tools/make/golang.mk
@@ -84,7 +84,7 @@ go.mod.tidy: ## Update and check dependences with go mod tidy.
 
 .PHONY: go.mod.lint
 lint: go.mod.lint
-go.mod.lint: go.mod.tidy ## Check if go.mod is clean
+go.mod.lint: go.mod.tidy go.mod.tidy.examples ## Check if go.mod is clean
 	@$(LOG_TARGET)
 	@if test -n "$$(git status -s -- go.mod go.sum)"; then \
 		git diff --exit-code go.mod; \

diff --git a/tools/src/buf/go.mod b/tools/src/buf/go.mod
@@ -1,6 +1,6 @@
 module local
 
-go 1.23.1
+go 1.23.3
 
 require github.com/bufbuild/buf v1.46.0
 

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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 require github.com/golangci/golangci-lint v1.62.0
 

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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 require sigs.k8s.io/kind v0.25.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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 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.1
+go 1.23.3
 
 require sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240813183042-b901db121e1f