From a6892e83c263284bc8ed9c4c4edcd640b8723bae Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Fri, 10 Feb 2017 14:45:34 +0000 Subject: [PATCH] Fixing ingress deployment script * only basename should be added to configs * fixed cleanup check Change-Id: I5b92819d6403c71f0c474c3cd51e53d3aab6b015 --- tools/ingress/deploy-ingress-controller.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/ingress/deploy-ingress-controller.sh b/tools/ingress/deploy-ingress-controller.sh index 939eb0a3..cf3ef0ab 100755 --- a/tools/ingress/deploy-ingress-controller.sh +++ b/tools/ingress/deploy-ingress-controller.sh @@ -81,11 +81,10 @@ fi kube_cmd create secret generic traefik-cert --from-file=$TLS_CERT --from-file=$TLS_KEY sed -e "s/HTTP_PORT/$HTTP_PORT/g" -e "s/HTTPS_PORT/$HTTPS_PORT/g" -e "s/WEBUI_PORT/$WEBUI_PORT/g" \ - -e "s/TLS_KEY/$TLS_KEY/g" -e "s/TLS_CERT/$TLS_CERT/g" $workdir/traefik-conf.yaml | kube_cmd create -f - + -e "s/TLS_KEY/$(basename "$TLS_KEY")/g" -e "s/TLS_CERT/$(basename "$TLS_CERT")/g" $workdir/traefik-conf.yaml | kube_cmd create -f - sleep 1 sed -e "s/HTTP_PORT/$HTTP_PORT/g" -e "s/HTTPS_PORT/$HTTPS_PORT/g" -e "s/WEBUI_PORT/$WEBUI_PORT/g" \ -e "s/EXTERNAL_IP/$EXTERNAL_IP/g" $workdir/controller.yaml | kube_cmd create -f - - -if [ -n $CLEANUP ]; then +if [ -n "$CLEANUP" ]; then rm $TLS_KEY $TLS_CERT fi