From 1e5cac0b67738a4915fd83bfb6d929a3dcbd6264 Mon Sep 17 00:00:00 2001 From: Ivy Gooch Date: Wed, 30 Nov 2022 00:12:50 +0000 Subject: [PATCH] Revert "Merging upstream/ main" This reverts commit 3dfb5ec31ffd84be3ba540861f7796723a511769, reversing changes made to 2f0b548c278a8bf361140ab850f90080eb38faec. Lines were duplicated during merge conflict. Reverting merge. --- build/Makefile | 2 +- build/includes/examples.mk | 26 +++++----- docs/governance/templates/release.md | 10 ++-- docs/governance/templates/release_issue.md | 47 +++++++------------ examples/allocation-endpoint/Makefile | 6 +-- .../allocation-endpoint/terraform/variable.tf | 2 +- examples/autoscaler-webhook/Makefile | 6 +-- .../autoscaler-service-tls.yaml | 2 +- .../autoscaler-service.yaml | 2 +- examples/cpp-simple/Makefile | 6 +-- examples/cpp-simple/fleet.yaml | 2 +- examples/cpp-simple/gameserver.yaml | 2 +- examples/crd-client/Makefile | 6 +-- examples/crd-client/create-gs.yaml | 4 +- examples/fleet.yaml | 2 +- examples/gameserver.yaml | 2 +- examples/nodejs-simple/Makefile | 6 +-- examples/nodejs-simple/README.md | 12 ++--- examples/nodejs-simple/gameserver.yaml | 2 +- examples/rust-simple/Makefile | 6 +-- examples/rust-simple/README.md | 2 +- examples/rust-simple/gameserver.yaml | 2 +- examples/simple-game-server/Makefile | 6 +-- .../simple-game-server/dev-gameserver.yaml | 2 +- .../simple-game-server/fleet-distributed.yaml | 2 +- examples/simple-game-server/fleet-tcp.yaml | 2 +- examples/simple-game-server/fleet.yaml | 2 +- .../gameserver-passthrough.yaml | 2 +- .../gameserver-windows.yaml | 2 +- examples/simple-game-server/gameserver.yaml | 2 +- examples/supertuxkart/Makefile | 6 +-- examples/supertuxkart/fleet.yaml | 2 +- examples/supertuxkart/gameserver.yaml | 2 +- examples/unity-simple/Makefile | 6 +-- examples/unity-simple/gameserver.yaml | 2 +- examples/xonotic/Makefile | 8 ++-- examples/xonotic/fleet.yaml | 2 +- examples/xonotic/gameserver.yaml | 2 +- .../agones/templates/tests/test-runner.yaml | 4 +- pkg/util/webhooks/webhooks_test.go | 2 +- site/config.toml | 2 +- test/e2e/fleetautoscaler_test.go | 2 +- test/e2e/framework/framework.go | 2 +- test/e2e/gameserver_test.go | 2 +- test/load/allocation/README.md | 4 +- test/load/allocation/fleet.yaml | 2 +- 46 files changed, 108 insertions(+), 119 deletions(-) diff --git a/build/Makefile b/build/Makefile index 0db051fe23..34c625f758 100644 --- a/build/Makefile +++ b/build/Makefile @@ -65,7 +65,7 @@ KIND_PROFILE ?= agones KIND_CONTAINER_NAME=$(KIND_PROFILE)-control-plane # Game Server image to use while doing end-to-end tests -GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 +GS_TEST_IMAGE ?= gcr.io/agones-images/simple-game-server:0.14 # Enable all alpha feature gates. Keep in sync with `false` (alpha) entries in pkg/util/runtime/features.go:featureDefaults ALPHA_FEATURE_GATES ?= "LifecycleContract=true&PlayerAllocationFilter=true&PlayerTracking=true&ResetMetricsOnDelete=true&SDKGracefulTermination=true&Example=true" diff --git a/build/includes/examples.mk b/build/includes/examples.mk index 3bd7b88b0a..9a10f3f714 100644 --- a/build/includes/examples.mk +++ b/build/includes/examples.mk @@ -23,17 +23,17 @@ # |_|\__,_|_| \__, |\___|\__|___/ # |___/ -# test all example images exist on Google Artifact Registry -test-examples-on-gar: example-image-test.allocation-endpoint -test-examples-on-gar: example-image-test.autoscaler-webhook -test-examples-on-gar: example-image-test.cpp-simple -test-examples-on-gar: example-image-test.nodejs-simple -test-examples-on-gar: example-image-test.rust-simple -test-examples-on-gar: example-image-test.unity-simple -test-examples-on-gar: example-image-test.xonotic -test-examples-on-gar: example-image-test.crd-client -test-examples-on-gar: example-image-test.supertuxkart -test-examples-on-gar: example-image-test.simple-game-server +# test all example images exist on Google Cloud Registry +test-examples-on-gcr: example-image-test.allocation-endpoint +test-examples-on-gcr: example-image-test.autoscaler-webhook +test-examples-on-gcr: example-image-test.cpp-simple +test-examples-on-gcr: example-image-test.nodejs-simple +test-examples-on-gcr: example-image-test.rust-simple +test-examples-on-gcr: example-image-test.unity-simple +test-examples-on-gcr: example-image-test.xonotic +test-examples-on-gcr: example-image-test.crd-client +test-examples-on-gcr: example-image-test.supertuxkart +test-examples-on-gcr: example-image-test.simple-game-server push-example-golang-images: example-image-push.allocation-endpoint push-example-golang-images: example-image-push.autoscaler-webhook @@ -41,9 +41,9 @@ push-example-golang-images: example-image-push.crd-client push-example-golang-images: example-image-push.supertuxkart push-example-golang-images: example-image-push.simple-game-server -# Test to ensure the example image found in the % folder is on GAR. Fails if it is not. +# Test to ensure the example image found in the % folder is on GCR. Fails if it is not. example-image-test.%: - $(DOCKER_RUN) bash -c "cd examples/$* && make gar-check" + $(DOCKER_RUN) bash -c "cd examples/$* && make gcr-check" example-image-push.%: $(DOCKER_RUN) bash -c "cd examples/$* && make push" \ No newline at end of file diff --git a/docs/governance/templates/release.md b/docs/governance/templates/release.md index cbb0446531..ce83dedbb8 100644 --- a/docs/governance/templates/release.md +++ b/docs/governance/templates/release.md @@ -22,11 +22,11 @@ Images available with this release: - [gcr.io/agones-images/agones-sdk:{version}](https://gcr.io/agones-images/agones-sdk:{version}) - [gcr.io/agones-images/agones-ping:{version}](https://gcr.io/agones-images/agones-ping:{version}) - [gcr.io/agones-images/agones-allocator:{version}](https://gcr.io/agones-images/agones-allocator:{version}) - { run `make release-example-image-markdown` to populate example images section below (will be more in output than in example) } -- [us-docker.pkg.dev/agones-images/examples/cpp-simple-server:{example-version}](https://us-docker.pkg.dev/agones-images/examples/cpp-simple-server:{example-version}) -- [us-docker.pkg.dev/agones-images/examples/crd-client:{example-version}](https://us-docker.pkg.dev/agones-images/examples/crd-client:{example-version}) -- [us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:{example-version}](https://us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:{example-version}) -- [us-docker.pkg.dev/agones-images/examples/rust-simple-server:{example-version}](https://us-docker.pkg.dev/agones-images/examples/rust-simple-server:{example-version}) +{ run `make release-example-image-markdown` to populate example images section below (will be more in output than in example) } +- [gcr.io/agones-images/cpp-simple-server:{example-version}](https://gcr.io/agones-images/cpp-simple-server:{example-version}) +- [gcr.io/agones-images/crd-client:{example-version}](https://gcr.io/agones-images/crd-client:{example-version}) +- [gcr.io/agones-images/nodejs-simple-server:{example-version}](https://gcr.io/agones-images/nodejs-simple-server:{example-version}) +- [gcr.io/agones-images/rust-simple-server:{example-version}](https://gcr.io/agones-images/rust-simple-server:{example-version}) Helm chart available with this release: diff --git a/docs/governance/templates/release_issue.md b/docs/governance/templates/release_issue.md index 1fcf4a9fca..64f90cff0c 100644 --- a/docs/governance/templates/release_issue.md +++ b/docs/governance/templates/release_issue.md @@ -13,8 +13,8 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] Have permission to publish new versions of the App Engine application. - [ ] Have write access to Agones GitHub repository. - [ ] Run `git remote -v` and see: - - [ ] An `origin` remote that points to a personal fork of Agones, such as `git@github.com:yourname/agones.git`. - - [ ] An `upstream` remote that points to `git@github.com:googleforgames/agones.git`. + - [ ] An `origin` remote that points to a personal fork of Agones, such as `git@github.com:yourname/agones.git`. + - [ ] An `upstream` remote that points to `git@github.com:googleforgames/agones.git`. - [ ] Have a [GitHub Personal Access Token](https://github.com/settings/tokens) with repo permissions. - [ ] Have a `gcloud config configurations` configuration called `agones-images` that points to the same project. - [ ] Edit access to the [Agones Release Calendar](https://calendar.google.com/calendar/u/0?cid=Z29vZ2xlLmNvbV84MjhuOGYxOGhmYnRyczR2dTRoMXNrczIxOEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t) @@ -23,7 +23,7 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] Run `make shell` and run `gcloud config configurations activate agones-images`. - [ ] Review [closed issues with no milestone](https://github.com/googleforgames/agones/issues?q=is%3Aissue+is%3Aclosed+no%3Amilestone++-label%3Ainvalid+-label%3Aduplicate+-label%3Aquestion+-label%3Awontfix++-label%3Aarea%2Fmeta) and add relevant ones to the current milestone. - - Issues tagged as `invalid`, `duplicate`, `question`, `wontfix`, or `area/meta` can be ignored + - Issues tagged as `invalid`, `duplicate`, `question`, `wontfix`, or `area/meta` can be ignored - [ ] Review closed issues in the current milestone to ensure that they have appropriate tags. - [ ] Review [merged PRs that have no milestone](https://github.com/googleforgames/agones/pulls?q=is%3Apr+is%3Amerged+no%3Amilestone+) and add them to the current milestone. - [ ] Review merged PRs in the current milestone to ensure that they have appropriate tags. @@ -33,10 +33,10 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] If release candidate add the label `feature-freeze-do-not-merge` to any feature pull requests. - [ ] `git checkout main && git pull --rebase upstream main` - [ ] If full release, run `make site-deploy SERVICE={version}-1`, (replace . with -) - - For example, if you are creating the 1.18.0 release, then you would deploy the 1-17-0 service (release minus one, and then replace dots with dashes). + - For example, if you are creating the 1.18.0 release, then you would deploy the 1-17-0 service (release minus one, and then replace dots with dashes). - [ ] Run `make gen-changelog` to generate the CHANGELOG.md (if release candidate - `make gen-changelog RELEASE_VERSION={version}-rc`). You will need your - [GitHub Personal Access Token](https://github.com/settings/tokens) for this. + `make gen-changelog RELEASE_VERSION={version}-rc`). You will need your + [GitHub Personal Access Token](https://github.com/settings/tokens) for this. - [ ] Ensure the [helm `tag` value][values] is correct (should be {version} if a full release, {version}-rc if release candidate) - [ ] Ensure the [helm `Chart` version values][chart] are correct (should be {version} if a full release, {version}-rc if release candidate) - [ ] Update SDK Package Versions @@ -44,9 +44,9 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] Ensure the [`sdks/csharp/sdk/AgonesSDK.nuspec` and `sdks/csharp/sdk/csharp-sdk.csproj`][csharp] versions are correct (should be {version} if a full release, {version}-rc if release candidate) - [ ] Update the package version in the [`sdks/unity/package.json`][unity] package file's `Version` field to {version} if a full release, {version}-rc if release candidate - [ ] Run `make gen-install` -- [ ] Run `make test-examples-on-gar` to ensure all example images exist on us-docker.pkg.dev/agones-images/examples -- [ ] Create a *draft* release with the [release template][release-template] - - [ ] Make a `tag` with the release version. +- [ ] Run `make test-examples-on-gcr` to ensure all example images exist on gcr.io/agones-images- +- [ ] Create a _draft_ release with the [release template][release-template] + - [ ] Make a `tag` with the release version. - [ ] Site updated - [ ] Copy the draft release content into a new `/site/content/en/blog/releases` content (this will be what you send via email). - [ ] Add the Agones release version and its supported Kubernetes version to the version matrix in `site/content/en/docs/installation/#agones-and-kubernetes-supported-versions`. @@ -60,33 +60,22 @@ and copy it into a release issue. Fill in relevant values, found inside {} - [ ] If full release, copy `dev_aks_minor_supported_k8s` to `aks_minor_supported_k8s`. - [ ] If full release, copy `dev_minikube_minor_supported_k8s` to `minikube_minor_supported_k8s`. - [ ] If full release, update documentation with updated example images tags. - - [ ] Copy the draft release content into a new `/site/content/en/blog/releases` content (this will be what you send via email). - - [ ] Review all `link_test` and `data-proofer-ignore` attributes and remove for link testing - - [ ] If full release, review and remove all instances of the `feature` shortcode - - [ ] If full release, add a link to previous version's documentation to nav dropdown. - - [ ] config.toml updates: - - [ ] If full release, update `release_branch` to the new release branch for {version}. - - [ ] If full release, update `release-version` with the new release version {version}. - - [ ] If full release, copy `dev_supported_k8s` to `supported_k8s`. - - [ ] If full release, copy `dev_aks_minor_supported_k8s` to `aks_minor_supported_k8s`. - - [ ] If full release, copy `dev_minikube_minor_supported_k8s` to `minikube_minor_supported_k8s`. - - [ ] If full release, update documentation with updated example images tags. - [ ] Create PR with these changes, and merge them with an approval. - [ ] Run `git remote update && git checkout main && git reset --hard upstream/main` to ensure your code is in line - with upstream (unless this is a hotfix, then do the same, but for the release branch) + with upstream (unless this is a hotfix, then do the same, but for the release branch) - [ ] Publish SDK packages - - [ ] Run `make sdk-shell-node` to get interactive shell to publish node package. Requires Google internal process - to publish. - - [ ] Run `make sdk-publish-csharp` to deploy to NuGet. Requires login credentials. (if release candidate: - `make sdk-publish-csharp RELEASE_VERSION={version}-rc`). - Will need [NuGet API Key](https://www.nuget.org/account/apikeys) from Agones account. + - [ ] Run `make sdk-shell-node` to get interactive shell to publish node package. Requires Google internal process + to publish. + - [ ] Run `make sdk-publish-csharp` to deploy to NuGet. Requires login credentials. (if release candidate: + `make sdk-publish-csharp RELEASE_VERSION={version}-rc`). + Will need [NuGet API Key](https://www.nuget.org/account/apikeys) from Agones account. - [ ] Run `make do-release`. (if release candidate: `make do-release RELEASE_VERSION={version}-rc`) to create and push the docker images and helm chart. - [ ] Run `make shell` and run `gcloud config configurations activate ` to switch Agones - development tooling off of the `agones-images` project. + development tooling off of the `agones-images` project. - [ ] Do a `helm repo add agones https://agones.dev/chart/stable` / `helm repo update` and verify that the new - version is available via the command `helm search repo agones --versions --devel`. + version is available via the command `helm search repo agones --versions --devel`. - [ ] Do a `helm install --namespace=agones-system agones agones/agones` - (`helm install --namespace=agones-system agones agones/agones --version={version}-rc` if release candidate) and a smoke test to confirm everything is working. + (`helm install --namespace=agones-system agones agones/agones --version={version}-rc` if release candidate) and a smoke test to confirm everything is working. - [ ] Attach all assets found in the `release` folder to the draft GitHub Release. - [ ] If release candidate check the pre-release box on the draft GitHub Release - [ ] Copy any review changes from the release blog post into the draft GitHub release. diff --git a/examples/allocation-endpoint/Makefile b/examples/allocation-endpoint/Makefile index d77d88dc1a..636978c5a3 100644 --- a/examples/allocation-endpoint/Makefile +++ b/examples/allocation-endpoint/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images # Directory that this Makefile is in. mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) @@ -45,8 +45,8 @@ build: run: docker run --network=host $(server_tag) $(args) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/allocation-endpoint/terraform/variable.tf b/examples/allocation-endpoint/terraform/variable.tf index 26f7789d52..58686b0427 100644 --- a/examples/allocation-endpoint/terraform/variable.tf +++ b/examples/allocation-endpoint/terraform/variable.tf @@ -20,7 +20,7 @@ variable "project_id" { variable "ae_proxy_image" { type = string description = "The docker image of the allocation proxy." - default = "us-docker.pkg.dev/agones-images/examples/allocation-endpoint-proxy:0.2" + default = "gcr.io/agones-images/allocation-endpoint-proxy:latest" } variable "region" { diff --git a/examples/autoscaler-webhook/Makefile b/examples/autoscaler-webhook/Makefile index 23a8e3e4f4..3072a867b6 100644 --- a/examples/autoscaler-webhook/Makefile +++ b/examples/autoscaler-webhook/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) @@ -45,8 +45,8 @@ build: push: build docker push $(autoscaler_webhook_tag) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(autoscaler_webhook_tag) #output the tag for this image diff --git a/examples/autoscaler-webhook/autoscaler-service-tls.yaml b/examples/autoscaler-webhook/autoscaler-service-tls.yaml index 9d19ebeb45..4c89fc0242 100644 --- a/examples/autoscaler-webhook/autoscaler-service-tls.yaml +++ b/examples/autoscaler-webhook/autoscaler-service-tls.yaml @@ -54,7 +54,7 @@ spec: secretName: autoscalersecret containers: - name: autoscaler-webhook - image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.5 + image: gcr.io/agones-images/autoscaler-webhook:0.5 imagePullPolicy: Always volumeMounts: - mountPath: /home/service/certs diff --git a/examples/autoscaler-webhook/autoscaler-service.yaml b/examples/autoscaler-webhook/autoscaler-service.yaml index fc9374e4b2..28757c4551 100644 --- a/examples/autoscaler-webhook/autoscaler-service.yaml +++ b/examples/autoscaler-webhook/autoscaler-service.yaml @@ -50,7 +50,7 @@ spec: #serviceAccount: autoscaler-webhook containers: - name: autoscaler-webhook - image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.5 + image: gcr.io/agones-images/autoscaler-webhook:0.5 imagePullPolicy: Always ports: - name: autoscaler diff --git a/examples/cpp-simple/Makefile b/examples/cpp-simple/Makefile index c67e00d42f..585c7b7295 100644 --- a/examples/cpp-simple/Makefile +++ b/examples/cpp-simple/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images # Directory that this Makefile is in. mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) @@ -42,8 +42,8 @@ root_path = $(realpath $(project_path)/../..) build: cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(server_tag) . -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/cpp-simple/fleet.yaml b/examples/cpp-simple/fleet.yaml index 7a3262432a..a391b7a4a0 100644 --- a/examples/cpp-simple/fleet.yaml +++ b/examples/cpp-simple/fleet.yaml @@ -30,5 +30,5 @@ spec: spec: containers: - name: cpp-simple - image: us-docker.pkg.dev/agones-images/examples/cpp-simple-server:0.15 + image: gcr.io/agones-images/cpp-simple-server:0.12 # imagePullPolicy: Always # add for development \ No newline at end of file diff --git a/examples/cpp-simple/gameserver.yaml b/examples/cpp-simple/gameserver.yaml index dd02b7c494..81e36ce368 100644 --- a/examples/cpp-simple/gameserver.yaml +++ b/examples/cpp-simple/gameserver.yaml @@ -27,5 +27,5 @@ spec: spec: containers: - name: cpp-simple - image: us-docker.pkg.dev/agones-images/examples/cpp-simple-server:0.15 + image: gcr.io/agones-images/cpp-simple-server:0.12 imagePullPolicy: Always # add for development \ No newline at end of file diff --git a/examples/crd-client/Makefile b/examples/crd-client/Makefile index 2fe521f928..50748e3795 100644 --- a/examples/crd-client/Makefile +++ b/examples/crd-client/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY ?= us-docker.pkg.dev/agones-images/examples +REPOSITORY ?= gcr.io/agones-images server_tag = $(REPOSITORY)/crd-client:0.7 @@ -41,8 +41,8 @@ build: push: build docker push $(server_tag) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/crd-client/create-gs.yaml b/examples/crd-client/create-gs.yaml index 041b3842e0..fa154b40a1 100644 --- a/examples/crd-client/create-gs.yaml +++ b/examples/crd-client/create-gs.yaml @@ -24,9 +24,9 @@ spec: serviceAccountName: agones-controller containers: - name: create-gameserver - image: us-docker.pkg.dev/agones-images/examples/crd-client:0.7 + image: gcr.io/agones-images/crd-client:0.7 imagePullPolicy: Always env: - name: GAMESERVER_IMAGE - value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14" + value: "gcr.io/agones-images/simple-game-server:0.14" restartPolicy: Never diff --git a/examples/fleet.yaml b/examples/fleet.yaml index 2fc68264cd..7941f2c08f 100644 --- a/examples/fleet.yaml +++ b/examples/fleet.yaml @@ -76,4 +76,4 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml index 0c1ff1f775..616b26b466 100644 --- a/examples/gameserver.yaml +++ b/examples/gameserver.yaml @@ -96,7 +96,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 imagePullPolicy: Always # nodeSelector is a label that can be used to tell Kubernetes which host # OS to use. For Windows game servers uncomment the nodeSelector diff --git a/examples/nodejs-simple/Makefile b/examples/nodejs-simple/Makefile index 14742741a2..88119dd762 100644 --- a/examples/nodejs-simple/Makefile +++ b/examples/nodejs-simple/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images # Directory that this Makefile is in. mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) @@ -45,8 +45,8 @@ build: run: docker run --network=host $(server_tag) $(args) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/nodejs-simple/README.md b/examples/nodejs-simple/README.md index 93e17be4bf..1912618fc3 100644 --- a/examples/nodejs-simple/README.md +++ b/examples/nodejs-simple/README.md @@ -42,7 +42,7 @@ $ make run The example can also be run via docker: ``` -$ docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 +$ docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 ``` Or directly via npm: ``` @@ -51,7 +51,7 @@ $ npm start You will see the output like the following: ``` -docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 +docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 > @ start /home/server/examples/nodejs-simple > node src/index.js @@ -63,7 +63,7 @@ Connecting to the SDK server... To see help, pass `--help` as the argument (use the preferred command below, all are equivalent): ``` $ make args="--help" run -$ docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 --help +$ docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 --help $ npm start -- --help ``` @@ -71,14 +71,14 @@ You can optionally specify how long the server will stay up once the basic tests To do this pass arguments through, e.g. to increase the shutdown duration to 120 seconds: ``` $ make args="--timeout=120" run -$ docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 --timeout=120 +$ docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 --timeout=120 $ npm start -- --timeout=120 ``` To make run indefinitely use the special timeout value of 0: ``` $ make args="--timeout=0" run -$ docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 --timeout=0 +$ docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 --timeout=0 $ npm start -- --timeout=0 ``` @@ -90,6 +90,6 @@ $ cd ../../build; make run-sdk-conformance-local TIMEOUT=120 FEATURE_GATES="Play Then enable the alpha suite: ``` $ make args="--alpha" run -$ docker run --network=host us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 --alpha +$ docker run --network=host gcr.io/agones-images/nodejs-simple-server:0.8 --alpha $ npm start -- --alpha ``` diff --git a/examples/nodejs-simple/gameserver.yaml b/examples/nodejs-simple/gameserver.yaml index 0ec00e32ec..3cac55687c 100644 --- a/examples/nodejs-simple/gameserver.yaml +++ b/examples/nodejs-simple/gameserver.yaml @@ -32,5 +32,5 @@ spec: spec: containers: - name: nodejs-simple - image: us-docker.pkg.dev/agones-images/examples/nodejs-simple-server:0.8 + image: gcr.io/agones-images/nodejs-simple-server:0.8 # args: ["--timeout=0"] # Change the timeout here, if you like the nodejs server to run longer. diff --git a/examples/rust-simple/Makefile b/examples/rust-simple/Makefile index ea49b5afcc..c09d51f317 100644 --- a/examples/rust-simple/Makefile +++ b/examples/rust-simple/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY ?= us-docker.pkg.dev/agones-images/examples +REPOSITORY ?= gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) @@ -73,8 +73,8 @@ clean: clean-docker: rm -rf $(project_path)sdk -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/rust-simple/README.md b/examples/rust-simple/README.md index d8044bf46b..74f63d3cc4 100644 --- a/examples/rust-simple/README.md +++ b/examples/rust-simple/README.md @@ -37,7 +37,7 @@ $ make run-image You will see the following output: ``` -docker run --network=host us-docker.pkg.dev/agones-images/examples/rust-simple-server:0.11 +docker run --network=host gcr.io/agones-images/rust-simple-server:0.7 Rust Game Server has started! Creating SDK instance Setting a label diff --git a/examples/rust-simple/gameserver.yaml b/examples/rust-simple/gameserver.yaml index 1ffc22b1ee..714f63ac54 100644 --- a/examples/rust-simple/gameserver.yaml +++ b/examples/rust-simple/gameserver.yaml @@ -26,5 +26,5 @@ spec: spec: containers: - name: rust-simple - image: us-docker.pkg.dev/agones-images/examples/rust-simple-server:0.11 + image: gcr.io/agones-images/rust-simple-server:0.7 imagePullPolicy: Always diff --git a/examples/simple-game-server/Makefile b/examples/simple-game-server/Makefile index 475e5b43f7..6bb1523b40 100644 --- a/examples/simple-game-server/Makefile +++ b/examples/simple-game-server/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REGISTRY = us-docker.pkg.dev/agones-images/examples +REGISTRY = gcr.io/agones-images BUILDX_WINDOWS_BUILDER = windows-builder # Versions of Windows Server to support, default is Windows Server 2019. # For the full list of tags see https://hub.docker.com/_/microsoft-windows-servercore. @@ -122,8 +122,8 @@ build-linux-image-amd64: build-linux-image-arm64: cd $(root_path) && docker buildx build --platform linux/arm64 -f $(project_path)Dockerfile $(DOCKER_BUILD_ARGS) --tag=$(server_tag_linux_arm64) . -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the tag for this image diff --git a/examples/simple-game-server/dev-gameserver.yaml b/examples/simple-game-server/dev-gameserver.yaml index 6f39677704..1358732546 100644 --- a/examples/simple-game-server/dev-gameserver.yaml +++ b/examples/simple-game-server/dev-gameserver.yaml @@ -31,4 +31,4 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 diff --git a/examples/simple-game-server/fleet-distributed.yaml b/examples/simple-game-server/fleet-distributed.yaml index 30281497de..19c6cd79da 100644 --- a/examples/simple-game-server/fleet-distributed.yaml +++ b/examples/simple-game-server/fleet-distributed.yaml @@ -32,7 +32,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/fleet-tcp.yaml b/examples/simple-game-server/fleet-tcp.yaml index 0764b3bd06..576fdddc90 100644 --- a/examples/simple-game-server/fleet-tcp.yaml +++ b/examples/simple-game-server/fleet-tcp.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 env: # Disables the UDP listener (Enabled by default) - name: "UDP" diff --git a/examples/simple-game-server/fleet.yaml b/examples/simple-game-server/fleet.yaml index 44d38ceab5..9439813ff6 100644 --- a/examples/simple-game-server/fleet.yaml +++ b/examples/simple-game-server/fleet.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/gameserver-passthrough.yaml b/examples/simple-game-server/gameserver-passthrough.yaml index adbcd03122..72f1dda22a 100644 --- a/examples/simple-game-server/gameserver-passthrough.yaml +++ b/examples/simple-game-server/gameserver-passthrough.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 env: - name: "PASSTHROUGH" value: "TRUE" diff --git a/examples/simple-game-server/gameserver-windows.yaml b/examples/simple-game-server/gameserver-windows.yaml index b134070b94..046d9a2da0 100644 --- a/examples/simple-game-server/gameserver-windows.yaml +++ b/examples/simple-game-server/gameserver-windows.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/gameserver.yaml b/examples/simple-game-server/gameserver.yaml index d4411fec89..350bc0d63e 100644 --- a/examples/simple-game-server/gameserver.yaml +++ b/examples/simple-game-server/gameserver.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 resources: requests: memory: "64Mi" diff --git a/examples/supertuxkart/Makefile b/examples/supertuxkart/Makefile index b904238b5a..09329bbfbc 100644 --- a/examples/supertuxkart/Makefile +++ b/examples/supertuxkart/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) @@ -48,8 +48,8 @@ push: build test: go test -v ./... -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(image_tag) #output the tag for this image diff --git a/examples/supertuxkart/fleet.yaml b/examples/supertuxkart/fleet.yaml index 1e54697b81..bd40beaca3 100644 --- a/examples/supertuxkart/fleet.yaml +++ b/examples/supertuxkart/fleet.yaml @@ -32,4 +32,4 @@ spec: spec: containers: - name: supertuxkart - image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.6 + image: gcr.io/agones-images/supertuxkart-example:0.6 diff --git a/examples/supertuxkart/gameserver.yaml b/examples/supertuxkart/gameserver.yaml index 9cead37f1a..6e49bddd76 100644 --- a/examples/supertuxkart/gameserver.yaml +++ b/examples/supertuxkart/gameserver.yaml @@ -24,7 +24,7 @@ spec: spec: containers: - name: supertuxkart - image: us-docker.pkg.dev/agones-images/examples/supertuxkart-example:0.6 + image: gcr.io/agones-images/supertuxkart-example:0.6 # imagePullPolicy: Always # add for development env: - name: ENABLE_PLAYER_TRACKING diff --git a/examples/unity-simple/Makefile b/examples/unity-simple/Makefile index be0ebcbbcd..05b1ad5d39 100644 --- a/examples/unity-simple/Makefile +++ b/examples/unity-simple/Makefile @@ -24,7 +24,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) @@ -40,8 +40,8 @@ server_tag = $(REPOSITORY)/unity-simple-server:0.3 build-image: docker build $(project_path) --tag=$(server_tag) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(server_tag) #output the server_tag diff --git a/examples/unity-simple/gameserver.yaml b/examples/unity-simple/gameserver.yaml index 5cddc40067..1cbd12c0b6 100644 --- a/examples/unity-simple/gameserver.yaml +++ b/examples/unity-simple/gameserver.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: unity-simple-server - image: us-docker.pkg.dev/agones-images/examples/unity-simple-server:0.3 + image: gcr.io/agones-images/unity-simple-server:0.3 resources: requests: memory: "128Mi" diff --git a/examples/xonotic/Makefile b/examples/xonotic/Makefile index e70470ac67..ef70f0b087 100644 --- a/examples/xonotic/Makefile +++ b/examples/xonotic/Makefile @@ -23,7 +23,7 @@ # \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/ # -REPOSITORY = us-docker.pkg.dev/agones-images/examples +REPOSITORY = gcr.io/agones-images mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) project_path := $(dir $(mkfile_path)) @@ -41,12 +41,12 @@ image_tag = $(REPOSITORY)/xonotic-example:0.9 build: docker build -f $(project_path)/Dockerfile --tag=$(image_tag) . -# Push a docker image to the repository, and save it +# Push a docker image to the GCR, and save it push: build docker push $(image_tag) -# check if hosted on Google Artifact Registry -gar-check: +# check if hosted on Google Cloud Registry +gcr-check: gcloud container images describe $(image_tag) #output the tag for this image diff --git a/examples/xonotic/fleet.yaml b/examples/xonotic/fleet.yaml index 8caf05bbc5..d1681f17b7 100644 --- a/examples/xonotic/fleet.yaml +++ b/examples/xonotic/fleet.yaml @@ -35,4 +35,4 @@ spec: spec: containers: - name: xonotic - image: us-docker.pkg.dev/agones-images/examples/xonotic-example:0.9 + image: gcr.io/agones-images/xonotic-example:0.9 diff --git a/examples/xonotic/gameserver.yaml b/examples/xonotic/gameserver.yaml index 717bf4a65e..6da48b0109 100644 --- a/examples/xonotic/gameserver.yaml +++ b/examples/xonotic/gameserver.yaml @@ -24,5 +24,5 @@ spec: spec: containers: - name: xonotic - image: us-docker.pkg.dev/agones-images/examples:0.9 + image: gcr.io/agones-images/xonotic-example:0.9 # imagePullPolicy: Always # add for development diff --git a/install/helm/agones/templates/tests/test-runner.yaml b/install/helm/agones/templates/tests/test-runner.yaml index 9fa717964c..3d2564cfba 100644 --- a/install/helm/agones/templates/tests/test-runner.yaml +++ b/install/helm/agones/templates/tests/test-runner.yaml @@ -25,11 +25,11 @@ spec: serviceAccountName: agones-controller containers: - name: create-gameserver - image: us-docker.pkg.dev/agones-images/examples/crd-client:0.7 + image: gcr.io/agones-images/crd-client:0.7 imagePullPolicy: Always env: - name: GAMESERVER_IMAGE - value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14" + value: "gcr.io/agones-images/simple-game-server:0.14" - name: IS_HELM_TEST value: "true" - name: GAMESERVERS_NAMESPACE diff --git a/pkg/util/webhooks/webhooks_test.go b/pkg/util/webhooks/webhooks_test.go index 400c591fed..a4715f6c90 100644 --- a/pkg/util/webhooks/webhooks_test.go +++ b/pkg/util/webhooks/webhooks_test.go @@ -163,7 +163,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) { "template": { "spec": { "containers": [{ - "image": "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14", + "image": "gcr.io/agones-images/simple-game-server:0.14", "name": false }] } diff --git a/site/config.toml b/site/config.toml index ddbdf45b5a..c15ccaf41f 100644 --- a/site/config.toml +++ b/site/config.toml @@ -96,7 +96,7 @@ dev_aks_minor_supported_k8s = "8" dev_minikube_minor_supported_k8s = "9" # example tag -example_image_tag = "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14" +example_image_tag = "gcr.io/agones-images/simple-game-server:0.14" # Enable syntax highlighting and copy buttons on code blocks with Prism prism_syntax_highlighting = true diff --git a/test/e2e/fleetautoscaler_test.go b/test/e2e/fleetautoscaler_test.go index 9b62b2eff3..07b56d2bb7 100644 --- a/test/e2e/fleetautoscaler_test.go +++ b/test/e2e/fleetautoscaler_test.go @@ -717,7 +717,7 @@ func defaultAutoscalerWebhook(namespace string) (*corev1.Pod, *corev1.Service) { }, Spec: corev1.PodSpec{ Containers: []corev1.Container{{Name: "webhook", - Image: "us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.5", + Image: "gcr.io/agones-images/autoscaler-webhook:0.5", ImagePullPolicy: corev1.PullAlways, Ports: []corev1.ContainerPort{{ ContainerPort: 8000, diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 98e1d45459..3f299a97ec 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -157,7 +157,7 @@ func NewFromFlags() (*Framework, error) { } viper.SetDefault(kubeconfigFlag, filepath.Join(usr.HomeDir, ".kube", "config")) - viper.SetDefault(gsimageFlag, "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14") + viper.SetDefault(gsimageFlag, "gcr.io/agones-images/simple-game-server:0.14") viper.SetDefault(pullSecretFlag, "") viper.SetDefault(stressTestLevelFlag, 0) viper.SetDefault(perfOutputDirFlag, "") diff --git a/test/e2e/gameserver_test.go b/test/e2e/gameserver_test.go index 7837fa041c..e05179e9f1 100644 --- a/test/e2e/gameserver_test.go +++ b/test/e2e/gameserver_test.go @@ -927,7 +927,7 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: ERROR containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 ` err := os.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0o644) require.NoError(t, err) diff --git a/test/load/allocation/README.md b/test/load/allocation/README.md index 24a2266dd8..c9198fa0bf 100644 --- a/test/load/allocation/README.md +++ b/test/load/allocation/README.md @@ -33,7 +33,7 @@ kind: Fleet - args: # We setup the simple-game-server server to shutdown 10 mins after allocation - -automaticShutdownDelaySec=600 - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 name: simple-game-server ... ``` @@ -185,7 +185,7 @@ spec: value: 'true' containers: - name: simple-game-server - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 args: - -automaticShutdownDelaySec=60 - -readyIterations=10 diff --git a/test/load/allocation/fleet.yaml b/test/load/allocation/fleet.yaml index 200c9c0f1d..aefd4aaeec 100644 --- a/test/load/allocation/fleet.yaml +++ b/test/load/allocation/fleet.yaml @@ -35,7 +35,7 @@ spec: - args: # We setup the simple-game-server server to shutdown 10 mins after allocation - -automaticShutdownDelaySec=600 - image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.14 + image: gcr.io/agones-images/simple-game-server:0.14 name: simple-game-server resources: limits: