diff --git a/config/defaults_template.yaml b/config/defaults_template.yaml index c2b5352b..fedb7be7 100644 --- a/config/defaults_template.yaml +++ b/config/defaults_template.yaml @@ -27,7 +27,7 @@ languages: runImage: "{{ .RunImagePrefix }}cxx:{{ .Version }}" - language: go - buildImage: golang:1.17 + buildImage: golang:1.20 runImage: "{{ .RunImagePrefix }}go:{{ .Version }}" - language: java diff --git a/config/defaults_test.go b/config/defaults_test.go index 423b7c90..001a3dc7 100644 --- a/config/defaults_test.go +++ b/config/defaults_test.go @@ -47,7 +47,7 @@ var _ = Describe("Defaults", func() { }, { Language: "go", - BuildImage: "golang:1.17", + BuildImage: "golang:1.20", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, { diff --git a/containers/init/ready/Dockerfile b/containers/init/ready/Dockerfile index cf6b389a..27411855 100644 --- a/containers/init/ready/Dockerfile +++ b/containers/init/ready/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17 +FROM golang:1.20 RUN mkdir -p /src/ready WORKDIR /src/ready diff --git a/containers/pre_built_workers/go/Dockerfile b/containers/pre_built_workers/go/Dockerfile index 1be4f7b8..122107fe 100644 --- a/containers/pre_built_workers/go/Dockerfile +++ b/containers/pre_built_workers/go/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17 +FROM golang:1.20 RUN mkdir -p /executable WORKDIR /executable diff --git a/containers/runtime/controller/Dockerfile b/containers/runtime/controller/Dockerfile index f6ec3ae7..a0b24bf9 100644 --- a/containers/runtime/controller/Dockerfile +++ b/containers/runtime/controller/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.17 as builder +FROM golang:1.20 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/containers/runtime/go/Dockerfile b/containers/runtime/go/Dockerfile index 6fa64677..e4b19349 100644 --- a/containers/runtime/go/Dockerfile +++ b/containers/runtime/go/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17 +FROM golang:1.20 RUN mkdir -p /src/workspace WORKDIR /src/workspace diff --git a/containers/runtime/xds-server/Dockerfile b/containers/runtime/xds-server/Dockerfile index 07a9955c..d95eb010 100644 --- a/containers/runtime/xds-server/Dockerfile +++ b/containers/runtime/xds-server/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17 +FROM golang:1.20 RUN mkdir /bootstrap WORKDIR /src/workspace diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 9bacbf1d..c36f773c 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -137,7 +137,7 @@ func newDefaults() *config.Defaults { }, { Language: "go", - BuildImage: "golang:1.17", + BuildImage: "golang:1.20", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, { diff --git a/dashboard/config/postgres_replicator/Dockerfile b/dashboard/config/postgres_replicator/Dockerfile index 9134919d..5ca02a45 100644 --- a/dashboard/config/postgres_replicator/Dockerfile +++ b/dashboard/config/postgres_replicator/Dockerfile @@ -15,7 +15,7 @@ # syntax=docker/dockerfile:1 # Build replicator -FROM golang:1.17 AS builder +FROM golang:1.20 AS builder ARG REPOSITORY=grpc/test-infra ARG GITREF=master @@ -25,7 +25,7 @@ RUN git clone https://github.com/$REPOSITORY.git src \ && make replicator REPLICATOR_OUTPUT_DIR=/ # Copy replicator binary and run it -FROM golang:1.17 +FROM golang:1.20 WORKDIR /app COPY --from=builder /replicator /app COPY config.yaml /app diff --git a/podbuilder/suite_test.go b/podbuilder/suite_test.go index e9749c1a..6bb53bc9 100644 --- a/podbuilder/suite_test.go +++ b/podbuilder/suite_test.go @@ -96,7 +96,7 @@ func newDefaults() *config.Defaults { }, { Language: "go", - BuildImage: "golang:1.17", + BuildImage: "golang:1.20", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, {