3 files changed, 27 insertions, 11 deletions

diff --git a/src/vagrant/kubeadm_istio/istio/bookinfo.sh b/src/vagrant/kubeadm_istio/istio/bookinfo.sh
index b61ea4e..ad8c120 100755
--- a/src/vagrant/kubeadm_istio/istio/bookinfo.sh
+++ b/src/vagrant/kubeadm_istio/istio/bookinfo.sh
@@ -23,6 +23,9 @@ export PATH=$PWD/bin:$PATH
 # Run the test application: bookinfo
 kubectl apply -f <(istioctl kube-inject -f samples/bookinfo/kube/bookinfo.yaml)
 
+# Define the ingress gateway for the application
+istioctl create -f samples/bookinfo/routing/bookinfo-gateway.yaml
+
 # Wait for bookinfo deployed
 kubectl get services
 kubectl get pods
@@ -30,12 +33,12 @@ kubectl get pods
 r="0"
 while [ $r -ne "6" ]
 do
+   sleep 30
    kubectl get pods
    r=$(kubectl get pods | grep Running | wc -l)
-   sleep 60
 done
 
 # Validate the bookinfo app
-export GATEWAY_URL=$(kubectl get po -l istio=ingress -n istio-system -o 'jsonpath={.items[0].status.hostIP}'):$(kubectl get svc istio-ingress -n istio-system -o 'jsonpath={.spec.ports[0].nodePort}')
+export GATEWAY_URL=$(kubectl get po -l istio=ingressgateway -n istio-system -o 'jsonpath={.items[0].status.hostIP}'):$(kubectl get svc istio-ingressgateway -n istio-system -o 'jsonpath={.spec.ports[0].nodePort}')
 curl -o /dev/null -s -w "%{http_code}\n" http://${GATEWAY_URL}/productpage
 
diff --git a/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh b/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
index b5bfc08..ede825f 100755
--- a/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
+++ b/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
@@ -21,7 +21,7 @@ cd /vagrant/istio-source/
 export PATH=$PWD/bin:$PATH
 
 # Clean up bookinfo
-samples/bookinfo/kube/cleanup.sh
+echo "" | samples/bookinfo/kube/cleanup.sh
 
 istioctl get routerules
 kubectl get pods
diff --git a/src/vagrant/kubeadm_istio/istio/deploy.sh b/src/vagrant/kubeadm_istio/istio/deploy.sh
index ed873f5..84af41b 100755
--- a/src/vagrant/kubeadm_istio/istio/deploy.sh
+++ b/src/vagrant/kubeadm_istio/istio/deploy.sh
@@ -17,23 +17,36 @@
 
 set -ex
 
-# Deploy istio 0.4.0
+# Get latest istio version, refer: https://git.io/getLatestIstio
+if [ "x${ISTIO_VERSION}" = "x" ] ; then
+  ISTIO_VERSION=$(curl -L -s https://api.github.com/repos/istio/istio/releases/latest | \
+                  grep tag_name | sed "s/ *\"tag_name\": *\"\(.*\)\",*/\1/")
+fi
+
+ISTIO_DIR_NAME="istio-$ISTIO_VERSION"
+
 cd /vagrant
 curl -L https://git.io/getLatestIstio | sh -
-mv istio-0.4.0 istio-source
+mv $ISTIO_DIR_NAME istio-source
 cd /vagrant/istio-source/
-export PATH=$PWD/bin:$PATH
-kubectl apply -f install/kubernetes/istio.yaml
+
+# Persistently append istioctl bin path to PATH env
+echo 'export PATH="$PATH:/vagrant/istio-source/bin"' >> ~/.bashrc
+echo "source <(kubectl completion bash)" >> ~/.bashrc
+source ~/.bashrc
+
+kubectl apply -f install/kubernetes/istio-demo.yaml
 
 # Validate the installation
 kubectl get svc -n istio-system
 kubectl get pods -n istio-system
+kubectl get namespace -L istio-injection
 
-r="0"
-while [ $r -ne "4" ]
+r="1"
+while [ $r -ne "0" ]
 do
+   sleep 30
    kubectl get pods -n istio-system
-   r=$(kubectl get pods -n istio-system | grep Running | wc -l)
-   sleep 60
+   r=$(kubectl get pods -n istio-system | egrep -v 'NAME|Running' | wc -l)
 done