From ee5792526c003e16d49dcb26e48a513a84bbcbd5 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 02:39:08 +0530 Subject: [PATCH 1/9] Update deploy.sh --- deploy/k8s/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/k8s/deploy.sh b/deploy/k8s/deploy.sh index 0f7fa291ed5da..7b8efbd02f1a9 100755 --- a/deploy/k8s/deploy.sh +++ b/deploy/k8s/deploy.sh @@ -3,5 +3,5 @@ set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" -source "${K8S_DIR}/central.sh" -source "${K8S_DIR}/sensor.sh" +source "${K8S_DIR}"/central.sh +source "${K8S_DIR}"/sensor.sh From 48ab1ed47b350eaf12e3515151a2fc9c294bafe7 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 02:39:35 +0530 Subject: [PATCH 2/9] Update shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index 43c39a6b09dac..ffdfcca21facf 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -4,7 +4,6 @@ deploy/common/docker-auth.sh deploy/common/k8sbased.sh deploy/k8s/central.sh deploy/k8s/deploy-local.sh -deploy/k8s/deploy.sh deploy/k8s/sensor.sh deploy/openshift/central.sh deploy/openshift/deploy-local.sh From 689279cc7202f7b51137b91edf49a8c5febed249 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 11:47:41 +0530 Subject: [PATCH 3/9] Update deploy-local.sh --- deploy/k8s/deploy-local.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/k8s/deploy-local.sh b/deploy/k8s/deploy-local.sh index f5d59ecd03dfc..c2eb9f5159cee 100755 --- a/deploy/k8s/deploy-local.sh +++ b/deploy/k8s/deploy-local.sh @@ -8,4 +8,4 @@ export COLLECTION_METHOD="${COLLECTION_METHOD:-ebpf}" export MONITORING_SUPPORT="${MONITORING_SUPPORT:-false}" export POD_SECURITY_POLICIES="${POD_SECURITY_POLICIES:-false}" -$DIR/deploy.sh +"$DIR"/deploy.sh From 64a993156a641daca9fddb288d41db27b4761fb7 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 11:53:02 +0530 Subject: [PATCH 4/9] Update shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index ffdfcca21facf..500ce09fd0054 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -6,7 +6,6 @@ deploy/k8s/central.sh deploy/k8s/deploy-local.sh deploy/k8s/sensor.sh deploy/openshift/central.sh -deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh deploy/openshift/sensor.sh dev-tools/add-host-alias.sh From c4b25eaa4f8fce8c128a2b74067ee439b541dc2b Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 11:56:01 +0530 Subject: [PATCH 5/9] Update shellcheck_skip.txt --- scripts/style/shellcheck_skip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/style/shellcheck_skip.txt b/scripts/style/shellcheck_skip.txt index 500ce09fd0054..6a3dfdaa29eb7 100644 --- a/scripts/style/shellcheck_skip.txt +++ b/scripts/style/shellcheck_skip.txt @@ -3,9 +3,9 @@ deploy/common/deploy.sh deploy/common/docker-auth.sh deploy/common/k8sbased.sh deploy/k8s/central.sh -deploy/k8s/deploy-local.sh deploy/k8s/sensor.sh deploy/openshift/central.sh +deploy/openshift/deploy-local.sh deploy/openshift/deploy.sh deploy/openshift/sensor.sh dev-tools/add-host-alias.sh From f10579a2abbf68e7ceea5ec4e7aeec720c581e69 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 18:28:31 +0530 Subject: [PATCH 6/9] Update deploy-local.sh --- deploy/k8s/deploy-local.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/k8s/deploy-local.sh b/deploy/k8s/deploy-local.sh index c2eb9f5159cee..cfb10e4aab35d 100755 --- a/deploy/k8s/deploy-local.sh +++ b/deploy/k8s/deploy-local.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" From 6ebff263e5efcdb279c07b814e27ea24460de16e Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Thu, 27 Oct 2022 18:28:45 +0530 Subject: [PATCH 7/9] Update deploy.sh --- deploy/k8s/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/k8s/deploy.sh b/deploy/k8s/deploy.sh index 7b8efbd02f1a9..890a393d3e2b2 100755 --- a/deploy/k8s/deploy.sh +++ b/deploy/k8s/deploy.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" From 35c499415496154ee7b58c4aadad41d89ab3390b Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Mon, 7 Nov 2022 20:36:08 +0530 Subject: [PATCH 8/9] Update deploy.sh --- deploy/k8s/deploy.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/k8s/deploy.sh b/deploy/k8s/deploy.sh index 890a393d3e2b2..233b60b438db3 100755 --- a/deploy/k8s/deploy.sh +++ b/deploy/k8s/deploy.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# shellcheck disable=SC1091 set -e K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" - -source "${K8S_DIR}"/central.sh -source "${K8S_DIR}"/sensor.sh +# shellcheck source=/dev/null +source "${K8S_DIR}/central.sh" +# shellcheck source=/dev/null +source "${K8S_DIR}/sensor.sh" From 9b0557cb67f7bec2c1341674b44e9df4882fec20 Mon Sep 17 00:00:00 2001 From: Hardik Ahuja Date: Tue, 8 Nov 2022 16:20:28 +0530 Subject: [PATCH 9/9] Update deploy-local.sh --- deploy/k8s/deploy-local.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/k8s/deploy-local.sh b/deploy/k8s/deploy-local.sh index cfb10e4aab35d..6bc6e3dc8ca00 100755 --- a/deploy/k8s/deploy-local.sh +++ b/deploy/k8s/deploy-local.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# shellcheck disable=SC1091 + set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -9,4 +9,5 @@ export COLLECTION_METHOD="${COLLECTION_METHOD:-ebpf}" export MONITORING_SUPPORT="${MONITORING_SUPPORT:-false}" export POD_SECURITY_POLICIES="${POD_SECURITY_POLICIES:-false}" +# shellcheck source=/dev/null "$DIR"/deploy.sh