commit: 37327358a8701680c926e62265c29b248eff50ad Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Thu Jul 28 20:11:17 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Jul 28 20:11:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37327358
sys-cluster/kube-router: make service script POSIX compatible Closes: https://bugs.gentoo.org/852080 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> sys-cluster/kube-router/files/kube-router.confd | 3 ++- sys-cluster/kube-router/files/kube-router.initd | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-cluster/kube-router/files/kube-router.confd b/sys-cluster/kube-router/files/kube-router.confd index a5f20a581c4c..601368deaf1e 100644 --- a/sys-cluster/kube-router/files/kube-router.confd +++ b/sys-cluster/kube-router/files/kube-router.confd @@ -2,7 +2,8 @@ # KUBECONFIG=/etc/kubernetes/kube-router.kubeconfig # Leave empty to autodetect: -# HOSTNAME= +# HOSTNAME is a bashism, so change to HOSTNAME_OVERRIDE +# HOSTNAME_OVERRIDE= # RUN_PROXY=true # RUN_FIREWALL=true diff --git a/sys-cluster/kube-router/files/kube-router.initd b/sys-cluster/kube-router/files/kube-router.initd index 9b96ec024f66..de39cd76de9b 100644 --- a/sys-cluster/kube-router/files/kube-router.initd +++ b/sys-cluster/kube-router/files/kube-router.initd @@ -12,7 +12,7 @@ command_args="--master=${K8S_APISERVER} --kubeconfig=${KUBECONFIG} \ --run-service-proxy=${RUN_PROXY:-false} \ --run-firewall=${RUN_FIREWALL:-false} \ --run-router=${RUN_ROUTER:-false} \ - ${HOSTNAME:+--hostname-override=}${HOSTNAME} \ + ${HOSTNAME_OVERRIDE:+--hostname-override=}${HOSTNAME_OVERRIDE} \ ${EXTRA_ARGS}" extra_commands="clear" @@ -21,7 +21,7 @@ clear() { "${command}" --cleanup-config } -if [[ -n "${KUBE_ROUTER_HEALTHCHECK_URI}" ]]; then +if [ -n "${KUBE_ROUTER_HEALTHCHECK_URI}" ]; then healthcheck_delay=60 healthcheck_timer=30
