From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2319158094 for ; Thu, 28 Jul 2022 20:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93F8FE0ED3; Thu, 28 Jul 2022 20:13:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 747DBE0ED1 for ; Thu, 28 Jul 2022 20:13:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 817E93410B5 for ; Thu, 28 Jul 2022 20:13:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AFB5454C for ; Thu, 28 Jul 2022 20:13:39 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1659039077.37327358a8701680c926e62265c29b248eff50ad.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-router/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/kube-router/files/kube-router.confd sys-cluster/kube-router/files/kube-router.initd X-VCS-Directories: sys-cluster/kube-router/files/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 37327358a8701680c926e62265c29b248eff50ad X-VCS-Branch: master Date: Thu, 28 Jul 2022 20:13:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f2ca4f38-5c1b-41a9-8e3a-a7035905071b X-Archives-Hash: 129286403cc81500d6075ffcab2d23e9 commit: 37327358a8701680c926e62265c29b248eff50ad Author: William Hubbs gentoo org> AuthorDate: Thu Jul 28 20:11:17 2022 +0000 Commit: William Hubbs gentoo 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 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