x
/
fuel-ccp
Code Issues Proposed changes

Merge "Fixing ingress deployment with custom key/cert"

This commit is contained in:
Jenkins 2017-02-08 08:25:18 +00:00 committed by Gerrit Code Review
parent 9275638dd5 7065208c05
commit a6ea5e4876
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ingress/deploy-ingress-controller.sh
View File

@ -9,7 +9,7 @@ function usage {
echo " $base_name -p <http port (default: 80)>"
echo " $base_name -s <https port (default: 8443)>"
echo " $base_name -w <webui port (default: 8088)>"
echo " $base_name -n <namespace>"
echo " $base_name -n <namespace> (default: kube-system)"
echo " $base_name -k <path to tls key>"
echo " $base_name -c <path to tls cert>"
echo " $base_name -d <ingress domain (default: external)>"
@ -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

4
tools/ingress/traefik-conf.yaml
View File

@ -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"