Merge "Deploy Traefik webui in read-only mode with the same SSL conf"

This commit is contained in:
Jenkins 2016-11-20 16:51:55 +00:00 committed by Gerrit Code Review
commit aa534369b0
3 changed files with 15 additions and 3 deletions

View File

@ -39,6 +39,8 @@ spec:
externalIPs: externalIPs:
- EXTERNAL_IP - EXTERNAL_IP
ports: ports:
- name: webui
port: WEBUI_PORT
- name: http - name: http
port: HTTP_PORT port: HTTP_PORT
- name: https - name: https

View File

@ -8,6 +8,7 @@ function usage {
echo " $base_name -i <external IP>" echo " $base_name -i <external IP>"
echo " $base_name -p <http port (default: 80)>" echo " $base_name -p <http port (default: 80)>"
echo " $base_name -s <https port (default: 8443)>" 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>"
echo " $base_name -k <path to tls key>" echo " $base_name -k <path to tls key>"
echo " $base_name -c <path to tls cert>" echo " $base_name -c <path to tls cert>"
@ -16,10 +17,11 @@ function usage {
NAMESPACE=" --namespace kube-system" NAMESPACE=" --namespace kube-system"
DOMAIN="ccp.external" DOMAIN="ccp.external"
WEBUI_PORT=8088
HTTP_PORT=80 HTTP_PORT=80
HTTPS_PORT=8443 HTTPS_PORT=8443
while getopts "p:s:k:c:d:n:i:h" opt; do while getopts "p:s:w:k:c:d:n:i:h" opt; do
case $opt in case $opt in
"p" ) "p" )
HTTP_PORT="$OPTARG" HTTP_PORT="$OPTARG"
@ -27,6 +29,9 @@ while getopts "p:s:k:c:d:n:i:h" opt; do
"s" ) "s" )
HTTPS_PORT="$OPTARG" HTTPS_PORT="$OPTARG"
;; ;;
"w" )
WEBUI_PORT="$OPTARG"
;;
"k" ) "k" )
TLS_KEY="$OPTARG" TLS_KEY="$OPTARG"
;; ;;
@ -75,9 +80,9 @@ if [ -z $TLS_KEY ] || [ -z $TLS_CERT ]; then
fi fi
kube_cmd create secret generic traefik-cert --from-file=$TLS_CERT --from-file=$TLS_KEY 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" $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" $workdir/traefik-conf.yaml | kube_cmd create -f -
sleep 1 sleep 1
sed -e "s/HTTP_PORT/$HTTP_PORT/g" -e "s/HTTPS_PORT/$HTTPS_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 if [ -n $CLEANUP ]; then
rm $TLS_KEY $TLS_CERT rm $TLS_KEY $TLS_CERT

View File

@ -5,6 +5,11 @@ metadata:
data: data:
traefik.toml: | traefik.toml: |
defaultEntryPoints = ["http","https"] defaultEntryPoints = ["http","https"]
[web]
address = ":WEBUI_PORT"
ReadOnly = true
CertFile = "/ssl/tls.crt"
KeyFile = "/ssl/tls.key"
[entryPoints] [entryPoints]
[entryPoints.http] [entryPoints.http]
address = ":HTTP_PORT" address = ":HTTP_PORT"