Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

fix kubectl cli parameter error when use kubernetes platform #612

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions deploy/gk-deploy
Original file line number Diff line number Diff line change
Expand Up @@ -920,9 +920,11 @@ while [[ "x${heketi_service}" == "x" ]] || [[ "${heketi_service}" == "<none>" ]]
((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)
Expand Down