[GitHub] rabbah closed pull request #238: Configure CLI's auth property directly from whisk.auth secret

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

rabbah closed pull request #238: Configure CLI's auth property directly from whisk.auth secret
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/238
 
 
   

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-helm.sh b/tools/travis/build-helm.sh
index 7e6c42c..35e39dc 100755
--- a/tools/travis/build-helm.sh
+++ b/tools/travis/build-helm.sh
@@ -130,14 +130,12 @@ kubectl describe nodes
 echo "Create openwhisk namespace"
 kubectl create namespace openwhisk
 
-# configure Ingress and wsk CLI
-#
+# configure Ingress
 WSK_PORT=31001
 WSK_HOST=$(kubectl describe nodes | grep Hostname: | awk '{print $2}')
 if [ "$WSK_HOST" = "minikube" ]; then
     WSK_HOST=$(minikube ip)
 fi
-wsk property set --auth `cat $ROOTDIR/kubernetes/cluster-setup/auth.guest` --apihost $WSK_HOST:$WSK_PORT
 
 # Deploy OpenWhisk using Helm
 cd $ROOTDIR/helm
@@ -178,6 +176,9 @@ sleep 10
 jobHealthCheck "install-catalog"
 jobHealthCheck "install-routemgmt"
 
+# Configure wsk CLI
+wsk property set --auth `kubectl -n openwhisk get secret whisk.auth -o jsonpath='{.data.guest}' | base64 --decode` --apihost $WSK_HOST:$WSK_PORT
+
 #################
 # Sniff test: create and invoke a simple Hello world action
 #################


 

----------------------------------------------------------------
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