diff --git a/deploy.sh b/deploy.sh index e75e3729935adae1966519b99da33328efc7732e..f244f67c68411e5bf31cdb57064a9a2c400493f4 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"