From 1e790996aba13a555ed6a23c104e1c09484bae16 Mon Sep 17 00:00:00 2001 From: Arjan Bal Date: Fri, 13 Sep 2024 21:15:39 +0530 Subject: [PATCH 1/3] Bump Go version in psm-interop Docker images --- interop/xds/client/Dockerfile | 2 +- interop/xds/server/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interop/xds/client/Dockerfile b/interop/xds/client/Dockerfile index c479bc32c03e..64dbcaa1ff20 100644 --- a/interop/xds/client/Dockerfile +++ b/interop/xds/client/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/client/Dockerfile . -FROM golang:1.21-alpine as build +FROM golang:1.22-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/interop/xds/server/Dockerfile b/interop/xds/server/Dockerfile index 8c5dcd8d7db0..3400c00fabc6 100644 --- a/interop/xds/server/Dockerfile +++ b/interop/xds/server/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/server/Dockerfile . -FROM golang:1.21-alpine as build +FROM golang:1.22-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go From 2d8d2b656525ccb5c1d39c8c6962583905b7154a Mon Sep 17 00:00:00 2001 From: Arjan Bal Date: Fri, 13 Sep 2024 21:39:17 +0530 Subject: [PATCH 2/3] Update Go version in all dockerfiles and xds script to 1.23 --- examples/features/csm_observability/client/Dockerfile | 2 +- examples/features/csm_observability/server/Dockerfile | 2 +- interop/observability/Dockerfile | 4 ++-- interop/xds/client/Dockerfile | 2 +- interop/xds/server/Dockerfile | 2 +- test/kokoro/xds.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/features/csm_observability/client/Dockerfile b/examples/features/csm_observability/client/Dockerfile index ad6a37b7e90c..0e974c135372 100644 --- a/examples/features/csm_observability/client/Dockerfile +++ b/examples/features/csm_observability/client/Dockerfile @@ -15,7 +15,7 @@ # Dockerfile for building the example client. To build the image, run the # following command from grpc-go directory: # docker build -t -f examples/features/csm_observability/client/Dockerfile . -FROM golang:1.21-alpine as build +FROM golang:1.23-alpine as build RUN apk --no-cache add curl diff --git a/examples/features/csm_observability/server/Dockerfile b/examples/features/csm_observability/server/Dockerfile index de6836a33ca7..3ba99a7f34a6 100644 --- a/examples/features/csm_observability/server/Dockerfile +++ b/examples/features/csm_observability/server/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f examples/features/csm_observability/server/Dockerfile . -FROM golang:1.21-alpine as build +FROM golang:1.23-alpine as build RUN apk --no-cache add curl # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/interop/observability/Dockerfile b/interop/observability/Dockerfile index d969e72abd44..e4e3a3c7b200 100644 --- a/interop/observability/Dockerfile +++ b/interop/observability/Dockerfile @@ -17,7 +17,7 @@ # Stage 1: Build the interop test client and server # -FROM golang:1.21-bullseye as build +FROM golang:1.23-bullseye as build WORKDIR /grpc-go COPY . . @@ -36,7 +36,7 @@ RUN go build -o server/ server/server.go && \ # with the given parameters. # -FROM golang:1.21-bullseye +FROM golang:1.23-bullseye ENV GRPC_GO_LOG_SEVERITY_LEVEL info ENV GRPC_GO_LOG_VERBOSITY_LEVEL 2 diff --git a/interop/xds/client/Dockerfile b/interop/xds/client/Dockerfile index 64dbcaa1ff20..47c4bccdfeb4 100644 --- a/interop/xds/client/Dockerfile +++ b/interop/xds/client/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/client/Dockerfile . -FROM golang:1.22-alpine as build +FROM golang:1.23-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/interop/xds/server/Dockerfile b/interop/xds/server/Dockerfile index 3400c00fabc6..a43bbe496b77 100644 --- a/interop/xds/server/Dockerfile +++ b/interop/xds/server/Dockerfile @@ -16,7 +16,7 @@ # following command from grpc-go directory: # docker build -t -f interop/xds/server/Dockerfile . -FROM golang:1.22-alpine as build +FROM golang:1.23-alpine as build # Make a grpc-go directory and copy the repo into it. WORKDIR /go/src/grpc-go diff --git a/test/kokoro/xds.sh b/test/kokoro/xds.sh index 75865c340e9e..daac0d68e068 100755 --- a/test/kokoro/xds.sh +++ b/test/kokoro/xds.sh @@ -9,7 +9,7 @@ export GOPATH="${HOME}/gopath" pushd grpc-go/interop/xds/client # Install a version of Go supported by gRPC for the new features, e.g. # errors.Is() -gofilename=go1.21.0.linux-amd64.tar.gz +gofilename=go1.23.0.linux-amd64.tar.gz curl --retry 3 -O -L "https://go.dev/dl/${gofilename}" sudo tar -C /usr/local -xf "${gofilename}" sudo ln -s /usr/local/go/bin/go /usr/bin/go From 4b60428e035a0f12f6c32bc41d17454478ef9118 Mon Sep 17 00:00:00 2001 From: Arjan Bal Date: Fri, 13 Sep 2024 22:03:21 +0530 Subject: [PATCH 3/3] Trigger mergeable