Upgrade gRPC version #3472

Kalaiselvi84 · 2023-10-28T00:23:08Z

What type of PR is this?

Uncomment only one /kind <> line, press enter to put that in a new line, and remove leading whitespace from that line:

/kind breaking
/kind bug

/kind cleanup

/kind documentation
/kind feature
/kind hotfix
/kind release

What this PR does / Why we need it:

Which issue(s) this PR fixes:

Closes #3467

Special notes for your reviewer:

agones-bot · 2023-10-28T00:42:40Z

Build Failed 😱

Build Id: b881305e-50cd-40b1-be3f-1a9f1dc4b869

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

Kalaiselvi84 · 2023-10-28T00:44:56Z

@markmandel, Could you please guide me how to fix this error?

CMake Error at CMakeLists.txt:32 (_message):
  CMake Error: The source directory
  "/go/src/agones.dev/agones/sdks/cpp/.build/gRPC/src/third_party/protobuf/cmake"
  does not appear to contain CMakeLists.txt.

  Specify --help for usage, or press the help button on the CMake GUI.

Call Stack (most recent call first):
  cmake/prerequisites.cmake:93 (message)
  cmake/prerequisites.cmake:114 (execute_and_check)
  cmake/prerequisites.cmake:174 (invoke_cmake_build)
  CMakeLists.txt:73 (include)


-- Configuring incomplete, errors occurred!
See also "/go/src/agones.dev/agones/sdks/cpp/.build/CMakeFiles/CMakeOutput.log".
See also "/go/src/agones.dev/agones/sdks/cpp/.build/CMakeFiles/CMakeError.log".
make: *** [Makefile:29: build] Error 1
make[1]: *** [includes/sdk.mk:88: run-sdk-command] Error 2
make: *** [includes/sdk.mk:72: run-sdk-command-cpp] Error 2

markmandel · 2023-10-30T20:54:33Z

Will pull this down and take a look 👍🏻

markmandel · 2023-10-30T23:00:49Z

So just digging into this - looks like you may have run make gen-sdk-grpc (which defaults to go) not make gen-all-sdk-grpc (which runs against all the SDKs) since only the Go code got updated (also I get extra updates when I run it locally). Easy thing to do as the commands are next to each other -- we should probably turn off the default for gen-sdk-grpc.

if you run make gen-all-sdk-grpc you should see changes that look more like this:

❯ git shell
On branch pr/grpc-update
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   pkg/sdk/alpha/alpha.pb.go
        modified:   pkg/sdk/alpha/alpha_grpc.pb.go
        modified:   pkg/sdk/beta/beta.pb.go
        modified:   pkg/sdk/beta/beta_grpc.pb.go
        modified:   pkg/sdk/sdk.pb.go
        modified:   pkg/sdk/sdk_grpc.pb.go
        modified:   sdks/cpp/include/agones/sdk.pb.h
        modified:   sdks/cpp/include/google/api/annotations.pb.h
        modified:   sdks/cpp/include/google/api/http.pb.h
        modified:   sdks/cpp/include/protoc-gen-openapiv2/options/annotations.pb.h
        modified:   sdks/cpp/include/protoc-gen-openapiv2/options/openapiv2.pb.h
        modified:   sdks/cpp/src/agones/sdk.pb.cc
        modified:   sdks/cpp/src/google/annotations.pb.cc
        modified:   sdks/cpp/src/google/http.pb.cc
        modified:   sdks/cpp/src/protoc-gen-openapiv2/annotations.pb.cc
        modified:   sdks/cpp/src/protoc-gen-openapiv2/openapiv2.pb.cc

Not 100% sure it solves the problem yet, but just working step by step.

agones-bot · 2023-10-30T23:21:38Z

Build Failed 😱

Build Id: ea09cb33-2c58-4c7e-aa64-ffbcb7966580

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

Kalaiselvi84 · 2023-10-30T23:29:16Z

Log for make gen-all-sdk-grpc - https://gist.github.com/Kalaiselvi84/68c31b262ca04b5b57275f049e438232

You're right; I may have executed make gen-sdk-grpc. 6 files were modified locally for the command make gen-all-sdk-grpc, but it seems more files were altered in yours.🤔

markmandel · 2023-10-30T23:39:13Z

I got the same error anyway with all the files updated, but I think i have a fix.... lemme try it though.

agones-bot · 2023-10-30T23:39:32Z

Build Failed 😱

Build Id: 57d9f6d0-d92d-400b-84f6-dcc5aa86b583

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

markmandel · 2023-10-31T00:00:00Z

Fairly sure I got it... I'll do my usual file a PR against your branch thing.

markmandel · 2023-10-31T00:27:50Z

I cleaned my build and am running it again - so probably have confirmation tomorrow.

markmandel · 2023-10-31T00:34:30Z

Kalaiselvi84#326 submitted to your branch!

The CPP tests passed for me 👍🏻

Kalaiselvi84 · 2023-10-31T01:19:37Z

I got the same error anyway with all the files updated, but I think i have a fix.... lemme try it though.

I am confused. What's the difference between my local setup and yours? Why aren't all the files being modified on my end as they are on yours?

markmandel · 2023-10-31T04:10:35Z

I am confused. What's the difference between my local setup and yours? Why aren't all the files being modified on my end as they are on yours?

I figure it's because I had rebuilt all my Docker images, so it pulled down the latest protobuf (which is why the version updated). Also because I ran the make gen-allocation-grpc command.

Kalaiselvi84 · 2023-10-31T05:10:01Z

I figure it's because I had rebuilt all my Docker images, so it pulled down the latest protobuf (which is why the version updated). Also because I ran the make gen-allocation-grpc command.

When you mentioned rebuilding all the Docker images, did you mean only for the example images or did you rebuild everything? Also I guess you ran make build instead make build-sdks

markmandel · 2023-10-31T16:12:52Z

When you mentioned rebuilding all the Docker images, did you mean only for the example images or did you rebuild everything?

I occasionally delete all docker images from my machines (docker system prune -a --volumes) just to keep them clean, and so I was rebuilding everything from scratch.

Either way - merge my PR to your PR when ready, and we'll see if it passes all of CI 👍🏻

Kalaiselvi84 · 2023-10-31T16:54:59Z

rebuilding everything from scratch.

Do we have any command for this?

Either way - merge my PR to your PR when ready, and we'll see if it passes all of CI 👍🏻

This is kind of no fair to always use your updates, would it be possible for you to create a separate PR for it? What do you think?

else share me your logs, I will try to replicate yours

markmandel · 2023-10-31T17:02:31Z

Do we have any command for this?

I just do the command above occasionally when I do docker images and there are a lot of them there 😄

This is kind of no fair to always use your updates, would it be possible for you to create a separate PR for it? What do you think?

I don't mind either way - whatever works!

markmandel · 2023-10-31T17:11:14Z

Also just realised I was typing on my phone above and wrote make gen-allocation-grpc when I meant make gen-allocation-grpc 🤦🏻

agones-bot · 2023-10-31T17:16:21Z

Build Failed 😱

Build Id: 5594bbca-edaf-4c65-982f-576385f624d6

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

Kalaiselvi84 · 2023-10-31T17:39:09Z

Also just realised I was typing on my phone above and wrote make gen-allocation-grpc when I meant make gen-allocation-grpc

This was also typing from your phone? you typed the same command here😂

markmandel · 2023-10-31T17:45:03Z

Also just realised I was typing on my phone above and wrote make gen-allocation-grpc when I meant make gen-allocation-grpc

This was also typing from your phone? you typed the same command here😂

OMG I did it again. make gen-all-sdk-grpc I can do it!

markmandel · 2023-10-31T17:46:53Z

As part of this PR can we update make test-gen-all-sdk-grpc to show what the differences are?

Kalaiselvi84 · 2023-10-31T17:53:18Z

As part of this PR can we update make test-gen-all-sdk-grpc to show what the differences are?

make test-gen-all-sdk-grpc is running, will update the status shortly

markmandel · 2023-10-31T18:11:35Z

As part of this PR can we update make test-gen-all-sdk-grpc to show what the differences are?

make test-gen-all-sdk-grpc is running, will update the status shortly

Don't we need that update in this PR? We don't know what is being generated by Cloud Build and how it's different to what we have right now.

agones-bot · 2023-10-31T18:48:53Z

Build Failed 😱

Build Id: e48cf338-8a6e-4f29-8b8a-826a66b08a94

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

* Fix for cmake grpc dependency * Updated all gRPC SDK code.

* Include the gRPC version in the `build_sdk_base_version` version such that it automatically gets rebuilt whenever the gRPC version changes without manual intervention. Also updated the changes in the allocation gRPC code as well.

agones-bot · 2023-10-31T21:52:16Z

Build Succeeded 👏

Build Id: 180da6c3-c541-4b24-8cc7-8ba3cc5967ba

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

https://8238032-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/3472/head:pr_3472 && git checkout pr_3472
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.registry=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.36.0-dev-8238032-amd64

Kalaiselvi84 · 2023-10-31T21:55:39Z

200% credit goes to @markmandel 😀

markmandel · 2023-10-31T22:02:26Z

build/includes/sdk.mk

-build_sdk_base_version = $(call sha,$(build_path)/build-sdk-images/tool/base/Dockerfile)
+grpc_release_tag = v1.57.0
+
+build_sdk_base_version = $(call sha,$(build_path)/build-sdk-images/tool/base/Dockerfile)_$(grpc_release_tag)


This now forces a rebuild when the grpc version is updated. Before this wasn't happening.

google-oss-prow · 2023-10-31T22:11:25Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: gongmax, Kalaiselvi84, zmerlynn
Once this PR has been reviewed and has the lgtm label, please assign ericfortin for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Kalaiselvi84 requested a review from markmandel October 28, 2023 00:23

google-oss-prow bot requested review from cyriltovena and roberthbailey October 28, 2023 00:23

google-oss-prow bot added the size/L label Oct 28, 2023

github-actions bot added the kind/cleanup Refactoring code, fixing up documentation, etc label Oct 28, 2023

google-oss-prow bot added size/XXL and removed size/L labels Oct 31, 2023

Kalaiselvi84 and others added 6 commits October 31, 2023 11:50

Upgrade gRPC version

7d3ecbe

make gen-all-sdk-grpc

b2e4e96

Upgrade gRPC version

9f04b4c

Review updates

225d6de

* Fix for cmake grpc dependency * Updated all gRPC SDK code.

Show all the differences

48ccb79

Fixes for generated content drift

8238032

* Include the gRPC version in the `build_sdk_base_version` version such that it automatically gets rebuilt whenever the gRPC version changes without manual intervention. Also updated the changes in the allocation gRPC code as well.

markmandel force-pushed the grpc-update branch from 74cdeb3 to 8238032 Compare October 31, 2023 18:54

markmandel requested review from zmerlynn and gongmax October 31, 2023 22:01

markmandel reviewed Oct 31, 2023

View reviewed changes

zmerlynn approved these changes Oct 31, 2023

View reviewed changes

google-oss-prow bot assigned zmerlynn Oct 31, 2023

google-oss-prow bot added the lgtm label Oct 31, 2023

markmandel merged commit 01fc87b into googleforgames:main Oct 31, 2023
3 checks passed

gongmax approved these changes Oct 31, 2023

View reviewed changes

google-oss-prow bot assigned gongmax Oct 31, 2023

Kalaiselvi84 deleted the grpc-update branch March 15, 2024 01:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade gRPC version #3472

Upgrade gRPC version #3472

Kalaiselvi84 commented Oct 28, 2023 •

edited

Loading

agones-bot commented Oct 28, 2023

Kalaiselvi84 commented Oct 28, 2023

markmandel commented Oct 30, 2023

markmandel commented Oct 30, 2023 •

edited

Loading

agones-bot commented Oct 30, 2023

Kalaiselvi84 commented Oct 30, 2023

markmandel commented Oct 30, 2023

agones-bot commented Oct 30, 2023

markmandel commented Oct 31, 2023 •

edited

Loading

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023 •

edited

Loading

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023

agones-bot commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023 •

edited

Loading

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

agones-bot commented Oct 31, 2023

agones-bot commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel Oct 31, 2023

google-oss-prow bot commented Oct 31, 2023

Upgrade gRPC version #3472

Upgrade gRPC version #3472

Conversation

Kalaiselvi84 commented Oct 28, 2023 • edited Loading

agones-bot commented Oct 28, 2023

Kalaiselvi84 commented Oct 28, 2023

markmandel commented Oct 30, 2023

markmandel commented Oct 30, 2023 • edited Loading

agones-bot commented Oct 30, 2023

Kalaiselvi84 commented Oct 30, 2023

markmandel commented Oct 30, 2023

agones-bot commented Oct 30, 2023

markmandel commented Oct 31, 2023 • edited Loading

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023 • edited Loading

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023

agones-bot commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

markmandel commented Oct 31, 2023 • edited Loading

Kalaiselvi84 commented Oct 31, 2023

markmandel commented Oct 31, 2023

agones-bot commented Oct 31, 2023

agones-bot commented Oct 31, 2023

Kalaiselvi84 commented Oct 31, 2023

markmandel Oct 31, 2023

Choose a reason for hiding this comment

google-oss-prow bot commented Oct 31, 2023

Kalaiselvi84 commented Oct 28, 2023 •

edited

Loading

markmandel commented Oct 30, 2023 •

edited

Loading

markmandel commented Oct 31, 2023 •

edited

Loading

markmandel commented Oct 31, 2023 •

edited

Loading

markmandel commented Oct 31, 2023 •

edited

Loading