From 6de59f500ec66b95c1fefce17cad11136247c700 Mon Sep 17 00:00:00 2001 From: yudar1024 Date: Fri, 6 Sep 2019 16:18:20 +0800 Subject: [PATCH 1/2] fix kubectl parameter error --- deploy/gk-deploy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/gk-deploy b/deploy/gk-deploy index e3735e14..67bd9aec 100755 --- a/deploy/gk-deploy +++ b/deploy/gk-deploy @@ -920,9 +920,11 @@ while [[ "x${heketi_service}" == "x" ]] || [[ "${heketi_service}" == "" ]] ((s+=1)) heketi_service=$(${CLI} describe svc/heketi | grep "Endpoints:" | awk '{print $2}') done - -heketi_pod=$(${CLI} get pod --no-headers --show-all --selector="heketi" | awk '{print $1}') - +if [[ "${CLI}" == "kubectl" ]]; then + heketi_pod=$(${CLI} get pod --no-headers --selector="heketi" | awk '{print $1}') +else + heketi_pod=$(${CLI} get pod --no-headers --show-all --selector="heketi" | awk '{print $1}') +fi if [[ "${CLI}" == *oc\ * ]]; then heketi_service=$(${CLI} describe routes/heketi | grep "Requested Host:" | awk '{print $3}') hello=$(curl "http://${heketi_service}/hello" 2>/dev/null) From 74273ab2a5429daec23cc856851928b8c6cc1986 Mon Sep 17 00:00:00 2001 From: yudar1024 Date: Sat, 7 Sep 2019 12:43:59 +0800 Subject: [PATCH 2/2] fix kubectl cli parameter error --- deploy/gk-deploy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/gk-deploy b/deploy/gk-deploy index 67bd9aec..3c43a12e 100755 --- a/deploy/gk-deploy +++ b/deploy/gk-deploy @@ -920,7 +920,7 @@ while [[ "x${heketi_service}" == "x" ]] || [[ "${heketi_service}" == "" ]] ((s+=1)) heketi_service=$(${CLI} describe svc/heketi | grep "Endpoints:" | awk '{print $2}') done -if [[ "${CLI}" == "kubectl" ]]; then +if [[ "${CLI}" =~ ^kubectl ]]; then heketi_pod=$(${CLI} get pod --no-headers --selector="heketi" | awk '{print $1}') else heketi_pod=$(${CLI} get pod --no-headers --show-all --selector="heketi" | awk '{print $1}')