This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 1fb97e9 Configure CLI's auth property directly from whisk.auth secret
(#238)
1fb97e9 is described below
commit 1fb97e930044f75bd8d9484e24a38d5d6cb421a1
Author: David Grove <[email protected]>
AuthorDate: Thu Jun 28 17:42:57 2018 -0400
Configure CLI's auth property directly from whisk.auth secret (#238)
---
tools/travis/build-helm.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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
#################
