Merge branch 'main' into scheduled-autoscalers

googleforgames · Jun 26, 2024 · 8a8098e · 8a8098e
2 parents 17038c8 + 0f7c943
commit 8a8098e
Show file tree

Hide file tree

Showing 30 changed files with 824 additions and 591 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
@@ -109,4 +109,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
@@ -121,7 +121,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/Dockerfile.windows b/examples/simple-game-server/Dockerfile.windows
@@ -27,7 +27,7 @@ COPY . agones.dev/agones
 
 WORKDIR /go/src/agones.dev/agones/examples/simple-game-server
 
-RUN GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o simple-game-server.exe main.go
+RUN GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -o simple-game-server.exe *.go
 
 RUN ls -ltr /go/src/agones.dev/agones/examples/simple-game-server
 FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}${IMAGE_TAG}

diff --git a/examples/simple-game-server/Makefile b/examples/simple-game-server/Makefile
@@ -42,7 +42,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-none.yaml b/examples/simple-game-server/gameserver-none.yaml
@@ -29,7 +29,7 @@ spec:
  spec:
  containers:
  - name: simple-game-server
- image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.28
+ 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