From 9584d8aa7d72821c1c7f4ddd5ae0189854223f8c Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Wed, 29 Jun 2022 23:05:49 -0700 Subject: [PATCH] docs/k8s: Add env vars for tailscaled args - TS_SOCKS5_SERVER, argument passed to tailscaled --socks5-server - TS_OUTBOUND_HTTP_PROXY_LISTEN, argument passed to tailscaled -outbound-http-proxy-listen - TS_TAILSCALED_EXTRA_ARGS extra arguments passed to tailscaled Fixes #4985 Signed-off-by: Craig Rodrigues --- docs/k8s/run.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/k8s/run.sh b/docs/k8s/run.sh index 4e5686da6..485061d1d 100755 --- a/docs/k8s/run.sh +++ b/docs/k8s/run.sh @@ -14,6 +14,9 @@ TS_USERSPACE="${TS_USERSPACE:-true}" TS_STATE_DIR="${TS_STATE_DIR:-}" TS_ACCEPT_DNS="${TS_ACCEPT_DNS:-false}" TS_KUBE_SECRET="${TS_KUBE_SECRET:-tailscale}" +TS_SOCKS5_SERVER="${TS_SOCKS5_SERVER:-}" +TS_OUTBOUND_HTTP_PROXY_LISTEN="${TS_OUTBOUND_HTTP_PROXY_LISTEN:-}" +TS_TAILSCALED_EXTRA_ARGS="${TS_TAILSCALED_EXTRA_ARGS:-}" set -e @@ -43,6 +46,18 @@ else fi fi +if [[ ! -z "${TS_SOCKS5_SERVER}" ]]; then + TAILSCALED_ARGS="${TAILSCALED_ARGS} --socks5-server ${TS_SOCKS5_SERVER}" +fi + +if [[ ! -z "${TS_OUTBOUND_HTTP_PROXY_LISTEN}" ]]; then + TAILSCALED_ARGS="${TAILSCALED_ARGS} --outbound-http-proxy-listen ${TS_OUTBOUND_HTTP_PROXY_LISTEN}" +fi + +if [[ ! -z "${TS_TAILSCALED_EXTRA_ARGS}" ]]; then + TAILSCALED_ARGS="${TAILSCALED_ARGS} ${TS_TAILSCALED_EXTRA_ARGS}" +fi + echo "Starting tailscaled" tailscaled ${TAILSCALED_ARGS} & PID=$!