updated the version and added the sugested change

googleforgames · May 21, 2024 · 253638e · 253638e
1 parent c98228d
commit 253638e
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 22 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -64,7 +64,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.32
+GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
 
 # Enable all beta feature gates. Keep in sync with `true` (beta) entries in pkg/util/runtime/features.go:featureDefaults
 BETA_FEATURE_GATES ?= "CountsAndLists=true&DisableResyncOnSDKServer=true"

diff --git a/examples/crd-client/create-gs.yaml b/examples/crd-client/create-gs.yaml
@@ -38,5 +38,5 @@ spec:
           imagePullPolicy: Always
           env:
             - name: GAMESERVER_IMAGE
-              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
       restartPolicy: Never
diff --git a/examples/fleet.yaml b/examples/fleet.yaml
@@ -112,4 +112,4 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
diff --git a/examples/gameserver.yaml b/examples/gameserver.yaml
@@ -124,7 +124,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
           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/Makefile b/examples/simple-game-server/Makefile
@@ -38,7 +38,7 @@ WITH_ARM64 ?= 1
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.32
+version := 0.33
 ifeq ($(REPOSITORY),)
 	server_tag := simple-game-server:$(version)
 else

diff --git 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.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
diff --git 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.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               resources:
                 requests:
                   memory: 64Mi

diff --git 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.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               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
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               resources:
                 requests:
                   memory: 64Mi

diff --git 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.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
           env:
             - name: PASSTHROUGH
               value: 'TRUE'

diff --git 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.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
           resources:
             requests:
               memory: 64Mi

diff --git 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.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
           resources:
             requests:
               memory: 64Mi

diff --git a/examples/simple-game-server/handlers.go b/examples/simple-game-server/handlers.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC All Rights Reserved.
+// Copyright 2024 Google LLC All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -69,8 +69,11 @@ func handleResponse(txt string, s *sdk.SDK, cancel context.CancelFunc) (response
 	responseError = nil
 
 	handler, exists := responseMap[parts[0]]
+	if exists && parts[0] == "EXIT" {
+		return response, addACK, responseError
+	}
 	if !exists {
-		return fmt.Sprintf("Unknown response command: %s", parts[0]), true, nil
+		return response, addACK, responseError
 	}
 	if parts[0] == "UNHEALTHY" {
 		return handler(s, parts, cancel)

diff --git 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: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32"
+      value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33"
     - 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
@@ -164,7 +164,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
 							"template": {
 								"spec": {
 									"containers": [{
-										"image": "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32",
+										"image": "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33",
 										"name": false
 									}]
 								}

diff --git a/site/config.toml b/site/config.toml
@@ -100,7 +100,7 @@ dev_eks_example_cluster_version = "1.29"
 dev_minikube_example_cluster_version = "1.28.6"
 
 # example tag
-example_image_tag = "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32"
+example_image_tag = "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33"
 
 # 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
@@ -150,7 +150,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.32")
+	viper.SetDefault(gsimageFlag, "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33")
 	viper.SetDefault(pullSecretFlag, "")
 	viper.SetDefault(stressTestLevelFlag, 0)
 	viper.SetDefault(perfOutputDirFlag, "")

diff --git a/test/e2e/gameserver_test.go b/test/e2e/gameserver_test.go
@@ -1133,7 +1133,7 @@ spec:
           preferredDuringSchedulingIgnoredDuringExecution: ERROR
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
 `
 	err := os.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0o644)
 	require.NoError(t, err)

diff --git a/test/load/allocation/fleet.yaml b/test/load/allocation/fleet.yaml
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
             - args: [-automaticShutdownDelaySec=600]
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               name: simple-game-server
               resources:
                 limits:

diff --git a/test/load/allocation/performance-test-fleet-template.yaml b/test/load/allocation/performance-test-fleet-template.yaml
@@ -33,7 +33,7 @@ spec:
         spec:
           containers:
             - args: [-automaticShutdownDelaySec=AUTOMATIC_SHUTDOWN_DELAY_SEC_REPLACEMENT]
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               name: simple-game-server
               resources:
                 limits:

diff --git a/test/load/allocation/scenario-fleet.yaml b/test/load/allocation/scenario-fleet.yaml
@@ -38,7 +38,7 @@ spec:
               value: 'true'
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
               args: [-automaticShutdownDelaySec=60, -readyIterations=10]
               resources:
                 limits: