Merge pull request #162 from cyberark/fix-conjur-ns-in-example

Eliminates CONJUR_NAMESPACE undefined errors in KinD example

examples/common/utils.sh

@@ -32,7 +32,7 @@ get_master_pod_name() {
 }
 
 has_namespace() {
-  if kubectl get namespace  "$1" > /dev/null; then
+  if kubectl get namespace  "$1" &>/dev/null; then
     true
   else
     false

examples/kubernetes-in-docker/0_export_env_vars.sh

@@ -5,10 +5,10 @@ export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}"
 # Helm install options
 export HELM_INSTALL_CONJUR="${HELM_INSTALL_CONJUR:-true}"
 export HELM_RELEASE="${HELM_RELEASE:-conjur-oss}"
-# The Conjur namespace name might be set with CONJUR_NAMESPACE_NAME in other projects
-# so look for both. Use CONJUR_NAMESPACE_NAME if both are set.
-export CONJUR_NAMESPACE="${CONJUR_NAMESPACE_NAME:-$CONJUR_NAMESPACE}"
+# The Conjur namespace name might be set with CONJUR_NAMESPACE_NAME in other
+# projects so look for both. Use CONJUR_NAMESPACE_NAME if both are set.
 export CONJUR_NAMESPACE="${CONJUR_NAMESPACE:-conjur-oss}"
+export CONJUR_NAMESPACE="${CONJUR_NAMESPACE_NAME:-$CONJUR_NAMESPACE}"
 export CONJUR_ACCOUNT="${CONJUR_ACCOUNT:-myConjurAccount}"
 export CONJUR_LOG_LEVEL="${CONJUR_LOG_LEVEL:-info}"
 

examples/openshift/0_export_env_vars.sh

@@ -5,10 +5,10 @@ export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}"
 # Helm install options
 export HELM_INSTALL_CONJUR="${HELM_INSTALL_CONJUR:-true}"
 export HELM_RELEASE="${HELM_RELEASE:-conjur-oss}"
-# The Conjur namespace name might be set with CONJUR_NAMESPACE_NAME in other projects
-# so look for both. Use CONJUR_NAMESPACE_NAME if both are set.
-export CONJUR_NAMESPACE="${CONJUR_NAMESPACE_NAME:-$CONJUR_NAMESPACE}"
+# The Conjur namespace name might be set with CONJUR_NAMESPACE_NAME in other
+# projects so look for both. Use CONJUR_NAMESPACE_NAME if both are set.
 export CONJUR_NAMESPACE="${CONJUR_NAMESPACE:-conjur-oss}"
+export CONJUR_NAMESPACE="${CONJUR_NAMESPACE_NAME:-$CONJUR_NAMESPACE}"
 export CONJUR_ACCOUNT="${CONJUR_ACCOUNT:-myConjurAccount}"
 export CONJUR_LOG_LEVEL="${CONJUR_LOG_LEVEL:-info}"