Skip to content

Remove runtime go image and replace it with default debian image #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulosjca merged 4 commits into from
Mar 27, 2025
Merged

Remove runtime go image and replace it with default debian image #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65fdb0e
removed docker file of runtime go image
Mar 25, 2025
c8611b3
Documentation update for releasing new version 1.5.7
Mar 27, 2025
2870786
Updated documentation as per new deployment guide
Mar 27, 2025
e27e921
Fixed review comments
Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ delete_prebuilt_workers: fmt vet ## Build the delete_prebuilt_workers tool binar

##@ Build container images

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.
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.

clone-image: ## Build the clone init container image.
docker build -t $(INIT_IMAGE_PREFIX)clone:$(TEST_INFRA_VERSION) containers/init/clone
Expand All @@ -123,9 +123,6 @@ dotnet-image: ## Build the grpc-dotnet test runtime container image.
driver-image: ## Build the driver container image.
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

go-image: ## Build the Go test runtime container image.
docker build -t $(RUN_IMAGE_PREFIX)go:$(TEST_INFRA_VERSION) containers/runtime/go

java-image: ## Build the Java test runtime container image.
docker build -t $(RUN_IMAGE_PREFIX)java:$(TEST_INFRA_VERSION) containers/runtime/java

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

##@ Publish container images

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.
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.

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

push-go-image: ## Push the Go test runtime container image to a registry.
docker push $(RUN_IMAGE_PREFIX)go:$(TEST_INFRA_VERSION)

push-java-image: ## Push the Java test runtime container image to a registry.
docker push $(RUN_IMAGE_PREFIX)java:$(TEST_INFRA_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion config/defaults_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ languages:

- language: go
buildImage: golang:1.23
runImage: "{{ .RunImagePrefix }}go:{{ .Version }}"
runImage: debian:bookworm

- language: java
buildImage: gradle:jdk8
Expand Down
25 changes: 0 additions & 25 deletions containers/runtime/go/Dockerfile
View file
Open in desktop

This file was deleted.

57 changes: 28 additions & 29 deletions doc/deployment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ and how to deploy it to the cluster.

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

```shell
git clone https://github.com/grpc/test-infra && cd test-infra
git checkout --detach v1.5.1
git checkout --detach v1.5.7
```

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

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

```shell
export GOCMD=go1.19.5
export TEST_INFRA_VERSION=v1.5.1
export INIT_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/
export BUILD_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/build/
export RUN_IMAGE_PREFIX=gcr.io/grpc-testing/e2etest/init/runtime/
export GOCMD=go1.21.13
export TEST_INFRA_VERSION=v1.5.7
export INIT_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/init-
export BUILD_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/init-build-
export RUN_IMAGE_PREFIX=us-docker.pkg.dev/grpc-testing/e2etest/
export KILL_AFTER=30
```

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

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

```shell
gcr.io/grpc-testing/e2etest/init/build/csharp:v1.5.1
gcr.io/grpc-testing/e2etest/init/build/dotnet:v1.5.1
gcr.io/grpc-testing/e2etest/init/build/node:v1.5.1
gcr.io/grpc-testing/e2etest/init/build/php7:v1.5.1
gcr.io/grpc-testing/e2etest/init/build/ruby:v1.5.1
gcr.io/grpc-testing/e2etest/init/clone:v1.5.1
gcr.io/grpc-testing/e2etest/init/ready:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/controller:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/cxx:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/dotnet:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/driver:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/go:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/java:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/node:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/php7:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/python:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/ruby:v1.5.1
us-docker.pkg.dev/grpc-testing/e2etest/init-build-csharp:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-build-dotnet:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-build-node:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-build-php7:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-build-ruby:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-clone:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/init-ready:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/controller:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/cxx:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/dotnet:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/driver:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/java:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/node:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/php7:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/python:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/ruby:v1.5.7
```

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

The complete set of PSM images built for `v1.5.1` is as follows:
The complete set of PSM images built for `v1.5.7` is as follows:

```shell
gcr.io/grpc-testing/e2etest/runtime/sidecar:v1.5.1
gcr.io/grpc-testing/e2etest/runtime/xds-server:v1.5.1
us-docker.pkg.dev/grpc-testing/e2etest/sidecar:v1.5.7
us-docker.pkg.dev/grpc-testing/e2etest/xds-server:v1.5.7
```

> Note: PSM images are pushed by default to the location specified by
Expand Down
Loading