[GitHub] rabbah closed pull request #112: move node labeling from setup to build

[GitBox <gi...@apache.org>]

rabbah closed pull request #112: move node labeling from setup to build
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/112
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index becff4b..7691097 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -10,6 +10,10 @@ cd $ROOTDIR
 echo "Creating openwhisk namespace"
 kubectl apply -f configure/openwhisk_kube_namespace.yml
 
+echo "Labeling invoker node"
+kubectl label nodes --all openwhisk=invoker
+kubectl describe nodes
+
 couchdbHealthCheck () {
   # wait for the pod to be created before getting the job name
   sleep 5
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 7594cb3..a894232 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -21,10 +21,14 @@ touch $HOME/.kube/config
 export KUBECONFIG=$HOME/.kube/config
 sudo -E /usr/local/bin/minikube start --vm-driver=none --kubernetes-version=$TRAVIS_KUBE_VERSION
 
-# Wait until kubectl can access the api server that Minikube has created
+# Wait until we have a ready node in minikube
 TIMEOUT=0
 TIMEOUT_COUNT=60
-until $( /usr/local/bin/kubectl get po &> /dev/null ) || [ $TIMEOUT -eq $TIMEOUT_COUNT ]; do
+until [ $TIMEOUT -eq $TIMEOUT_COUNT ]; do
+  if [ -n "$(/usr/local/bin/kubectl get nodes | grep Ready)" ]; then
+    break
+  fi
+
   echo "minikube is not up yet"
   let TIMEOUT=TIMEOUT+1
   sleep 5
@@ -36,6 +40,4 @@ if [ $TIMEOUT -eq $TIMEOUT_COUNT ]; then
 fi
 
 echo "minikube is deployed and reachable"
-
-# set the invoker label
-kubectl label nodes --all openwhisk=invoker
+/usr/local/bin/kubectl describe nodes


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services