From: Pawel Wieczorek
Date: Tue, 28 Jan 2020 15:26:24 +0000 (+0100)
Subject: Extend label matching for cluster node's External IP
X-Git-Tag: 6.0.0-ONAP~223
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=62b5908c21e1fdb4335d01fc43936a6986857395;p=integration.git
Extend label matching for cluster node's External IP
This patch also fixes minor typo.
Issue-ID: SECCOM-261
Change-Id: I4326106f14381ec652eb493bf0a87fb1d82ea3fb
Signed-off-by: Pawel Wieczorek
---
diff --git a/test/security/check_for_http_endpoints.sh b/test/security/check_for_http_endpoints.sh
index 5c2ba20c3..f86f77730 100755
--- a/test/security/check_for_http_endpoints.sh
+++ b/test/security/check_for_http_endpoints.sh
@@ -57,8 +57,8 @@ SVCS=`awk '{print $2}' <<<"$PORTS_SVCS"`
# Create a list in nmap-compatible format
PORT_LIST=`tr "\\n" "," <<<"$PORTS" | sed 's/,$//'; echo ''`
-# Get IP addres of some cluster node
-K8S_NODE=`kubectl describe nodes \`kubectl get nodes | grep -v NAME | head -n 1 | awk '{print $1}'\` | grep external-ip | awk '{print $2}'`
+# Get IP address of some cluster node (both "external-ip" and "ExternalIP" labels are matched)
+K8S_NODE=`kubectl describe nodes \`kubectl get nodes | grep -v NAME | head -n 1 | awk '{print $1}'\` | grep "external-ip\|ExternalIP" | awk '{print $2}'`
# perform scan
SCAN_RESULT=`nmap $K8S_NODE -sV -p $PORT_LIST 2>/dev/null | grep \tcp`