Skip to content

Commit 5f27f43

Browse files
Remove runtime go image and replace it with default debian image (#403)
* Removed runtime go image and replaced it with default debian image. * Updated documentation to reflect release 1.5.7 as per deployment guide.
1 parent bdcea1c commit 5f27f43

File tree

4 files changed

+31
-63
lines changed

4 files changed

+31
-63
lines changed

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ delete_prebuilt_workers: fmt vet ## Build the delete_prebuilt_workers tool binar
100100

101101
##@ Build container images
102102

103-
all-images: clone-image controller-image csharp-build-image cxx-image dotnet-build-image dotnet-image driver-image go-image java-image node-build-image node-image php7-build-image php7-image python-image ready-image ruby-build-image ruby-image ## Build all container images.
103+
all-images: clone-image controller-image csharp-build-image cxx-image dotnet-build-image dotnet-image driver-image java-image node-build-image node-image php7-build-image php7-image python-image ready-image ruby-build-image ruby-image ## Build all container images.
104104

105105
clone-image: ## Build the clone init container image.
106106
docker build -t $(INIT_IMAGE_PREFIX)clone:$(TEST_INFRA_VERSION) containers/init/clone
@@ -123,9 +123,6 @@ dotnet-image: ## Build the grpc-dotnet test runtime container image.
123123
driver-image: ## Build the driver container image.
124124
docker build --build-arg GITREF=$(DRIVER_VERSION) --build-arg BREAK_CACHE="$(date +%Y%m%d%H%M%S)" -t $(RUN_IMAGE_PREFIX)driver:$(TEST_INFRA_VERSION) containers/runtime/driver
125125

126-
go-image: ## Build the Go test runtime container image.
127-
docker build -t $(RUN_IMAGE_PREFIX)go:$(TEST_INFRA_VERSION) containers/runtime/go
128-
129126
java-image: ## Build the Java test runtime container image.
130127
docker build -t $(RUN_IMAGE_PREFIX)java:$(TEST_INFRA_VERSION) containers/runtime/java
131128

@@ -155,7 +152,7 @@ ruby-image: ## Build the Ruby test runtime container image.
155152

156153
##@ Publish container images
157154

158-
push-all-images: push-clone-image push-controller-image push-csharp-build-image push-cxx-image push-dotnet-build-image push-dotnet-image push-driver-image push-go-image push-java-image push-node-build-image push-node-image push-php7-build-image push-php7-image push-python-image push-ready-image push-ruby-build-image push-ruby-image ## Push all container images to a registry.
155+
push-all-images: push-clone-image push-controller-image push-csharp-build-image push-cxx-image push-dotnet-build-image push-dotnet-image push-driver-image push-java-image push-node-build-image push-node-image push-php7-build-image push-php7-image push-python-image push-ready-image push-ruby-build-image push-ruby-image ## Push all container images to a registry.
159156

160157
push-clone-image: ## Push the clone init container image to a registry.
161158
docker push $(INIT_IMAGE_PREFIX)clone:$(TEST_INFRA_VERSION)
@@ -178,9 +175,6 @@ push-dotnet-image: ## Push the grpc-dotnet.js test runtime container image to a
178175
push-driver-image: ## Push the driver container image to a registry.
179176
docker push $(RUN_IMAGE_PREFIX)driver:$(TEST_INFRA_VERSION)
180177

181-
push-go-image: ## Push the Go test runtime container image to a registry.
182-
docker push $(RUN_IMAGE_PREFIX)go:$(TEST_INFRA_VERSION)
183-
184178
push-java-image: ## Push the Java test runtime container image to a registry.
185179
docker push $(RUN_IMAGE_PREFIX)java:$(TEST_INFRA_VERSION)
186180

config/defaults_template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ languages:
2828

2929
- language: go
3030
buildImage: golang:1.23
31-
runImage: "{{ .RunImagePrefix }}go:{{ .Version }}"
31+
runImage: debian:bookworm
3232

3333
- language: java
3434
buildImage: gradle:jdk8

containers/runtime/go/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

doc/deployment.md

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ and how to deploy it to the cluster.
6060

6161
In order to build a specific version of the controller, you must check out the
6262
desired version. The following commands clone the repo and check out version
63-
`v1.5.1`:
63+
`v1.5.7`:
6464

6565
```shell
6666
git clone https://github.com/grpc/test-infra && cd test-infra
67-
git checkout --detach v1.5.1
67+
git checkout --detach v1.5.7
6868
```
6969

7070
### Environment variables
@@ -98,14 +98,14 @@ timeout is set in the LoadTest configuration. `KILL_AFTER` is set in the
9898
[controller configuration](#controller-configuration), as a safeguard for
9999
components that may hang and consume resources after test timeout.
100100

101-
The variables used to build the `v1.5.1` release are as follows:
101+
The variables used to build the `v1.5.7` release are as follows:
102102

103103
```shell
104-
export GOCMD=go1.19.5
105-
export TEST_INFRA_VERSION=v1.5.1
106-
export INIT_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/
107-
export BUILD_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/build/
108-
export RUN_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/runtime/
104+
export GOCMD=go1.21.13
105+
export TEST_INFRA_VERSION=v1.5.7
106+
export INIT_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/init-
107+
export BUILD_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/init-build-
108+
export RUN_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/
109109
export KILL_AFTER=30
110110
```
111111

@@ -173,26 +173,25 @@ language, plus a language-agnostic clone container image. These images are
173173
necessary to run any tests that do not use [pre-built images][], such as the
174174
[examples][].
175175

176-
The complete set of images built for `v1.5.1` is as follows:
176+
The complete set of images built for `v1.5.7` is as follows:
177177

178178
```shell
179-
gcr.io/grpc-testing/e2etest/init/build/csharp:v1.5.1
180-
gcr.io/grpc-testing/e2etest/init/build/dotnet:v1.5.1
181-
gcr.io/grpc-testing/e2etest/init/build/node:v1.5.1
182-
gcr.io/grpc-testing/e2etest/init/build/php7:v1.5.1
183-
gcr.io/grpc-testing/e2etest/init/build/ruby:v1.5.1
184-
gcr.io/grpc-testing/e2etest/init/clone:v1.5.1
185-
gcr.io/grpc-testing/e2etest/init/ready:v1.5.1
186-
gcr.io/grpc-testing/e2etest/runtime/controller:v1.5.1
187-
gcr.io/grpc-testing/e2etest/runtime/cxx:v1.5.1
188-
gcr.io/grpc-testing/e2etest/runtime/dotnet:v1.5.1
189-
gcr.io/grpc-testing/e2etest/runtime/driver:v1.5.1
190-
gcr.io/grpc-testing/e2etest/runtime/go:v1.5.1
191-
gcr.io/grpc-testing/e2etest/runtime/java:v1.5.1
192-
gcr.io/grpc-testing/e2etest/runtime/node:v1.5.1
193-
gcr.io/grpc-testing/e2etest/runtime/php7:v1.5.1
194-
gcr.io/grpc-testing/e2etest/runtime/python:v1.5.1
195-
gcr.io/grpc-testing/e2etest/runtime/ruby:v1.5.1
179+
us-docker.pkg.dev/grpc-testing/e2etest/init-build-csharp:v1.5.7
180+
us-docker.pkg.dev/grpc-testing/e2etest/init-build-dotnet:v1.5.7
181+
us-docker.pkg.dev/grpc-testing/e2etest/init-build-node:v1.5.7
182+
us-docker.pkg.dev/grpc-testing/e2etest/init-build-php7:v1.5.7
183+
us-docker.pkg.dev/grpc-testing/e2etest/init-build-ruby:v1.5.7
184+
us-docker.pkg.dev/grpc-testing/e2etest/init-clone:v1.5.7
185+
us-docker.pkg.dev/grpc-testing/e2etest/init-ready:v1.5.7
186+
us-docker.pkg.dev/grpc-testing/e2etest/controller:v1.5.7
187+
us-docker.pkg.dev/grpc-testing/e2etest/cxx:v1.5.7
188+
us-docker.pkg.dev/grpc-testing/e2etest/dotnet:v1.5.7
189+
us-docker.pkg.dev/grpc-testing/e2etest/driver:v1.5.7
190+
us-docker.pkg.dev/grpc-testing/e2etest/java:v1.5.7
191+
us-docker.pkg.dev/grpc-testing/e2etest/node:v1.5.7
192+
us-docker.pkg.dev/grpc-testing/e2etest/php7:v1.5.7
193+
us-docker.pkg.dev/grpc-testing/e2etest/python:v1.5.7
194+
us-docker.pkg.dev/grpc-testing/e2etest/ruby:v1.5.7
196195
```
197196

198197
This should match what is included in the
@@ -212,11 +211,11 @@ Images can be built and pushed with the following command:
212211
make all-psm-images push-all-psm-images
213212
```
214213

215-
The complete set of PSM images built for `v1.5.1` is as follows:
214+
The complete set of PSM images built for `v1.5.7` is as follows:
216215

217216
```shell
218-
gcr.io/grpc-testing/e2etest/runtime/sidecar:v1.5.1
219-
gcr.io/grpc-testing/e2etest/runtime/xds-server:v1.5.1
217+
us-docker.pkg.dev/grpc-testing/e2etest/sidecar:v1.5.7
218+
us-docker.pkg.dev/grpc-testing/e2etest/xds-server:v1.5.7
220219
```
221220

222221
> Note: PSM images are pushed by default to the location specified by

0 commit comments

Comments
 (0)