Update README and scripts

AnthonyAmanse · AnthonyAmanse · commit 6eb248a1c2e7 · 2017-05-08T10:49:43.000-07:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -302,11 +302,12 @@ To register the deployed rooms in the cluster, you will need to use the UI of yo
   * `kubectl delete -f core`
 * To delete everything:
   * `kubectl delete svc,deploy,pvc -l app=gameon`
+  * `kubectl delete pod setup`
   * `kubectl delete pv local-volume-1`
 
 ## References
 
-* [GameOn](https://gameontext.org) - The original game on app. The journey is based on [deploying GameOn using Dockers](https://book.gameontext.org/walkthroughs/local-docker.html)
+* [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)
 
 ## License
 
diff --git a/core/auth.yaml b/core/auth.yaml
@@ -63,13 +63,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -79,7 +79,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/core/map.yaml b/core/map.yaml
@@ -63,13 +63,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -79,7 +79,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/core/mediator.yaml b/core/mediator.yaml
@@ -63,13 +63,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
diff --git a/core/player.yaml b/core/player.yaml
@@ -68,13 +68,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -84,7 +84,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/core/proxy.yaml b/core/proxy.yaml
@@ -68,13 +68,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -84,7 +84,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/core/room.yaml b/core/room.yaml
@@ -63,13 +63,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -79,7 +79,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/core/webapp.yaml b/core/webapp.yaml
@@ -58,13 +58,13 @@ spec:
           - name: KAFKA_SERVICE_URL
             value : kafka:9092
           - name: FRONT_END_PLAYER_URL
-            value : https://169.47.241.213:30443/players/v1/accounts
+            value : https://192.168.99.100:30443/players/v1/accounts
           - name: FRONT_END_SUCCESS_CALLBACK
-            value : https://169.47.241.213:30443/#/login/callback
+            value : https://192.168.99.100:30443/#/login/callback
           - name: FRONT_END_FAIL_CALLBACK
-            value : https://169.47.241.213:30443/#/game
+            value : https://192.168.99.100:30443/#/game
           - name: FRONT_END_AUTH_URL
-            value : https://169.47.241.213:30443/auth
+            value : https://192.168.99.100:30443/auth
           - name: GAMEON_MODE
             value : development
           - name: TARGET_PLATFORM
@@ -74,7 +74,7 @@ spec:
           - name: LICENSE
             value : accept
           - name: PROXY_DOCKER_HOST
-            value : '169.47.241.213'
+            value : '192.168.99.100'
           - name: ADMIN_PASSWORD
             value : admin
           - name: WLP_SKIP_MAXPERMSIZE
diff --git a/scripts/README.md b/scripts/README.md
@@ -0,0 +1,22 @@
+# Scripts
+
+## deploy-to-bluemix
+Contains necessary scripts for the toolchain to deploy the app in Bluemix.
+Requirements are having a Bluemix account, deployed Cluster in Bluemix container service, and a Github account.
+
+## install.sh
+The script for Travis. It runs build and checks if the build has passed or failed.
+
+## replace\_ip\_< os >.sh
+The script for modifying the yaml files in the **core** folder and **setup.yaml**.
+
+* Usage:
+
+1. `replace_ip_<your-os>.sh`
+  * replaces every instance of `169.47.241.213` in the yaml files inside your **core** folder  and **setup.yaml** to the IP of your cluster *(found by executing `kubectl get nodes`)*.
+2. `replace_ip_<your-os>.sh <IP-ADDRESS>`
+  * replaces every instance of `<IP-ADDRESS>` to the IP of your cluster *(found by executing `kubectl get nodes`)*.
+  * Ex: `replace_ip_OSX.sh 169.47.241.213` replaces every `169.47.241.213` in the files mentioned above.
+3. `replace_ip_<your-os>.sh <ip-to-be-replaced> <IP-ADDRESS>`
+  * replaces every instance of `<ip-to-be-replaced>` to `<IP-ADDRESS>`
+  * Ex: `replace_ip_OSX.sh 169.47.241.213 192.168.99.100` replaces every `169.47.241.213` to `192.168.99.100`
diff --git a/scripts/deploy-to-bluemix/deploy.sh b/scripts/deploy-to-bluemix/deploy.sh
@@ -85,7 +85,7 @@ echo "Waiting for the amalgam8 controlplane to finish setup..."
 TRIES=0
 while true
 do
-code=$(curl -w '%{http_code}' http://$IP_ADDR:31200/health -o /dev/null)
+code=$(curl -sw '%{http_code}' http://$IP_ADDR:31200/health -o /dev/null)
     if [ "$code" = "200" ]; then
         echo "Controller is up"
         break
@@ -102,7 +102,7 @@ done
 TRIES=0
 while true
 do
-code=$(curl -w '%{http_code}' http://$IP_ADDR:31300/uptime -o /dev/null)
+code=$(curl -sw '%{http_code}' http://$IP_ADDR:31300/uptime -o /dev/null)
     if [ "$code" = "200" ]; then
         echo "Registry is up"
         break
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -97,7 +97,7 @@ echo "Waiting for the amalgam8 controlplane to finish setup..."
 TRIES=0
 while true
 do
-code=$(curl -w '%{http_code}' http://$IP:31200/health -o /dev/null)
+code=$(curl -sw '%{http_code}' http://$IP:31200/health -o /dev/null)
     if [ "$code" = "200" ]; then
         echo "Controller is up"
         break
@@ -114,7 +114,7 @@ done
 TRIES=0
 while true
 do
-code=$(curl -w '%{http_code}' http://$IP:31300/uptime -o /dev/null)
+code=$(curl -sw '%{http_code}' http://$IP:31300/uptime -o /dev/null)
     if [ "$code" = "200" ]; then
         echo "Registry is up"
         break
diff --git a/scripts/replace_ip_OSX.sh b/scripts/replace_ip_OSX.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-kubectl get nodes
-IP_ADDR=$(kubectl get nodes | grep Ready | awk '{print $1}' | head -1)
 
 if [ -z $1 ]
 then
@@ -9,6 +7,8 @@ then
     then
         echo "169.47.241.213 not found in yaml files. Please use ./scripts/replace_ip_<your-os>.sh <IP-in-the-yaml-files-you-want-to-replace>"
     else
+        kubectl get nodes
+        IP_ADDR=$(kubectl get nodes | grep Ready | awk '{print $1}' | head -1)
         echo "Replacing 169.47.241.213 to $IP_ADDR in core/*.yaml and setup.yaml"
         for filename in core/*.yaml
         do
@@ -35,13 +35,24 @@ else
           then
               echo "$1 not found in yaml files. Please check your yaml files."
           else
-
-              echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
-              for filename in core/*.yaml
-              do
-                  sed -i '' s#$1#$IP_ADDR# $filename
-              done
-              sed -i '' s#$1#$IP_ADDR# setup.yaml
+              if [[ -z $2 ]]
+              then
+                  kubectl get nodes
+                  IP_ADDR=$(kubectl get nodes | grep Ready | awk '{print $1}' | head -1)
+                  echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
+                  for filename in core/*.yaml
+                  do
+                      sed -i '' s#$1#$IP_ADDR# $filename
+                  done
+                  sed -i '' s#$1#$IP_ADDR# setup.yaml
+              else
+                  echo "Replacing $1 to $2 in core/*.yaml and setup.yaml"
+                  for filename in core/*.yaml
+                  do
+                      sed -i '' s#$1#$2# $filename
+                  done
+                  sed -i '' s#$1#$2# setup.yaml
+              fi
           fi
       else
           echo "Invalid IP"
diff --git a/scripts/replace_ip_linux.sh b/scripts/replace_ip_linux.sh
@@ -34,15 +34,24 @@ else
           if [[ -z $prevIP ]]
           then
               echo "$1 not found in yaml files. Please check your yaml files."
-          else
-
-              echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
-              for filename in core/*.yaml
-              do
-                  sed -i s#$1#$IP_ADDR# $filename
-              done
-              sed -i s#$1#$IP_ADDR# setup.yaml
-          fi
+            else
+                if [[ -z $2 ]]
+                then
+                    echo "Replacing $1 to $IP_ADDR in core/*.yaml and setup.yaml"
+                    for filename in core/*.yaml
+                    do
+                        sed -i s#$1#$IP_ADDR# $filename
+                    done
+                    sed -i s#$1#$IP_ADDR# setup.yaml
+                else
+                    echo "Replacing $1 to $2 in core/*.yaml and setup.yaml"
+                    for filename in core/*.yaml
+                    do
+                        sed -i s#$1#$2# $filename
+                    done
+                    sed -i s#$1#$2# setup.yaml
+                fi
+            fi
       else
           echo "Invalid IP"
       fi
diff --git a/setup.yaml b/setup.yaml
@@ -12,7 +12,7 @@ spec:
     image: anthonyamanse/keystore
     env:
       - name: IP
-        value: '169.47.241.213'
+        value: '192.168.99.100'
     volumeMounts:
     - name: keystore
       mountPath: /tmp/keystore/
