[Breaking Change] Move GameServerAllocation to an API Extension Server.

Gopkg.toml

@@ -100,6 +100,14 @@
   name = "contrib.go.opencensus.io/exporter/stackdriver"
   version = "v0.8.0"
 
+[[constraint]]
+  name = "github.com/go-openapi/spec"
+  version = "0.18.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/munnerz/goautoneg"
+
 [[constraint]]
   name = "fortio.org/fortio"
   version = "1.3.1"

build/build-image/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# ForceUpdate 6 -- change here if you need to force a rebuild
+# ForceUpdate 7 -- change here if you need to force a rebuild
 
 # compiling proto + grpc takes an exceptionally long time
 # so we'll use a base from `base` - which is manually built using the below tag.

build/build-image/gen-crd-client.sh

@@ -14,9 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -x
+
+rm -r $GOPATH/src/agones.dev/agones/pkg/client
 rsync -r /go/src/agones.dev/agones/vendor/k8s.io/ /go/src/k8s.io/
 cd /go/src/k8s.io/code-generator
 ./generate-groups.sh "all" \
     agones.dev/agones/pkg/client \
-    agones.dev/agones/pkg/apis stable:v1alpha1 \
+    agones.dev/agones/pkg/apis "allocation:v1alpha1 stable:v1alpha1" \
     --go-header-file=/go/src/agones.dev/agones/build/boilerplate.go.txt

cmd/controller/main.go

@@ -34,6 +34,8 @@ import (
 	"agones.dev/agones/pkg/gameservers"
 	"agones.dev/agones/pkg/gameserversets"
 	"agones.dev/agones/pkg/metrics"
+	"agones.dev/agones/pkg/util/apiserver"
+	"agones.dev/agones/pkg/util/https"
 	"agones.dev/agones/pkg/util/runtime"
 	"agones.dev/agones/pkg/util/signals"
 	"agones.dev/agones/pkg/util/webhooks"
@@ -133,7 +135,11 @@ func main() {
 		logger.WithError(err).Fatal("Could not create the agones api clientset")
 	}
 
-	wh := webhooks.NewWebHook(ctlConf.CertFile, ctlConf.KeyFile)
+	// https server and the items that share the Mux for routing
+	httpsServer := https.NewServer(ctlConf.CertFile, ctlConf.KeyFile)
+	wh := webhooks.NewWebHook(httpsServer.Mux)
+	api := apiserver.NewAPIServer(httpsServer.Mux)
+
 	agonesInformerFactory := externalversions.NewSharedInformerFactory(agonesClient, defaultResync)
 	kubeInformerFactory := informers.NewSharedInformerFactory(kubeClient, defaultResync)
 
@@ -187,13 +193,13 @@ func main() {
 	fleetController := fleets.NewController(wh, health, kubeClient, extClient, agonesClient, agonesInformerFactory)
 	faController := fleetallocation.NewController(wh, allocationMutex,
 		kubeClient, extClient, agonesClient, agonesInformerFactory)
-	gasController := gameserverallocations.NewController(wh, health, allocationMutex, kubeClient,
-		kubeInformerFactory, extClient, agonesClient, agonesInformerFactory)
+	gasController := gameserverallocations.NewController(api, allocationMutex, kubeClient,
+		kubeInformerFactory, agonesClient, agonesInformerFactory)
 	fasController := fleetautoscalers.NewController(wh, health,
 		kubeClient, extClient, agonesClient, agonesInformerFactory)
 
 	rs = append(rs,
-		wh, gsController, gsSetController, fleetController, faController, fasController, gasController, server)
+		httpsServer, gsController, gsSetController, fleetController, faController, fasController, gasController, server)
 
 	stop := signals.NewStopChannel()
 

examples/gameserverallocation.yaml

@@ -20,7 +20,7 @@
 # multiple Fleets, or a self managed group of GameServers.
 #
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "allocation.agones.dev/v1alpha1"
 kind: GameServerAllocation
 metadata:
   # We recommend using the following to generate a unique name when creating Allocations

examples/simple-udp/gameserverallocation.yaml

@@ -12,14 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+#
+# A GameServerAllocation against a Fleet named 'simple-udp'
 # (GameServerAllocation is currently experimental, and likely to change in upcoming releases)
+#
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "allocation.agones.dev/v1alpha1"
 kind: GameServerAllocation
-metadata:
-  # We recommend using the following to generate a unique name when creating Allocations
-  # This will need to be created with `kubectl create` if using the command line tooling
-  generateName: simple-udp-
 spec:
   # GameServer selector from which to choose GameServers from.
   # GameServers still have the hard requirement to be `Ready` to be allocated from

examples/xonotic/gameserverallocation.yaml

@@ -14,7 +14,7 @@
 
 # (GameServerAllocation is currently experimental, and likely to change in upcoming releases)
 
-apiVersion: "stable.agones.dev/v1alpha1"
+apiVersion: "allocation.agones.dev/v1alpha1"
 kind: GameServerAllocation
 metadata:
   # We recommend using the following to generate a unique name when creating Allocations

install/helm/agones/scripts/delete_agones_resources.sh

@@ -32,7 +32,6 @@ for ns in $namespaces; do
   kubectl -n $ns delete gameserversets --all
   kubectl -n $ns delete gameservers --all
   kubectl -n $ns delete fleetallocations --all
-  kubectl -n $ns delete gameserverallocations --all
 
   # Since we don't have the nifty kubectl wait yet, hack one in the meantime
   for p in $pods; do