From c3fdf24e8f9ac361d416ce56e23598d84a4dfa5c Mon Sep 17 00:00:00 2001 From: Robert Bailey Date: Sun, 26 Dec 2021 21:32:19 -0800 Subject: [PATCH] Update the simple game server version to 0.6. (#2413) --- build/Makefile | 2 +- examples/crd-client/create-gs.yaml | 2 +- examples/fleet.yaml | 2 +- examples/gameserver.yaml | 2 +- examples/simple-game-server/dev-gameserver.yaml | 2 +- examples/simple-game-server/fleet-distributed.yaml | 2 +- examples/simple-game-server/fleet-tcp.yaml | 2 +- examples/simple-game-server/fleet.yaml | 2 +- examples/simple-game-server/gameserver-passthrough.yaml | 2 +- examples/simple-game-server/gameserver-windows.yaml | 2 +- examples/simple-game-server/gameserver.yaml | 2 +- install/helm/agones/templates/tests/test-runner.yaml | 2 +- pkg/util/webhooks/webhooks_test.go | 2 +- site/config.toml | 2 +- test/e2e/framework/framework.go | 4 ++-- test/e2e/gameserver_test.go | 2 +- test/load/allocation/README.md | 4 ++-- test/load/allocation/fleet.yaml | 4 ++-- test/load/allocation/grpc/README.md | 8 ++++---- test/load/allocation/grpc/fleet.yaml | 4 ++-- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/build/Makefile b/build/Makefile index 0ef73883f8..997343f9b8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -63,7 +63,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 ?= gcr.io/agones-images/simple-game-server:0.5 +GS_TEST_IMAGE ?= gcr.io/agones-images/simple-game-server:0.6 ALPHA_FEATURE_GATES ?= "PlayerTracking=true&StateAllocationFilter=true&PlayerAllocationFilter=true&CustomFasSyncInterval=true" diff --git a/examples/crd-client/create-gs.yaml b/examples/crd-client/create-gs.yaml index 2c2439b538..3879f3d8ba 100644 --- a/examples/crd-client/create-gs.yaml +++ b/examples/crd-client/create-gs.yaml @@ -28,5 +28,5 @@ spec: imagePullPolicy: Always env: - name: GAMESERVER_IMAGE - value: "gcr.io/agones-images/simple-game-server:0.5" + value: "gcr.io/agones-images/simple-game-server:0.6" restartPolicy: Never diff --git a/examples/fleet.yaml b/examples/fleet.yaml index a73bd9ed96..da08408764 100644 --- a/examples/fleet.yaml +++ b/examples/fleet.yaml @@ -76,4 +76,4 @@ spec: spec: containers: - name: simple-game-server - image: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml index fabb1d473a..1a6d169ab9 100644 --- a/examples/gameserver.yaml +++ b/examples/gameserver.yaml @@ -96,7 +96,7 @@ spec: spec: containers: - name: simple-game-server - image: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 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/simple-game-server/dev-gameserver.yaml b/examples/simple-game-server/dev-gameserver.yaml index 2ba17c616a..9c96a67637 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 diff --git a/examples/simple-game-server/fleet-distributed.yaml b/examples/simple-game-server/fleet-distributed.yaml index c186b07781..0a9e3be2b3 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/fleet-tcp.yaml b/examples/simple-game-server/fleet-tcp.yaml index 40298738df..f729b576cf 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 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 ef42eb21a3..0a914f848c 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/gameserver-passthrough.yaml b/examples/simple-game-server/gameserver-passthrough.yaml index 1a71050b39..22f66a37bf 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 env: - name: "PASSTHROUGH" value: "TRUE" diff --git a/examples/simple-game-server/gameserver-windows.yaml b/examples/simple-game-server/gameserver-windows.yaml index 973699bb92..b472b4d565 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 resources: requests: memory: "64Mi" diff --git a/examples/simple-game-server/gameserver.yaml b/examples/simple-game-server/gameserver.yaml index 6d14e50a57..9c0f12d632 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: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 resources: requests: memory: "64Mi" diff --git a/install/helm/agones/templates/tests/test-runner.yaml b/install/helm/agones/templates/tests/test-runner.yaml index 7a087c11cd..28eba2c4a2 100644 --- a/install/helm/agones/templates/tests/test-runner.yaml +++ b/install/helm/agones/templates/tests/test-runner.yaml @@ -29,7 +29,7 @@ spec: imagePullPolicy: Always env: - name: GAMESERVER_IMAGE - value: "gcr.io/agones-images/simple-game-server:0.5" + value: "gcr.io/agones-images/simple-game-server:0.6" - 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 f42af36653..965df0ba5a 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": "gcr.io/agones-images/simple-game-server:0.5", + "image": "gcr.io/agones-images/simple-game-server:0.6", "name": false }] } diff --git a/site/config.toml b/site/config.toml index 70d0083fa5..20913f0e2b 100644 --- a/site/config.toml +++ b/site/config.toml @@ -96,7 +96,7 @@ dev_aks_minor_supported_k8s = "2" dev_minikube_minor_supported_k8s = "5" # example tag -example_image_tag = "gcr.io/agones-images/simple-game-server:0.5" +example_image_tag = "gcr.io/agones-images/simple-game-server:0.6" # Enable syntax highlighting and copy buttons on code blocks with Prism prism_syntax_highlighting = true diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 51a02c69ae..bbfdd556c3 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, "gcr.io/agones-images/simple-game-server:0.5") + viper.SetDefault(gsimageFlag, "gcr.io/agones-images/simple-game-server:0.6") viper.SetDefault(pullSecretFlag, "") viper.SetDefault(stressTestLevelFlag, 0) viper.SetDefault(perfOutputDirFlag, "") @@ -166,7 +166,7 @@ func NewFromFlags() (*Framework, error) { viper.SetDefault(namespaceFlag, "") pflag.String(kubeconfigFlag, viper.GetString(kubeconfigFlag), "kube config path, e.g. $HOME/.kube/config") - pflag.String(gsimageFlag, viper.GetString(gsimageFlag), "gameserver image to use for those tests, gcr.io/agones-images/simple-game-server:0.5") + pflag.String(gsimageFlag, viper.GetString(gsimageFlag), "gameserver image to use for those tests, gcr.io/agones-images/simple-game-server:0.6") pflag.String(pullSecretFlag, viper.GetString(pullSecretFlag), "optional secret to be used for pulling the gameserver and/or Agones SDK sidecar images") pflag.Int(stressTestLevelFlag, viper.GetInt(stressTestLevelFlag), "enable stress test at given level 0-100") pflag.String(perfOutputDirFlag, viper.GetString(perfOutputDirFlag), "write performance statistics to the specified directory") diff --git a/test/e2e/gameserver_test.go b/test/e2e/gameserver_test.go index 9d4f3b07cd..fd5a18b811 100644 --- a/test/e2e/gameserver_test.go +++ b/test/e2e/gameserver_test.go @@ -889,7 +889,7 @@ spec: preferredDuringSchedulingIgnoredDuringExecution: ERROR containers: - name: simple-game-server - image: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 ` err := ioutil.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0644) require.NoError(t, err) diff --git a/test/load/allocation/README.md b/test/load/allocation/README.md index b1d52aa7e2..a5c808a902 100644 --- a/test/load/allocation/README.md +++ b/test/load/allocation/README.md @@ -1,7 +1,7 @@ This is a load test to determine Allocation QPS over time against a set of GameServers that are constantly being shutdown after a period. -This test creates a configured amount of GameServers at the initial step, switches them to Allocated state and finally -shuts them down (`automaticShutdownDelayMin` flag in a simple-game-server). +This test creates a configured amount of GameServers at the initial step, switches them to Allocated state and finally +shuts them down (`automaticShutdownDelaySec` flag in a simple-game-server). 1) Run kubectl apply -f ./fleet.yaml 2) Run `runAllocation.sh` script to perform this test. You can provide a number of runs as a parameter (3 is a default value). There is a 500 seconds pause after each run. diff --git a/test/load/allocation/fleet.yaml b/test/load/allocation/fleet.yaml index 1cc55d28fe..9495e50dae 100644 --- a/test/load/allocation/fleet.yaml +++ b/test/load/allocation/fleet.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: simple-game-server - image: gcr.io/agones-images/simple-game-server:0.5 + image: gcr.io/agones-images/simple-game-server:0.6 resources: requests: memory: "64Mi" @@ -36,4 +36,4 @@ spec: memory: "64Mi" cpu: "20m" args: - - "-automaticShutdownDelayMin=1" + - "-automaticShutdownDelaySec=60" diff --git a/test/load/allocation/grpc/README.md b/test/load/allocation/grpc/README.md index 45628edf7e..4d02e1f7fd 100644 --- a/test/load/allocation/grpc/README.md +++ b/test/load/allocation/grpc/README.md @@ -14,7 +14,7 @@ Here are the few important things: ## Fleet Setting We used the sample [fleet configuration](./fleet.yaml) with some minor modifications. We updated the `replicas` to 4000. -Also we set the `automaticShutdownDelayMin` parameter to 10 so simple-game-server game servers shutdown after 10 +Also we set the `automaticShutdownDelaySec` parameter to 10 so simple-game-server game servers shutdown after 10 minutes (see below). This helps to easily re-run the test without having to delete the game servers and allows to run tests continously. @@ -32,8 +32,8 @@ kind: Fleet containers: - args: # We setup the simple-game-server server to shutdown 10 mins after allocation - - -automaticShutdownDelayMin=10 - image: gcr.io/agones-images/simple-game-server:0.3 + - -automaticShutdownDelaySec=600 + image: gcr.io/agones-images/simple-game-server:0.6 name: simple-game-server ... ``` @@ -45,7 +45,7 @@ For more information visit [Allocator Service](https://agones.dev/site/docs/adva ## Running the test -You can use the provided runAllocation.sh script by providing two parameters: +You can use the provided runAllocation.sh script by providing two parameters: - number of clients (to do parallel allocations) - number of allocations for client diff --git a/test/load/allocation/grpc/fleet.yaml b/test/load/allocation/grpc/fleet.yaml index b9519b402a..90facda8c9 100644 --- a/test/load/allocation/grpc/fleet.yaml +++ b/test/load/allocation/grpc/fleet.yaml @@ -34,8 +34,8 @@ spec: containers: - args: # We setup the simple-game-server server to shutdown 10 mins after allocation - - -automaticShutdownDelayMin=10 - image: gcr.io/agones-images/simple-game-server:0.5 + - -automaticShutdownDelaySec=600 + image: gcr.io/agones-images/simple-game-server:0.6 name: simple-game-server resources: limits: