Merge branch 'cl-beta-docs' of https://github.com/Kalaiselvi84/agones …

…into cl-beta-docs

build/Makefile

@@ -61,7 +61,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.31
+GS_TEST_IMAGE ?= us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
 
 # 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"

build/build-sdk-images/csharp/gen.sh

@@ -49,4 +49,15 @@ sed -i -z 's/produces: "application\/json";\n};//' ${csharp_proto_file_output_di
 sed -i -e 's/bool bool = 1.*/bool bool = 1;/' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
 sed -i -e 's/^ *$//' ${csharp_proto_file_output_dir}/sdk/alpha/alpha.proto
 
+sed -i -e 's/import "protoc-gen-openapiv2\/options\/annotations.proto";//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/info: {//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/title: "beta.proto";//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -z 's/version: "version not set";\n  };//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/schemes: HTTP;//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/consumes: "application\/json";//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -z 's/produces: "application\/json";\n};//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/bool bool = 1.*/bool bool = 1;/' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+sed -i -e 's/^ *$//' ${csharp_proto_file_output_dir}/sdk/beta/beta.proto
+
 echo "csharp code is generated at build time"

build/build-sdk-images/restapi/gen.sh

@@ -20,9 +20,11 @@ header() {
 
 wget -q https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.51/swagger-codegen-cli-3.0.51.jar -O /tmp/swagger-codegen-cli.jar
 
-rm -rf /go/src/agones.dev/agones/test/sdk/restapi/swagger /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/swagger /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger
 java -jar /tmp/swagger-codegen-cli.jar generate -i /go/src/agones.dev/agones/sdks/swagger/sdk.swagger.json  -l go -o /go/src/agones.dev/agones/test/sdk/restapi/swagger
 java -jar /tmp/swagger-codegen-cli.jar generate -i /go/src/agones.dev/agones/sdks/swagger/alpha.swagger.json  -l go -o /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger
+java -jar /tmp/swagger-codegen-cli.jar generate -i /go/src/agones.dev/agones/sdks/swagger/beta.swagger.json  -l go -o /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger
+
 
 # remove un-used files
 rm -rf /go/src/agones.dev/agones/test/sdk/restapi/swagger/.*
@@ -35,6 +37,12 @@ rm -rf /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger/*.md
 rm -rf /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger/*.sh
 rm -rf /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger/docs
 rm -rf /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger/api
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/.*
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/*.md
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/*.sh
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/docs
+rm -rf /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/api
+
 
 for file in `ls /go/src/agones.dev/agones/test/sdk/restapi/swagger`
 do
@@ -45,3 +53,8 @@ for alpha in `ls /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger`
 do
   header /go/src/agones.dev/agones/test/sdk/restapi/alpha/swagger/${alpha}
 done
+
+for beta in `ls /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger`
+do
+  header /go/src/agones.dev/agones/test/sdk/restapi/beta/swagger/${beta}
+done

cmd/sdk-server/main.go

@@ -25,7 +25,6 @@ import (
 	"strings"
 	"time"
 
-	agonesv1 "agones.dev/agones/pkg/apis/agones/v1"
 	gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -38,6 +37,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"agones.dev/agones/pkg"
+	agonesv1 "agones.dev/agones/pkg/apis/agones/v1"
 	"agones.dev/agones/pkg/client/clientset/versioned"
 	"agones.dev/agones/pkg/sdk"
 	sdkalpha "agones.dev/agones/pkg/sdk/alpha"
@@ -202,6 +202,7 @@ func registerLocal(grpcServer *grpc.Server, ctlConf config) (func(), error) {
 	sdk.RegisterSDKServer(grpcServer, s)
 	sdkalpha.RegisterSDKServer(grpcServer, s)
 	sdkbeta.RegisterSDKServer(grpcServer, s)
+
 	return func() {
 		s.Close()
 	}, err
@@ -252,10 +253,15 @@ func runGateway(ctx context.Context, grpcEndpoint string, mux *gwruntime.ServeMu
 	if err := sdk.RegisterSDKHandler(ctx, mux, conn); err != nil {
 		logger.WithError(err).Fatal("Could not register sdk grpc-gateway")
 	}
+
 	if err := sdkalpha.RegisterSDKHandler(ctx, mux, conn); err != nil {
 		logger.WithError(err).Fatal("Could not register alpha sdk grpc-gateway")
 	}
 
+	if err := sdkbeta.RegisterSDKHandler(ctx, mux, conn); err != nil {
+		logger.WithError(err).Fatal("Could not register beta sdk grpc-gateway")
+	}
+
 	logger.WithField("httpEndpoint", httpServer.Addr).Info("Starting SDKServer grpc-gateway...")
 	if err := httpServer.ListenAndServe(); err != nil {
 		if err == http.ErrServerClosed {

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.31
+              value: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
       restartPolicy: Never

examples/fleet.yaml

@@ -114,4 +114,4 @@ spec:
         spec:
           containers:
             - name: simple-game-server
-              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.31
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32

examples/gameserver.yaml

@@ -116,7 +116,7 @@ spec:
     spec:
       containers:
         - name: simple-game-server
-          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.31
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
           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

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.31
+version := 0.32
 ifeq ($(REPOSITORY),)
 	server_tag := simple-game-server:$(version)
 else

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.31
+          image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32

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

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.31
+              image: us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32
               env:
                 # Disables the UDP listener (Enabled by default)
                 - name: UDP

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

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

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

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

examples/simple-game-server/main.go

@@ -690,7 +690,7 @@ func getPlayerCount(s *sdk.SDK) string {
 // getCounterCount returns the Count of the given Counter as a string
 func getCounterCount(s *sdk.SDK, counterName string) (string, error) {
 	log.Printf("Retrieving Counter %s Count", counterName)
-	count, err := s.Alpha().GetCounterCount(counterName)
+	count, err := s.Beta().GetCounterCount(counterName)
 	if err != nil {
 		log.Printf("Error getting Counter %s Count: %s", counterName, err)
 		return strconv.FormatInt(count, 10), err
@@ -705,7 +705,7 @@ func incrementCounter(s *sdk.SDK, counterName string, amount string) (string, er
 		return "", fmt.Errorf("Could not increment Counter %s by unparseable amount %s: %s", counterName, amount, err)
 	}
 	log.Printf("Incrementing Counter %s Count by amount %d", counterName, amountInt)
-	err = s.Alpha().IncrementCounter(counterName, amountInt)
+	err = s.Beta().IncrementCounter(counterName, amountInt)
 	if err != nil {
 		log.Printf("Error incrementing Counter %s Count by amount %d: %s", counterName, amountInt, err)
 		return "", err
@@ -720,7 +720,7 @@ func decrementCounter(s *sdk.SDK, counterName string, amount string) (string, er
 		return "", fmt.Errorf("could not decrement Counter %s by unparseable amount %s: %s", counterName, amount, err)
 	}
 	log.Printf("Decrementing Counter %s Count by amount %d", counterName, amountInt)
-	err = s.Alpha().DecrementCounter(counterName, amountInt)
+	err = s.Beta().DecrementCounter(counterName, amountInt)
 	if err != nil {
 		log.Printf("Error decrementing Counter %s Count by amount %d: %s", counterName, amountInt, err)
 		return "", err
@@ -735,7 +735,7 @@ func setCounterCount(s *sdk.SDK, counterName string, amount string) (string, err
 		return "", fmt.Errorf("could not set Counter %s to unparseable amount %s: %s", counterName, amount, err)
 	}
 	log.Printf("Setting Counter %s Count to amount %d", counterName, amountInt)
-	err = s.Alpha().SetCounterCount(counterName, amountInt)
+	err = s.Beta().SetCounterCount(counterName, amountInt)
 	if err != nil {
 		log.Printf("Error setting Counter %s Count by amount %d: %s", counterName, amountInt, err)
 		return "", err
@@ -746,7 +746,7 @@ func setCounterCount(s *sdk.SDK, counterName string, amount string) (string, err
 // getCounterCapacity returns the Capacity of the given Counter as a string
 func getCounterCapacity(s *sdk.SDK, counterName string) (string, error) {
 	log.Printf("Retrieving Counter %s Capacity", counterName)
-	count, err := s.Alpha().GetCounterCapacity(counterName)
+	count, err := s.Beta().GetCounterCapacity(counterName)
 	if err != nil {
 		log.Printf("Error getting Counter %s Capacity: %s", counterName, err)
 		return strconv.FormatInt(count, 10), err
@@ -761,7 +761,7 @@ func setCounterCapacity(s *sdk.SDK, counterName string, amount string) (string,
 		return "", fmt.Errorf("could not set Counter %s to unparseable amount %s: %s", counterName, amount, err)
 	}
 	log.Printf("Setting Counter %s Capacity to amount %d", counterName, amountInt)
-	err = s.Alpha().SetCounterCapacity(counterName, amountInt)
+	err = s.Beta().SetCounterCapacity(counterName, amountInt)
 	if err != nil {
 		log.Printf("Error setting Counter %s Capacity to amount %d: %s", counterName, amountInt, err)
 		return "", err
@@ -772,7 +772,7 @@ func setCounterCapacity(s *sdk.SDK, counterName string, amount string) (string,
 // getListCapacity returns the Capacity of the given List as a string
 func getListCapacity(s *sdk.SDK, listName string) (string, error) {
 	log.Printf("Retrieving List %s Capacity", listName)
-	capacity, err := s.Alpha().GetListCapacity(listName)
+	capacity, err := s.Beta().GetListCapacity(listName)
 	if err != nil {
 		log.Printf("Error getting List %s Capacity: %s", listName, err)
 		return strconv.FormatInt(capacity, 10), err
@@ -787,7 +787,7 @@ func setListCapacity(s *sdk.SDK, listName string, amount string) (string, error)
 		return "", fmt.Errorf("could not set List %s to unparseable amount %s: %s", listName, amount, err)
 	}
 	log.Printf("Setting List %s Capacity to amount %d", listName, amountInt)
-	err = s.Alpha().SetListCapacity(listName, amountInt)
+	err = s.Beta().SetListCapacity(listName, amountInt)
 	if err != nil {
 		log.Printf("Error setting List %s Capacity to amount %d: %s", listName, amountInt, err)
 		return "", err
@@ -798,7 +798,7 @@ func setListCapacity(s *sdk.SDK, listName string, amount string) (string, error)
 // listContains returns true if the given value is in the given List, false otherwise
 func listContains(s *sdk.SDK, listName string, value string) (string, error) {
 	log.Printf("Getting List %s contains value %s", listName, value)
-	ok, err := s.Alpha().ListContains(listName, value)
+	ok, err := s.Beta().ListContains(listName, value)
 	if err != nil {
 		log.Printf("Error getting List %s contains value %s: %s", listName, value, err)
 		return strconv.FormatBool(ok), err
@@ -809,7 +809,7 @@ func listContains(s *sdk.SDK, listName string, value string) (string, error) {
 // getListLength returns the length (number of values) of the given List as a string
 func getListLength(s *sdk.SDK, listName string) (string, error) {
 	log.Printf("Getting List %s length", listName)
-	length, err := s.Alpha().GetListLength(listName)
+	length, err := s.Beta().GetListLength(listName)
 	if err != nil {
 		log.Printf("Error getting List %s length: %s", listName, err)
 		return strconv.Itoa(length), err
@@ -820,7 +820,7 @@ func getListLength(s *sdk.SDK, listName string) (string, error) {
 // getListValues return the values in the given List as a comma delineated string
 func getListValues(s *sdk.SDK, listName string) (string, error) {
 	log.Printf("Getting List %s values", listName)
-	values, err := s.Alpha().GetListValues(listName)
+	values, err := s.Beta().GetListValues(listName)
 	if err != nil {
 		log.Printf("Error getting List %s values: %s", listName, err)
 		return "INVALID LIST NAME", err
@@ -834,7 +834,7 @@ func getListValues(s *sdk.SDK, listName string) (string, error) {
 // appendListValue returns if the given value was successfuly added to the List or not
 func appendListValue(s *sdk.SDK, listName string, value string) (string, error) {
 	log.Printf("Appending Value %s to List %s", value, listName)
-	err := s.Alpha().AppendListValue(listName, value)
+	err := s.Beta().AppendListValue(listName, value)
 	if err != nil {
 		log.Printf("Error appending Value %s to List %s: %s", value, listName, err)
 		return "", err
@@ -845,7 +845,7 @@ func appendListValue(s *sdk.SDK, listName string, value string) (string, error)
 // deleteListValue returns if the given value was successfuly deleted from the List or not
 func deleteListValue(s *sdk.SDK, listName string, value string) (string, error) {
 	log.Printf("Deleting Value %s from List %s", value, listName)
-	err := s.Alpha().DeleteListValue(listName, value)
+	err := s.Beta().DeleteListValue(listName, value)
 	if err != nil {
 		log.Printf("Error deleting Value %s to List %s: %s", value, listName, err)
 		return "", err

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.31"
+      value: "us-docker.pkg.dev/agones-images/examples/simple-game-server:0.32"
     - name: IS_HELM_TEST
       value: "true"
     - name: GAMESERVERS_NAMESPACE