Reorganisation of top level directories.

Better to be gameserver > controllers, and then gameservers > sidecar
than break out by functionality. More idiomatic go, and easier to
work with.

Author: markmandel

build/Makefile

@@ -41,7 +41,7 @@ common_mounts = -v $(build_path)/.config/gcloud:/root/.config/gcloud \
 				-v $(KUBECONFIG):/root/.kube \
 				-v $(agon_path):$(mount_path)
 
-gameserver_tag = $(REPOSITORY)/gameserver-controller:$(VERSION)
+gameserver_tag = $(REPOSITORY)/gameservers-controller:$(VERSION)
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
@@ -56,13 +56,13 @@ test: ensure-image
 
 # Build a static binary for the gameserver operator
 # CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main .
-build-controller-gameserver-binary: ensure-image
+build-gameservers-controller-binary: ensure-image
 	docker run --rm -e "CGO_ENABLED=0" $(common_mounts) --entrypoint=go $(TAG) build \
-		-o $(mount_path)/controllers/gameserver/bin/gameserver -a -installsuffix cgo $(agon_package)/controllers/gameserver
+		-o $(mount_path)/gameservers/controller/bin/controller -a -installsuffix cgo $(agon_package)/gameservers/controller
 
 # Build the image for the gameserver controller
-build-controller-gameserver-image: ensure-image build-controller-gameserver-binary
-	docker build $(agon_path)/controllers/gameserver --tag=$(gameserver_tag)
+build-gameservers-controller-image: ensure-image build-gameservers-controller-binary
+	docker build $(agon_path)/gameservers/controller/ --tag=$(gameserver_tag)
 
 # Generate the CRD client
 gen-client: ensure-image

controllers/gameserver/Dockerfile gameservers/controller/Dockerfilecontrollers/gameserver/Dockerfile renamed to gameservers/controller/Dockerfile

@@ -1,10 +1,10 @@
 FROM alpine:3.6
 
-COPY ./bin/gameserver /home/agon/gameserver
+COPY ./bin/controller /home/agon/controller
 RUN apk --update add ca-certificates && \
                 adduser -D agon && \
                 chown -R agon /home/agon && \
-                chmod o+x /home/agon/gameserver
+                chmod o+x /home/agon/controller
 
 USER agon
-ENTRYPOINT /home/agon/gameserver
+ENTRYPOINT /home/agon/controller

controllers/gameserver/controller.go gameservers/controller/controller.gocontrollers/gameserver/controller.go renamed to gameservers/controller/controller.go

@@ -15,7 +15,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: gameserver-controller
+  name: gameservers-controller
 spec:
   replicas: 1
   strategy:
@@ -26,6 +26,6 @@ spec:
         stable.agon.io/role: controller
     spec:
       containers:
-      - name: gameserver-controller
-        image: gcr.io/agon-images/gameserver-controller:0.1
+      - name: gameservers-controller
+        image: gcr.io/agon-images/gameservers-controller:0.1
         imagePullPolicy: Always

controllers/gameserver/controller_test.go gameservers/controller/controller_test.gocontrollers/gameserver/controller_test.go renamed to gameservers/controller/controller_test.go

@@ -0,0 +1,19 @@
+// Copyright 2017 Google Inc. 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// placeholder for where the sidecar will be developed
+package main
+
+func main() {
+}