More review fixes

make/include/has_namespace

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+has_namespace() {
+  kubectl get namespace "${STRATOS_NAMESPACE}" > /dev/null 2>&1
+}

make/include/has_release

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
 has_release() {
-  helm list | awk 'NR>1 { print $1 }' | grep --quiet --word-regexp "${1}"
-  echo $?
+  helm list --short | grep --quiet "^${1}\$"
 }

make/stratos/run

@@ -25,7 +25,7 @@ curl -L -o $stratos_installer "$STRATOS_URL" 2> $download_log
 tar zxf $stratos_installer -C $tmp_stratos
 printf "ok\\n"
 
-if [ "$(has_release "${STRATOS_NAMESPACE}")" -ne 0 ]; then
+if ! has_release "${STRATOS_HELM_NAME}"; then
   subcommand="install"
 
   args=(
@@ -53,4 +53,4 @@ values=(
   --set "kube.external_ip=${VAGRANT_EXTERNAL_IP}"
 )
 
-helm $subcommand "${args[@]}" "${values[@]}"
+helm "${subcommand}" "${args[@]}" "${values[@]}"

make/stratos/stop

@@ -3,9 +3,13 @@
 set -o errexit
 
 source "${BASH_SOURCE%/*}/_env"
+source "${GIT_ROOT}/make/include/has_namespace"
 source "${GIT_ROOT}/make/include/has_release"
 
-if [ "$(has_release "${STRATOS_NAMESPACE}")" -eq 0 ]; then
+if has_release "${STRATOS_HELM_NAME}"; then
   helm delete --purge "${STRATOS_NAMESPACE}"
+fi
+
+if has_namespace "${STRATOS_NAMESPACE}"; then
   kubectl delete namespace "${STRATOS_NAMESPACE}"
 fi