Merge branch 'main' into add-gamenetcode-resource-to-agones-documenta…

…tion
googleforgames · Jul 16, 2024 · 0362002 · 0362002
2 parents bb84ab1 + a4576c6
commit 0362002
Show file tree

Hide file tree

Showing 59 changed files with 121 additions and 82 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.33
+GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
 
 # 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/build/build-image/Dockerfile b/build/build-image/Dockerfile
@@ -28,7 +28,7 @@ RUN gem install fpm && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GOPATH /go
 ENV GO111MODULE=on
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \

diff --git a/build/build-sdk-images/go/Dockerfile b/build/build-sdk-images/go/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get --allow-releaseinfo-change update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GO111MODULE=on
 ENV GOPATH /go
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \

diff --git a/build/build-sdk-images/restapi/Dockerfile b/build/build-sdk-images/restapi/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get --allow-releaseinfo-change update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GO111MODULE=on
 ENV GOPATH /go
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \

diff --git a/build/e2e-image/Dockerfile b/build/e2e-image/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
 
 # install go
 WORKDIR /usr/local
-ENV GO_VERSION=1.21.6
+ENV GO_VERSION=1.21.12
 ENV GOPATH /go
 ENV GO111MODULE=on
 RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \

diff --git a/build/report/cloudbuild.yaml b/build/report/cloudbuild.yaml
@@ -19,7 +19,7 @@ steps:
     id: build-report
     script: |
       #!/usr/bin/env bash
-      export GO_VERSION=1.21.6
+      export GO_VERSION=1.21.12
       cd /usr/local
       curl -SsL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -xzf-
       export PATH=/usr/local/go/bin:${PATH}

diff --git a/examples/allocation-endpoint/Makefile b/examples/allocation-endpoint/Makefile
@@ -30,7 +30,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path = $(realpath $(project_path)/../..)
-version := 0.8
+version := 0.9
 ifeq ($(REPOSITORY),)
 	server_tag := allocation-endpoint-proxy:$(version)
 else

diff --git a/examples/allocation-endpoint/server/Dockerfile b/examples/allocation-endpoint/server/Dockerfile
@@ -14,7 +14,7 @@
 
 # syntax=docker/dockerfile:1
 
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 
 WORKDIR /app
 

diff --git 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.8"
+  default     = "us-docker.pkg.dev/agones-images/examples/allocation-endpoint-proxy:0.9"
 }
 
 variable "region" {

diff --git a/examples/autoscaler-webhook/Dockerfile b/examples/autoscaler-webhook/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 

diff --git a/examples/autoscaler-webhook/Makefile b/examples/autoscaler-webhook/Makefile
@@ -29,7 +29,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path := $(realpath $(project_path)/../..)
-version := 0.13
+version := 0.14
 ifeq ($(REPOSITORY),)
 	autoscaler_webhook_tag := autoscaler-webhook:$(version)
 else

diff --git 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.13
+          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.14
           imagePullPolicy: Always
           volumeMounts:
             - mountPath: /home/service/certs

diff --git 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.13
+          image: us-docker.pkg.dev/agones-images/examples/autoscaler-webhook:0.14
           imagePullPolicy: Always
           ports:
             - name: autoscaler

diff --git a/examples/crd-client/Dockerfile b/examples/crd-client/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src/crd-client
 COPY . .
 

diff --git a/examples/crd-client/Makefile b/examples/crd-client/Makefile
@@ -25,7 +25,7 @@
 
 REPOSITORY ?=
 PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
-version := 0.16
+version := 0.17
 ifeq ($(REPOSITORY),)
 	server_tag := crd-client:$(version)
 else

diff --git a/examples/crd-client/create-gs.yaml b/examples/crd-client/create-gs.yaml
@@ -34,9 +34,9 @@ spec:
               cpu: 500m
               ephemeral-storage: 1Gi
               memory: 2Gi
-          image: us-docker.pkg.dev/agones-images/examples/crd-client:0.16
+          image: us-docker.pkg.dev/agones-images/examples/crd-client:0.17
           imagePullPolicy: Always
           env:
             - name: GAMESERVER_IMAGE
-              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.33
+              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
       restartPolicy: Never
diff --git a/examples/custom-controller/Dockerfile b/examples/custom-controller/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Gather dependencies and build the executable
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src/custom-controller
 COPY . .
 

diff --git a/examples/custom-controller/Makefile b/examples/custom-controller/Makefile
@@ -25,7 +25,7 @@
 
 REPOSITORY ?=
 PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
-version := 0.4
+version := 0.5
 ifeq ($(REPOSITORY),)
 	server_tag := custom-controller:$(version)
 else

diff --git a/examples/custom-controller/deployment.yaml b/examples/custom-controller/deployment.yaml
@@ -64,5 +64,5 @@ spec:
       serviceAccountName: custom-controller-sa
       containers:
         - name: custom-controller
-          image: us-docker.pkg.dev/agones-images/examples/custom-controller:0.4
+          image: us-docker.pkg.dev/agones-images/examples/custom-controller:0.5
           imagePullPolicy: Always
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.33
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
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.33
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.34
           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 b/examples/simple-game-server/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 

diff --git a/examples/simple-game-server/Dockerfile.windows b/examples/simple-game-server/Dockerfile.windows
@@ -19,9 +19,8 @@
 
 # Build Stage
 ARG WINDOWS_VERSION=ltsc2019
-ARG IMAGE_TAG=""
 
-FROM --platform=linux/amd64 golang:1.21.6 as builder
+FROM --platform=linux/amd64 golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 
@@ -30,7 +29,7 @@ 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 *.go
 
 RUN ls -ltr /go/src/agones.dev/agones/examples/simple-game-server
-FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}${IMAGE_TAG}
+FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION}
 
 WORKDIR /
 

diff --git a/examples/simple-game-server/Makefile b/examples/simple-game-server/Makefile
@@ -31,9 +31,6 @@ BUILDX_WINDOWS_BUILDER = windows-builder
 # GKE-Windows version map: https://cloud.google.com/kubernetes-engine/docs/how-to/creating-a-cluster-windows#version_mapping
 WINDOWS_VERSIONS = ltsc2019 ltsc2022
 
-# https://github.com/microsoft/Windows-Containers/issues/493: Pin the LTSC2019 image to an older sha
-LTSC2019_IMAGE_TAG = "@sha256:6fdf140282a2f809dae9b13fe441635867f0a27c33a438771673b8da8f3348a4"
-
 WINDOWS_DOCKER_PUSH_ARGS = # When pushing set to --push.
 # Build with Windows support
 WITH_WINDOWS ?= 1
@@ -42,7 +39,7 @@ WITH_ARM64 ?= 1
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.33
+version := 0.34
 ifeq ($(REPOSITORY),)
 	server_tag := simple-game-server:$(version)
 else
@@ -112,7 +109,7 @@ push-windows-image-%:
 build-windows-image-%: ensure-windows-buildx
 	cd $(root_path) && DOCKER_CLI_EXPERIMENTAL=enabled \
 		docker buildx build --platform windows/amd64 --builder $(BUILDX_WINDOWS_BUILDER) -f $(project_path)Dockerfile.windows \
-	 	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* --build-arg IMAGE_TAG=$(if $(filter ltsc2019,$*),$(LTSC2019_IMAGE_TAG),) . $(WINDOWS_DOCKER_PUSH_ARGS)
+	 	--tag=$(server_tag)-windows_amd64-$* --build-arg WINDOWS_VERSION=$* . $(WINDOWS_DOCKER_PUSH_ARGS)
 
 ensure-windows-buildx:
 # Windows image builds must be directed to a specific buildx context.

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

diff --git a/examples/simple-genai-server/Dockerfile b/examples/simple-genai-server/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # build
-FROM golang:1.21.6 as builder
+FROM golang:1.21.12 as builder
 WORKDIR /go/src
 COPY . agones.dev/agones
 

diff --git a/examples/simple-genai-server/Makefile b/examples/simple-genai-server/Makefile
@@ -22,19 +22,31 @@
 #    \ V / (_| | |  | | (_| | |_) | |  __\__ \
 #     \_/ \__,_|_|  |_|\__,_|_.__/|_|\___|___/
 #
-REPOSITORY ?= us-docker.pkg.dev/agones-images/examples
+REPOSITORY ?=
+PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-version := 0.2
-server_tag := $(REPOSITORY)/simple-genai-game-server:$(version)
+version := 0.3
+ifeq ($(REPOSITORY),)
+	server_tag := simple-genai-game-server:$(version)
+else
+	server_tag := $(REPOSITORY)/simple-genai-game-server:$(version)
+endif
 server_tag_linux_amd64 = $(server_tag)-linux-amd64
 push_server_manifest = $(server_tag_linux_amd64)
 root_path = $(realpath $(project_path)/../..)
 
+#   _____                    _
+#  |_   _|_ _ _ __ __ _  ___| |_ ___
+#    | |/ _` | '__/ _` |/ _ \ __/ __|
+#    | | (_| | | | (_| |  __/ |_\__ \
+#    |_|\__,_|_|  \__, |\___|\__|___/
+#                 |___/
+
 build: build-linux-image-amd64
 push: push-linux-image-amd64
-  # Docker >=24.0.6
+  	# Docker >=24.0.6
 	docker buildx imagetools create --tag $(server_tag) \
     	$(push_server_manifest)
 
@@ -47,10 +59,14 @@ push-linux-image-amd64: build
 
 # check if hosted on Google Artifact Registry
 gar-check:
-	gcloud container images describe $(server_tag)
+	gcloud container images describe $(PROD_REPO)/$(server_tag)
 
 print-vars:
 	$(info project_path is $(project_path))
 	$(info server_tag is $(server_tag))
 	$(info server_tag_linux_amd64 is $(server_tag_linux_amd64))
 	$(info push_server_manifest is $(push_server_manifest))
+
+# build and push the simple-genai-server image with specified tag
+cloud-build:
+	cd $(root_path) && gcloud builds submit --config=./examples/simple-genai-server/cloudbuild.yaml