Skip to content
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.

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

Deps: Bump Go version in Dockerfiles and test/kokoro/xds.sh #7629

Merged
merged 3 commits into from
Sep 13, 2024

Conversation

arjan-bal
Copy link
Contributor

@arjan-bal arjan-bal commented Sep 13, 2024

Since the minimum supported Go version was bumped in #7624, the Docker build for the psm interop client and server has been failing with the following error:

#10 [build 4/4] RUN cd interop/xds/client && go build -tags osusergo,netgo .
#10 0.248 go: ../go.mod requires go >= 1.22.7 (running go 1.21.13; GOTOOLCHAIN=local)
#10 ERROR: process "/bin/sh -c cd interop/xds/client && go build -tags osusergo,netgo ." did not complete successfully: exit code: 1
------
 > [build 4/4] RUN cd interop/xds/client && go build -tags osusergo,netgo .:
0.248 go: ../go.mod requires go >= 1.22.7 (running go 1.21.13; GOTOOLCHAIN=local)
------

Verified that the docker build succeeds with the change in base image version to 1.22.

 docker build -f examples/features/csm_observability/client/Dockerfile . && \
 docker build -f examples/features/csm_observability/server/Dockerfile . && \
 docker build -f  interop/observability/Dockerfile . && \
 docker build -f  interop/xds/client/Dockerfile . && \
 docker build -f  interop/xds/server/Dockerfile . 

Verified that the download URL still works in xds.sh.

gofilename=go1.23.0.linux-amd64.tar.gz
curl --retry 3 -O -L "https://go.dev/dl/${gofilename}"

RELEASE NOTES: N/A

@arjan-bal arjan-bal added the Type: Dependencies Updating/adding/removing dependencies label Sep 13, 2024
@arjan-bal arjan-bal added this to the 1.68 Release milestone Sep 13, 2024
Copy link

codecov bot commented Sep 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.76%. Comparing base (393fbc3) to head (4b60428).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7629      +/-   ##
==========================================
- Coverage   81.86%   81.76%   -0.11%     
==========================================
  Files         361      361              
  Lines       27817    27817              
==========================================
- Hits        22773    22745      -28     
- Misses       3849     3867      +18     
- Partials     1195     1205      +10     

see 24 files with indirect coverage changes

@@ -16,7 +16,7 @@
# following command from grpc-go directory:
# docker build -t <TAG> -f interop/xds/client/Dockerfile .

FROM golang:1.21-alpine as build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go 1.23 is out now -- should we go straight to that version instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to go1.23. Also changed remaining Dockerfiles in the repo and test/kokoro/xds.sh to use go1.23.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Then we won't need to update again in 6 months.

@arjan-bal arjan-bal assigned arjan-bal and unassigned arvindbr8 and dfawley Sep 13, 2024
@arjan-bal arjan-bal changed the title Deps: Bump Go version in psm-interop Docker images Deps: Bump Go version in Dockerfiles and test/kokoro/xds.sh Sep 13, 2024
@arjan-bal arjan-bal assigned dfawley and unassigned arjan-bal Sep 13, 2024
@@ -16,7 +16,7 @@
# following command from grpc-go directory:
# docker build -t <TAG> -f interop/xds/client/Dockerfile .

FROM golang:1.21-alpine as build
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Then we won't need to update again in 6 months.

@dfawley dfawley assigned arjan-bal and unassigned dfawley Sep 13, 2024
@dfawley dfawley added Type: Testing and removed Type: Dependencies Updating/adding/removing dependencies labels Sep 13, 2024
@arjan-bal arjan-bal merged commit 31ffeee into grpc:master Sep 13, 2024
14 checks passed
@arjan-bal arjan-bal deleted the psm-interop branch September 13, 2024 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants