From a6c01340989bb441f4626ce055cb80e762febdd4 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 17 Feb 2025 23:36:33 +0100 Subject: [PATCH] deps: update go version from 1.22.0 to 1.23.0 (#1132) Signed-off-by: Matthieu MOREL --- Dockerfile.ci | 2 +- README.md | 2 +- contrib/go.mod | 4 ++-- envoy/go.mod | 4 ++-- examples/dyplomat/Dockerfile | 2 +- examples/dyplomat/go.mod | 4 ++-- go.mod | 4 ++-- internal/tools/go.mod | 5 +++-- ratelimit/go.mod | 4 ++-- xdsmatcher/go.mod | 4 ++-- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 53fc07e239..57b16d40e6 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,3 +1,3 @@ -FROM golang:1.22@sha256:0ca97f4ab335f4b284a5b8190980c7cdc21d320d529f2b643e8a8733a69bfb6b +FROM golang:1.23@sha256:77a21b3e354c03e9f66b13bc39f4f0db8085c70f8414406af66b29c6d6c4dd85 COPY --from=envoyproxy/envoy-dev:latest /usr/local/bin/envoy /usr/local/bin/envoy diff --git a/README.md b/README.md index 5482399718..60a2bdf880 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ feedback, we might decide to revisit this aspect at a later point in time. ## Requirements -1. Go 1.22+ +1. Go 1.23+ ## Quick start diff --git a/contrib/go.mod b/contrib/go.mod index ffc38d1351..18e613fa1c 100644 --- a/contrib/go.mod +++ b/contrib/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane/contrib -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 replace github.com/envoyproxy/go-control-plane/envoy => ../envoy diff --git a/envoy/go.mod b/envoy/go.mod index d2395b7492..b06a27aef1 100644 --- a/envoy/go.mod +++ b/envoy/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane/envoy -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 // Used to resolve import issues related to go-control-plane package split (https://github.com/envoyproxy/go-control-plane/issues/1074) replace github.com/envoyproxy/go-control-plane@v0.13.4 => ../ diff --git a/examples/dyplomat/Dockerfile b/examples/dyplomat/Dockerfile index b0fc3fe8f4..eec31dab26 100644 --- a/examples/dyplomat/Dockerfile +++ b/examples/dyplomat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22@sha256:0ca97f4ab335f4b284a5b8190980c7cdc21d320d529f2b643e8a8733a69bfb6b +FROM golang:1.23@sha256:77a21b3e354c03e9f66b13bc39f4f0db8085c70f8414406af66b29c6d6c4dd85 WORKDIR /go/src/dyplomat COPY . /go/src/dyplomat diff --git a/examples/dyplomat/go.mod b/examples/dyplomat/go.mod index 142cbf9131..05c83d2cd7 100644 --- a/examples/dyplomat/go.mod +++ b/examples/dyplomat/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane/examples/dyplomat -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 replace ( github.com/envoyproxy/go-control-plane => ../.. diff --git a/go.mod b/go.mod index ce7bd9145b..c8351b2893 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 replace ( github.com/envoyproxy/go-control-plane/envoy => ./envoy diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 279a175afa..1a1291ecab 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,7 +1,8 @@ module github.com/envoyproxy/go-control-plane/internal/tools -go 1.22.1 -toolchain go1.23.4 +go 1.23.0 + +toolchain go1.23.6 require ( github.com/golangci/golangci-lint v1.64.5 diff --git a/ratelimit/go.mod b/ratelimit/go.mod index 3d4fb287fa..6584c4310c 100644 --- a/ratelimit/go.mod +++ b/ratelimit/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane/ratelimit -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 replace github.com/envoyproxy/go-control-plane/envoy => ../envoy diff --git a/xdsmatcher/go.mod b/xdsmatcher/go.mod index 1803370c6e..5f162f24b4 100644 --- a/xdsmatcher/go.mod +++ b/xdsmatcher/go.mod @@ -1,8 +1,8 @@ module github.com/envoyproxy/go-control-plane/xdsmatcher -go 1.22.0 +go 1.23.0 -toolchain go1.22.5 +toolchain go1.23.6 replace github.com/envoyproxy/go-control-plane/envoy => ../envoy