Merge branch 'master' into move_terraform_modules_to_install_folder

build/README.md

@@ -33,7 +33,7 @@ Table of Contents
         * [make build](#make-build)
         * [make build-images](#make-build-images)
         * [make build-sdks](#make-build-sdks)
-        * [make build-sdk-cpp](#make-build-sdk-cpp)
+        * [make build-sdk](#make-build-sdk)
         * [make run-sdk-conformance-tests](#make-run-sdk-conformance-tests)
         * [make clean-sdk-conformance-tests](#make-clean-sdk-conformance-tests)
         * [make test](#make-test)
@@ -49,7 +49,7 @@ Table of Contents
         * [make pprof-web](#make-pprof-web)
         * [make shell](#make-shell)
         * [make godoc](#make-godoc)
-        * [make build-agones-controller-image](#make-build-agones-controller-image)
+        * [make build-controller-image](#make-build-controller-image)
         * [make build-agones-sdk-image](#make-build-agones-sdk-image)
         * [make gen-install](#make-gen-install)
         * [make gen-crd-client](#make-gen-crd-client)
@@ -87,8 +87,8 @@ Table of Contents
         * [make kind-shell](#make-kind-shell)
         * [make kind-controller-portforward](#make-kind-controller-portforward)
      * [Custom Environment](#custom-environment)
-        * [make setup-custom-test-cluster](#make-setup-custom-test-cluster)
-        * [make clean-custom-test-cluster](#make-clean-custom-test-cluster)
+        * [make setup-test-cluster](#make-setup-test-cluster)
+        * [make clean-test-cluster](#make-clean-test-cluster)
   * [Dependencies](#dependencies)
   * [Troubleshooting](#troubleshooting)
       * [$GOPATH/$GOROOT error when building in WSL](#gopathgoroot-error-when-building-in-wsl)
@@ -291,7 +291,7 @@ For example:
 $ make minikube-transfer-image TAG=myimage:0.1
 ```
 
-Running end-to-end tests on minikube is done via the `make minikube-test-e2e` target. This target use the same `make test-e2e` but also setup some prerequisites for use with a minikube cluster.
+Running end-to-end tests on Minikube is done via the `make minikube-test-e2e` target. This target use the same `make test-e2e` but also setup some prerequisites for use with a Minikube cluster.
 
 ### Running a Test Kind cluster
  This will setup a [Kubernetes IN Docker](https://github.com/kubernetes-sigs/kind) cluster named agones by default.
@@ -349,7 +349,7 @@ To begin, you need to set up the following environment variables:
    if set, `make install` will install this secret in both the `agones-system` (for pulling the controller image)
    and `default` (for pulling the sdk image) repositories
 
-The second step is to prepare your cluster for the Agones deployments. Run `make setup-custom-test-cluster` to install helm in it.
+The second step is to prepare your cluster for the Agones deployments. Run `make setup-test-cluster` to install helm in it.
 
 Now you're ready to begin the development/test cycle:
 - `make build` will build Agones
@@ -414,8 +414,9 @@ Build all the images required for Agones
 #### `make build-sdks`
 Build all the sdks required for Agones
 
-#### `make build-sdk-cpp`
-Build the cpp sdk static and dynamic libraries (linux libraries only)
+#### `make build-sdk`
+Next command `make build-sdk SDK_FOLDER=[SDK_TYPE]` will build SDK of `SDK_TYPE`. 
+For instance, in order to build the cpp sdk static and dynamic libraries (linux libraries only) use `SDK_FOLDER=cpp`
 
 #### `make run-sdk-conformance-local`
 Run Agones sidecar which would wait for all requests from the SDK client.
@@ -473,7 +474,7 @@ These tests validate Agones flow from start to finish.
 
 It uses the KUBECONFIG to target a Kubernetes cluster.
 
-See [`make minikube-test-e2e`](#make-minikube-test-e2e) to run end-to-end tests on minikube.
+See [`make minikube-test-e2e`](#make-minikube-test-e2e) to run end-to-end tests on Minikube.
 
 #### `make setup-prometheus`
 
@@ -489,7 +490,7 @@ See [`make minikube-setup-prometheus`](#make-minikube-setup-prometheus) and [`ma
 
 Install Gafrana server using [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) chart into the current cluster and setup [Agones dashboards with Prometheus datasource](./grafana/).
 
-You can set your own password using the `PASSWORD` environement variable.
+You can set your own password using the `PASSWORD` environment variable.
 
 See [`make minikube-setup-grafana`](#make-minikube-setup-grafana) and [`make kind-setup-grafana`](#make-kind-setup-grafana) to run the installation on Minikube or Kind.
 
@@ -719,11 +720,11 @@ port forwarding to the controller deployment.
 
 ### Custom Environment
 
-#### `make setup-custom-test-cluster`
+#### `make setup-test-cluster`
 Initializes your custom cluster for working with Agones, by installing Helm/Tiller.
 
-#### `make clean-custom-test-cluster`
-Cleans up your custom cluster by reseting Helm.
+#### `make clean-test-cluster`
+Cleans up your custom cluster by resetting Helm.
 
 ## Dependencies
 

examples/fleet.yaml

@@ -25,7 +25,7 @@ kind: Fleet
 metadata:
   name: fleet-example
 spec:
-  # the number of GameServers to keep Ready or Allocated in this Fleet
+  # the number of GameServers to keep Ready or Allocated in this Fleet. Defaults to 1
   replicas: 2
   # defines how GameServers are organised across the cluster.
   # Options include:

examples/fleetautoscaler.yaml

@@ -29,14 +29,15 @@ spec:
   fleetName: fleet-example
   # The autoscaling policy
   policy:
-    # type of the policy. for now, only Buffer is available
+    # type of the policy. Buffer or Webhook types are available
     type: Buffer
     # parameters of the buffer policy
     buffer:
-      # Size of a buffer of "ready" game server instances
+      # Size of a buffer of "ready" and "reserved" game server instances.
       # The FleetAutoscaler will scale the fleet up and down trying to maintain this buffer, 
-      # as instances are being allocated or terminated
-      # it can be specified either in absolute (i.e. 5) or percentage format (i.e. 5%)
+      # as instances are being allocated or terminated.
+      # Note that "reserved" game servers could not be scaled down.
+      # It can be specified either in absolute (i.e. 5) or percentage format (i.e. 5%)
       bufferSize: 5
       # minimum fleet size to be set by this FleetAutoscaler. 
       # if not specified, the actual minimum fleet size will be bufferSize

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.1
 	github.com/aws/aws-sdk-go v1.16.20 // indirect
+	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/go-openapi/spec v0.19.0
 	github.com/gogo/protobuf v1.2.1 // indirect
@@ -29,6 +30,7 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.2
@@ -49,11 +51,12 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
 	gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api v0.0.0-20190708094356-59223ed9f6ce // kubernetes-1.12.10
-	k8s.io/apiextensions-apiserver v0.0.0-20190708094842-2e94e9ac9840 // kubernetes-1.12.10
-	k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc // kubernetes-1.12.10
-	k8s.io/client-go v9.0.0+incompatible // kubernetes-1.12.10
-	k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 // indirect; indirect kubernetes-1.12.10
+	k8s.io/api v0.0.0-20191004102255-dacd7df5a50b // kubernetes-1.13.12
+	k8s.io/apiextensions-apiserver v0.0.0-20191004105443-a7d558db75c6 // kubernetes-1.13.12
+	k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a // kubernetes-1.13.12
+	k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 // kubernetes-1.13.12
+	k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
 )
 
 replace k8s.io/apimachinery => ./vendor_fixes/k8s.io/apimachinery