Move all actual Agones releases images to GAR #2875

gongmax · 2022-12-16T00:21:16Z

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

What this PR does / Why we need it:

Which issue(s) this PR fixes:

Closes #2358

Special notes for your reviewer:
I created the registry us-docker.pkg.dev/agones-images/release manually.
Tested by following the instructions to run a test GKE cluster

agones-bot · 2022-12-16T00:45:33Z

Build Failed 😱

Build Id: 26d76fff-f2e7-4137-863a-6e91a35b2352

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

agones-bot · 2022-12-16T01:16:46Z

Build Succeeded 👏

Build Id: c983af35-48d0-4957-8601-66a09d9b1d3b

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-f6f6f02-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-f6f6f02-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-f6f6f02-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-f6f6f02-amd64
Linux C++ SDK (build): agonessdk-1.29.0-f6f6f02-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-f6f6f02-amd64.zip

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

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

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.29.0-f6f6f02-amd64

build/README.md

site/content/en/docs/Guides/Client SDKs/local.md

agones-bot · 2022-12-16T22:36:53Z

Build Succeeded 👏

Build Id: 4754c549-6065-47e6-821d-9ec14d95752e

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-90d744b-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-90d744b-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-90d744b-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-90d744b-amd64
Linux C++ SDK (build): agonessdk-1.29.0-90d744b-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-90d744b-amd64.zip

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

https://90d744b-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.29.0-90d744b-amd64

agones-bot · 2022-12-17T00:45:59Z

Build Failed 😱

Build Id: 4cbcdc28-2f6e-4363-a42b-2cb75155c110

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

agones-bot · 2022-12-17T01:22:03Z

Build Failed 😱

Build Id: 4f16b658-001f-43c4-9372-32aaa38c3987

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

agones-bot · 2022-12-17T02:29:05Z

Build Succeeded 👏

Build Id: e4ff6612-f783-407c-bc6e-6cd22bddf1a4

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-5f0d4c7-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-5f0d4c7-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-5f0d4c7-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-5f0d4c7-amd64
Linux C++ SDK (build): agonessdk-1.29.0-5f0d4c7-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-5f0d4c7-amd64.zip

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

https://5f0d4c7-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.29.0-5f0d4c7-amd64

build/README.md

site/content/en/docs/Guides/Client SDKs/local.md

site/content/en/docs/Installation/Install Agones/helm.md

agones-bot · 2022-12-20T23:21:23Z

Build Succeeded 👏

Build Id: 099a213d-94d8-4440-9398-4e93835322ad

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-2a4dc9c-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-2a4dc9c-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-2a4dc9c-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-2a4dc9c-amd64
Linux C++ SDK (build): agonessdk-1.29.0-2a4dc9c-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-2a4dc9c-amd64.zip

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

https://2a4dc9c-dot-preview-dot-agones-images.appspot.com/

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.29.0-2a4dc9c-amd64

agones-bot · 2022-12-20T23:37:45Z

Build Succeeded 👏

Build Id: 3ef5903a-9a7d-44c6-983d-9c8a3d0fb705

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-4578006-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-4578006-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-4578006-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-4578006-amd64
Linux C++ SDK (build): agonessdk-1.29.0-4578006-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-4578006-amd64.zip

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

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

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --set agones.image.tag=1.29.0-4578006-amd64

agones-bot · 2022-12-21T00:52:14Z

Build Succeeded 👏

Build Id: 186d6d16-fd50-4e1e-94cf-dce795bf2b0f

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-4578006-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-4578006-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-4578006-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-4578006-amd64
Linux C++ SDK (build): agonessdk-1.29.0-4578006-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-4578006-amd64.zip

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

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

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --agones.image.release=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.29.0-4578006-amd64

markmandel · 2022-12-21T16:39:52Z

I'll take an extra look at this today - primarily I want to double check the release makefile commands and checklist 👍🏻

markmandel

Looks good - but would love confirmation on the change to site/cloudbuild.yaml before merging.

markmandel · 2022-12-21T18:29:51Z

build/includes/google-cloud.mk

 gcloud-auth-docker: $(ensure-build-image)
-	docker run --rm $(common_mounts) $(build_tag) gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin https://gcr.io
+	docker run --rm $(common_mounts) $(build_tag) gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin https://us-docker.pkg.dev


Thank you! I forgot that I kept having to do this manually!

markmandel · 2022-12-21T18:34:15Z

site/cloudbuild.yaml

@@ -29,6 +29,8 @@ steps:
  args: ['build', '-f', 'Dockerfile.build', '-t', 'make-docker', '.'] # we need docker and make to run everything.
 - name: "make-docker"
  dir: "build"
+  env:
+    - "REGISTRY=${_REGISTRY}"


🤔 what does this do? I don't think this is required, but I could be wrong?

I'm a little confused now. This step will do pull-build-image which use REGISTRY as part of the image tag. Currently it's still gcr.io/agones-images (Though I haven't figured out where this value come from). I think the agones-build image will be in the us-docker.pkg.dev/agones-images/ci (this change)? Though the change I made here will not work either, since I didn't specify _REGISTRY in this file.

So this all comes from here:

agones/build/includes/build-image.mk

Line 51 in 176ffb2

pull-build-image:

So pull and push build image targets are targets specifically for the CI system (local developers don't use them), so for those, I don't know if you want to set them to a default that will work on CI?

Also, if you have _REGISTRY you will need to specify it in the substitutions block of this cloudbuild.yaml

I'm curious if you tested running this cloud-build yaml against your dev project to see if it worked - because I would have expected it would have failed because of the missing _REGISTRY definition.

Right, I understood they come from the build-image.mk. I'm just not sure where the REGISTRY come from in this file. So if we do not specify the REGISTRY env viable in the site/cloud-build.yaml, will it try to pull the image from gcr.io?

You're right the _REGISTRY definition is missed. I only noticed it when I saw your last comments.

OIC OIC! So the REGISTRY variable in the Makefile could be set in the parent Makefile or any includes that came before it.

So in the main version of the code, it come from here:

agones/build/Makefile

Line 40 in 176ffb2

REGISTRY ?= $(release_registry)

So if we do not specify the REGISTRY env viable in the site/cloud-build.yaml, will it try to pull the image from gcr.io?

So in your code, the REGISTRY variable is removed from the parent Makefile, so I'm not sure where it would be getting it from -- I actually expect that it would fail silently, since there wouldn't be a registry attached.

agones/build/includes/build-image.mk

Lines 70 to 72 in 176ffb2

# pull a local image that may exist on a remote repository, to a local image

pull-remote-build-image:

-docker pull $(REMOTE_TAG) && docker tag $(REMOTE_TAG) $(LOCAL_TAG)

So TL;DR - I would suggest either hardcode where it's pulled from somewhere in that Makefile, or create a substitution section like we have in the main cloudbuild.yaml and pull it from there.

Thanks for the details! This makes sense now.

Added the substitution in site/cloudbuild.yaml. Confirmed the cloud build step is looking at the us-docker.pkg.dev/${PROJECT_ID}/ci, and the corresponding agones-build image exists in us-docker.pkg.dev/agones-images/ci.

Looks right! Okay, let's approve and hopefully nothing breaks 😀

But looks good to me!

agones-bot · 2022-12-21T23:18:28Z

Build Succeeded 👏

Build Id: 39f03b6f-b560-46ab-b7b3-5b3d993de151

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

image: us-docker.pkg.dev/agones-images/ci/agones-controller:1.29.0-5767779-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-sdk:1.29.0-5767779-linux-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-ping:1.29.0-5767779-amd64
image: us-docker.pkg.dev/agones-images/ci/agones-allocator:1.29.0-5767779-amd64
Linux C++ SDK (build): agonessdk-1.29.0-5767779-amd64-linux-arch_64.tar.gz
SDK Server: agonessdk-server-1.29.0-5767779-amd64.zip

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

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

To install this version:

git fetch https://github.com/googleforgames/agones.git pull/2875/head:pr_2875 && git checkout pr_2875
helm install agones ./install/helm/agones --namespace agones-system --agones.image.release=us-docker.pkg.dev/agones-images/ci --set agones.image.tag=1.29.0-5767779-amd64

google-oss-prow · 2022-12-21T23:27:50Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gongmax, markmandel, roberthbailey

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [markmandel,roberthbailey]

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

gongmax and others added 2 commits December 16, 2022 00:19

Move all actual Agones releases images to GAR

ac8a751

Merge branch 'googleforgames:main' into gar

f6f6f02

google-oss-prow bot added the do-not-merge/work-in-progress label Dec 16, 2022

google-oss-prow bot requested review from aLekSer and roberthbailey December 16, 2022 00:21

google-oss-prow bot added the size/M label Dec 16, 2022

gongmax marked this pull request as ready for review December 16, 2022 01:58

google-oss-prow bot removed the do-not-merge/work-in-progress label Dec 16, 2022

google-oss-prow bot requested review from cyriltovena and EricFortin December 16, 2022 01:58

roberthbailey reviewed Dec 16, 2022

View reviewed changes

build/README.md Outdated Show resolved Hide resolved

build/README.md Outdated Show resolved Hide resolved

site/content/en/docs/Guides/Client SDKs/local.md Show resolved Hide resolved

roberthbailey assigned markmandel and roberthbailey Dec 16, 2022

fix comments

90d744b

remove default Registry

deee464

add missing env

5f0d4c7

roberthbailey reviewed Dec 20, 2022

View reviewed changes

build/README.md Outdated Show resolved Hide resolved

site/content/en/docs/Guides/Client SDKs/local.md Show resolved Hide resolved

site/content/en/docs/Installation/Install Agones/helm.md Outdated Show resolved Hide resolved

fix typos

2a4dc9c

google-oss-prow bot added size/L and removed size/M labels Dec 20, 2022

Merge branch 'googleforgames:main' into gar

4578006

roberthbailey approved these changes Dec 21, 2022

View reviewed changes

google-oss-prow bot added lgtm approved labels Dec 21, 2022

gongmax requested review from markmandel and removed request for cyriltovena, EricFortin and aLekSer December 21, 2022 17:53

markmandel reviewed Dec 21, 2022

View reviewed changes

add missing substitution

5767779

google-oss-prow bot removed the lgtm label Dec 21, 2022

markmandel approved these changes Dec 21, 2022

View reviewed changes

google-oss-prow bot added the lgtm label Dec 21, 2022

markmandel merged commit a4caaeb into googleforgames:main Dec 21, 2022

gongmax deleted the gar branch December 21, 2022 23:56

Kalaiselvi84 added this to the 1.29.0 milestone Jan 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move all actual Agones releases images to GAR #2875

Move all actual Agones releases images to GAR #2875

gongmax commented Dec 16, 2022 •

edited

Loading

agones-bot commented Dec 16, 2022

agones-bot commented Dec 16, 2022

agones-bot commented Dec 16, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 20, 2022

agones-bot commented Dec 20, 2022

agones-bot commented Dec 21, 2022

markmandel commented Dec 21, 2022

markmandel left a comment

markmandel Dec 21, 2022 •

edited

Loading

markmandel Dec 21, 2022

gongmax Dec 21, 2022 •

edited

Loading

markmandel Dec 21, 2022

gongmax Dec 21, 2022

markmandel Dec 21, 2022

gongmax Dec 21, 2022

gongmax Dec 21, 2022

markmandel Dec 21, 2022

agones-bot commented Dec 21, 2022

google-oss-prow bot commented Dec 21, 2022

	# pull a local image that may exist on a remote repository, to a local image
	pull-remote-build-image:
	-docker pull $(REMOTE_TAG) && docker tag $(REMOTE_TAG) $(LOCAL_TAG)

Move all actual Agones releases images to GAR #2875

Move all actual Agones releases images to GAR #2875

Conversation

gongmax commented Dec 16, 2022 • edited Loading

agones-bot commented Dec 16, 2022

agones-bot commented Dec 16, 2022

agones-bot commented Dec 16, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 17, 2022

agones-bot commented Dec 20, 2022

agones-bot commented Dec 20, 2022

agones-bot commented Dec 21, 2022

markmandel commented Dec 21, 2022

markmandel left a comment

Choose a reason for hiding this comment

markmandel Dec 21, 2022 • edited Loading

Choose a reason for hiding this comment

markmandel Dec 21, 2022

Choose a reason for hiding this comment

gongmax Dec 21, 2022 • edited Loading

Choose a reason for hiding this comment

markmandel Dec 21, 2022

Choose a reason for hiding this comment

gongmax Dec 21, 2022

Choose a reason for hiding this comment

markmandel Dec 21, 2022

Choose a reason for hiding this comment

gongmax Dec 21, 2022

Choose a reason for hiding this comment

gongmax Dec 21, 2022

Choose a reason for hiding this comment

markmandel Dec 21, 2022

Choose a reason for hiding this comment

agones-bot commented Dec 21, 2022

google-oss-prow bot commented Dec 21, 2022

gongmax commented Dec 16, 2022 •

edited

Loading

markmandel Dec 21, 2022 •

edited

Loading

gongmax Dec 21, 2022 •

edited

Loading