From 175f3c68844b77c4a1a7c2911f3e89d214e1ff19 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed <fawzi.mohamed@fhi-berlin.mpg.de> Date: Tue, 11 Dec 2018 13:33:48 +0100 Subject: [PATCH] ignore empty directories when looking for kube/web-certs --- deploy.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy.sh b/deploy.sh index e75e372..f244f67 100755 --- a/deploy.sh +++ b/deploy.sh @@ -376,10 +376,12 @@ echo "# secret to pull images from analytics-toolkit.nomad-coe.eu:5509" echo " kubectl create secret docker-registry garching-kube --docker-server=analytics-toolkit.nomad-coe.eu:5509 --docker-username=\$DOCKER_USERNAME --docker-password=\"\$DOCKER_PASSWORD\" --docker-email=\$DOCKER_EMAIL" echo " kubectl --namespace analytics create secret docker-registry garching-kube --docker-server=analytics-toolkit.nomad-coe.eu:5509 --docker-username=\$DOCKER_USERNAME --docker-password=\"\$DOCKER_PASSWORD\" --docker-email=\$DOCKER_EMAIL" echo "# get certificates to connect to kubernetes (either from kube-certs of ~/.minikube)" -echo " if [ -e kube-certs ] ; then" +echo " if [ -f kube-certs/client.key ] ; then" echo " pushd kube-certs" -echo " elif [ -e ../kube-certs ] ; then" +echo " elif [ -e ../kube-certs/client.key ] ; then" echo " pushd ../kube-certs" +echo " elif [ -e ../../kube-certs/client.key ] ; then" +echo " pushd ../../kube-certs" echo " elif [ -e ~/.minikube ] ; then" echo " mkdir -p ./kube-certs" echo " pushd kube-certs" @@ -406,10 +408,12 @@ else fi echo " popd" echo "# create secret with web certificates" -echo " if [ -e web-certs ] ; then" +echo " if [ -f web-certs/key.pem ] ; then" echo " pushd web-certs" -echo " elif [ -e ../web-certs ]; then" +echo " elif [ -f ../web-certs/key.pem ]; then" echo " pushd ../web-certs" +echo " elif [ -f ../../web-certs/key.pem ]; then" +echo " pushd ../../web-certs" echo " else" echo " pushd ." echo " fi" -- GitLab