From f657a816b9074f5bf2b3d300d93266269c1f05a5 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 7 Dec 2021 20:21:17 +0100 Subject: [COMMON] Fix "local var=XX" bashisms Variable attribute 'local' is not POSIX but is LSB supported. It is available in other shells such as ash or dash. And in ksh, local is the default scope of functions vaiables. Though, the syntax "local var=XX" is only supported and found in bash. Sadly, this is not detected by checkbashims. - fix "local var=XX" bashisms - add a manual command in tox.ini to detect them in the CI https://wiki.ubuntu.com/DashAsBinSh#local https://wiki.ubuntu.com/DashAsBinSh#declare_or_typeset https://stackoverflow.com/questions/12000949/scope-of-variables-in-ksh Issue-ID: OOM-2643 Signed-off-by: guillaume.lambert Change-Id: Iff26e50cd352eeb760d923a4740a6f92184fe0f2 --- .../deploy_dns.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'kubernetes/contrib/dns-server-for-vhost-ingress-testing') diff --git a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh index 3c66feeb46..294ae0a55e 100755 --- a/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh +++ b/kubernetes/contrib/dns-server-for-vhost-ingress-testing/deploy_dns.sh @@ -49,10 +49,13 @@ Extra DNS server already deployed: list_node_with_external_addrs() { - local WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}') + local WORKER_NODES + WORKER_NODES=$(kubectl get no -l node-role.kubernetes.io/worker=true -o jsonpath='{.items..metadata.name}') for worker in $WORKER_NODES; do - local external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }') - local internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }') + local external_ip + external_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/external-ip }') + local internal_ip + internal_ip=$(kubectl get no $worker -o jsonpath='{.metadata.annotations.rke\.cattle\.io/internal-ip }') if [ $internal_ip != $external_ip ]; then echo $external_ip break @@ -61,7 +64,8 @@ list_node_with_external_addrs() } ingress_controller_ip() { - local metal_ns=$(kubectl get ns --no-headers --output=custom-columns=NAME:metadata.name |grep metallb-system) + local metal_ns + metal_ns=$(kubectl get ns --no-headers --output=custom-columns=NAME:metadata.name |grep metallb-system) if [ -z $metal_ns ]; then echo $CLUSTER_IP else @@ -70,13 +74,16 @@ ingress_controller_ip() { } deploy() { - local ingress_ip=$(ingress_controller_ip) + local ingress_ip + ingress_ip=$(ingress_controller_ip) initdir = $(pwd) cd $SPATH/bind9dns if [ $# -eq 0 ]; then - local cl_domain="simpledemo.onap.org" + local cl_domain + cl_domain="simpledemo.onap.org" else - local cl_domain=$1 + local cl_domain + cl_domain=$1 shift fi if [ $# -ne 0 ]; then -- cgit 1.2.3-korg