diff --git a/tools/ingress/deploy-ingress-controller.sh b/tools/ingress/deploy-ingress-controller.sh index 3064ec9e..939eb0a3 100755 --- a/tools/ingress/deploy-ingress-controller.sh +++ b/tools/ingress/deploy-ingress-controller.sh @@ -9,7 +9,7 @@ function usage { echo " $base_name -p " echo " $base_name -s " echo " $base_name -w " - echo " $base_name -n " + echo " $base_name -n (default: kube-system)" echo " $base_name -k " echo " $base_name -c " echo " $base_name -d " @@ -80,9 +80,11 @@ if [ -z $TLS_KEY ] || [ -z $TLS_CERT ]; then 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" $workdir/traefik-conf.yaml | kube_cmd create -f - +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 - 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 - +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 rm $TLS_KEY $TLS_CERT diff --git a/tools/ingress/traefik-conf.yaml b/tools/ingress/traefik-conf.yaml index bdceca74..8107d362 100644 --- a/tools/ingress/traefik-conf.yaml +++ b/tools/ingress/traefik-conf.yaml @@ -8,8 +8,8 @@ data: [web] address = ":WEBUI_PORT" ReadOnly = true - CertFile = "/ssl/tls.crt" - KeyFile = "/ssl/tls.key" + CertFile = "/ssl/TLS_CERT" + KeyFile = "/ssl/TLS_KEY" [entryPoints] [entryPoints.http] address = ":HTTP_PORT"