KUBEARTFTS-4: Use ExternalIP if it's available when checking the serv…

…ice state
wso2-attic · Aug 16, 2016 · 53cc697 · 53cc697
1 parent 9158bea
commit 53cc697
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/common/scripts/base.sh b/common/scripts/base.sh
@@ -63,8 +63,12 @@ function getKubeNodes() {
 
 function getKubeNodeIP() {
     IFS=$','
-    node_ips=($(kubectl describe nodes $1 | grep "Addresses:" | awk '{print $2}'))
-    echo "${node_ips[0]}"
+    node_ip=$(kubectl get node $1 -o template --template='{{range.status.addresses}}{{if eq .type "ExternalIP"}}{{.address}}{{end}}{{end}}')
+    if [ -z $node_ip ]; then
+      echo $(kubectl get node $1 -o template --template='{{range.status.addresses}}{{if eq .type "InternalIP"}}{{.address}}{{end}}{{end}}')
+    else
+      echo $node_ip
+    fi
 }
 
 # Deploy using default profile