Merge branch 'master' into maintainers

Author: stevemart

README.md

@@ -33,16 +33,8 @@ In addition, Proxy and WebApp complete the core microservices
 
 To deploy the game locally, follow the instructions via docker-compose in GameOn repository [here](https://github.com/gameontext/gameon#local-room-development).
 
-To follow the steps here, create a Kubernetes cluster with [IBM Bluemix Container Service](https://github.com/IBM/container-journey-template) to deploy in cloud. The code here is regularly tested against [Kubernetes Cluster from Bluemix Container Service](https://console.ng.bluemix.net/docs/containers/cs_ov.html#cs_ov) using Travis.
+To follow the steps here, create a Kubernetes cluster with either [Minikube](https://kubernetes.io/docs/getting-started-guides/minikube) for local testing, with [IBM Cloud Private](https://github.com/IBM/deploy-ibm-cloud-private/blob/master/README.md), or with [IBM Bluemix Container Service](https://github.com/IBM/container-journey-template/blob/master/README.md) to deploy in cloud. The code here is regularly tested against [Kubernetes Cluster from Bluemix Container Service](https://console.ng.bluemix.net/docs/containers/cs_ov.html#cs_ov) using Travis.
 
-## Deploy to Kubernetes Cluster on Bluemix
-If you want to deploy GameOn! directly to Bluemix, click on 'Deploy to Bluemix' button below to create a Bluemix DevOps service toolchain and pipeline for deploying the sample, else jump to [Steps](#steps)
-
-> You will need to create your Kubernetes cluster first and make sure it is fully deployed in your Bluemix account.
-
-[![Create Toolchain](https://github.com/IBM/container-journey-template/blob/master/images/button.png)](https://console.ng.bluemix.net/devops/setup/deploy/?repository=https://github.com/IBM/GameOn-Java-Microservices-on-Kubernetes)
-
-Please follow the [Toolchain instructions](https://github.com/IBM/container-journey-template/blob/master/Toolchain_Instructions_new.md) to complete your toolchain and pipeline.
 
 ## Steps
 1. [Modify the Core services yaml files](#1-modify-the-core-services-yaml-files)
@@ -271,6 +263,22 @@ To register the deployed rooms in the cluster, you will need to use the UI of yo
   * `kubectl delete pv local-volume-1`
   * `kubectl delete -f gameon-configmap.yaml`
 
+# Privacy Notice
+
+Sample Kubernetes Yaml file that includes this package may be configured to track deployments to [IBM Cloud](https://www.bluemix.net/) and other Kubernetes platforms. The following information is sent to a [Deployment Tracker](https://github.com/IBM/metrics-collector-service) service on each deployment:
+
+* Kubernetes Cluster Provider(`IBM Cloud,Minikube,etc`)
+* Kubernetes Machine ID
+* Kubernetes Cluster ID (Only from IBM Cloud's cluster)
+* Kubernetes Customer ID (Only from IBM Cloud's cluster)
+* Environment variables in this Kubernetes Job.
+
+This data is collected from the Kubernetes Job in the sample application's yaml file. This data is used by IBM to track metrics around deployments of sample applications to IBM Cloud to measure the usefulness of our examples so that we can continuously improve the content we offer to you. Only deployments of sample applications that include code to ping the Deployment Tracker service will be tracked.
+
+## Disabling Deployment Tracking
+
+Please comment out/remove the Metric Kubernetes Job portion at the end of the 'gameon-configmap.yaml' file.
+
 ## References
 
 * [GameOn](https://gameontext.org) - The original game on app. The journey is based on [deploying GameOn using Docker](https://book.gameontext.org/walkthroughs/local-docker.html)

containers/gameon-proxy/haproxy-dev.cfg

@@ -34,7 +34,7 @@ frontend logstash-lumberjack
   default_backend logstash-lumberjack
 
 frontend frontend-ssl
-  bind *:443 ssl crt /keystore/proxy.pem
+  bind *:443 ssl crt /etc/ssl/proxy.pem
   mode http
   option httplog
 
@@ -94,7 +94,7 @@ backend room
   option httplog
   option httpchk HEAD / HTTP/1.1\r\nHost:localhost
   balance roundrobin
-  server room1 PLACEHOLDER_DOCKERHOST:30980 check
+  server room1 room:9080 check
 
 backend roomjs
   mode http
@@ -107,33 +107,33 @@ backend map
   option httplog
   option httpchk GET /map/v1/health HTTP/1.1\r\nHost:localhost
   balance roundrobin
-  server map1 PLACEHOLDER_DOCKERHOST:30947 ssl check check-ssl verify none
+  server map1 map:9443 ssl check check-ssl verify none
 
 backend mediator
   mode http
   option httplog
   balance roundrobin
-  server mediator1 PLACEHOLDER_DOCKERHOST:30946 ssl check check-ssl verify none
+  server mediator1 mediator:9443 ssl check check-ssl verify none
 
 backend auth
   mode http
   option httplog
   option httpchk GET /auth/health HTTP/1.1\r\nHost:localhost
   balance roundrobin
-  server auth1 PLACEHOLDER_DOCKERHOST:30949 ssl check check-ssl verify none
+  server auth1 auth:9443 ssl check check-ssl verify none
 
 backend player
   mode http
   option httplog
   balance roundrobin
-  server player1 PLACEHOLDER_DOCKERHOST:30943 ssl check check-ssl verify none
+  server player1 player:9443 ssl check check-ssl verify none
 
 backend static-content
   mode http
   option httpchk HEAD / HTTP/1.1\r\nHost:localhost
   option httplog
   balance roundrobin
-  server webapp1 PLACEHOLDER_DOCKERHOST:30880 check inter 1m
+  server webapp1 webapp:8080 check inter 1m
 
 backend logstash-lumberjack
   mode tcp

containers/gameon-proxy/startup.sh

@@ -46,24 +46,23 @@ if [ "$ETCDCTL_ENDPOINT" != "" ]; then
   export A8_CONTROLLER_POLL=$(etcdctl get /amalgam8/controllerPoll)
   JWT=$(etcdctl get /amalgam8/jwt)
 
-  sudo service rsyslog start 
+  sudo service rsyslog start
 
   echo Starting haproxy...
-  if [ -z "$A8_REGISTRY_URL" ]; then 
+  if [ -z "$A8_REGISTRY_URL" ]; then
     #no a8, just run haproxy.
     haproxy -f $PROXY_CONFIG
   else
     #a8, configure security, and run via sidecar.
-    if [ ! -z "$JWT" ]; then     
+    if [ ! -z "$JWT" ]; then
       export A8_REGISTRY_TOKEN=$JWT
       export A8_CONTROLLER_TOKEN=$JWT
-    fi  
+    fi
     exec a8sidecar --proxy haproxy -f $PROXY_CONFIG
-  fi  
+  fi
   echo HAProxy shut down
 else
   echo HAProxy will log to STDOUT--this is dev environment.
   sed -i s/PLACEHOLDER_PASSWORD/$ADMIN_PASSWORD/g /etc/haproxy/haproxy-dev.cfg
-  sed -i s/PLACEHOLDER_DOCKERHOST/$PROXY_DOCKER_HOST/g /etc/haproxy/haproxy-dev.cfg
   exec a8sidecar --proxy haproxy -f /etc/haproxy/haproxy-dev.cfg
 fi

core/auth.yaml

@@ -37,7 +37,8 @@ spec:
         tier: auth
     spec:
       containers:
-      - image: gameontext/gameon-auth
+      - image: anthonyamanse/gameon-auth:latest
+        imagePullPolicy: Always
         name: auth
         env:
           - name: service_map

core/map.yaml

@@ -37,7 +37,8 @@ spec:
         tier: map
     spec:
       containers:
-      - image: gameontext/gameon-map
+      - image: anthonyamanse/gameon-map:latest
+        imagePullPolicy: Always
         name: map
         env:
           - name: service_map

core/mediator.yaml

@@ -37,7 +37,8 @@ spec:
         tier: mediator
     spec:
       containers:
-      - image: gameontext/gameon-mediator
+      - image: anthonyamanse/gameon-mediator:latest
+        imagePullPolicy: Always
         name: mediator
         env:
           - name: service_map

core/player.yaml

@@ -42,7 +42,8 @@ spec:
         tier: player
     spec:
       containers:
-      - image: gameontext/gameon-player
+      - image: anthonyamanse/gameon-player:latest
+        imagePullPolicy: Always
         name: player
         env:
           - name: service_map

core/proxy.yaml

@@ -42,7 +42,8 @@ spec:
         tier: proxy
     spec:
       containers:
-      - image: anthonyamanse/gameon-proxy
+      - image: anthonyamanse/gameon-proxy:0.1
+        imagePullPolicy: Always
         name: proxy
         env:
           - name: service_map

core/room.yaml

@@ -37,7 +37,8 @@ spec:
         tier: room
     spec:
       containers:
-      - image: gameontext/gameon-room
+      - image: anthonyamanse/gameon-room:latest
+        imagePullPolicy: Always
         name: room
         env:
           - name: service_map

core/webapp.yaml

@@ -32,7 +32,8 @@ spec:
         tier: webapp
     spec:
       containers:
-      - image: gameontext/gameon-webapp
+      - image: anthonyamanse/gameon-webapp:latest
+        imagePullPolicy: Always
         name: webapp
         env:
           - name: service_map