allow using kubeconfig_base64 env var by checking for base KUBE_CONFI…

…G_FILE env var (#97)
bitovi · Jun 16, 2021 · 9a7dfe0 · 9a7dfe0
1 parent 7210ab2
commit 9a7dfe0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scripts/helm/helm_handle_chart.sh b/scripts/helm/helm_handle_chart.sh
@@ -33,7 +33,7 @@ fi
 bash $SCRIPTS_DIR/deploy/before-deploy.sh "$HELM_CHART_DIRECTORY"
 
 # set kube config
-if [[ "${KUBE_CONFIG_PATH}" == "" ]] || [[ "${KUBE_CONFIG_PATH}" == "''" ]] || [[ "${KUBE_CONFIG_PATH}" == "None" ]]; then
+if [[ ! -f $KUBE_CONFIG_FILE ]] && ([[ "${KUBE_CONFIG_PATH}" == "" ]] || [[ "${KUBE_CONFIG_PATH}" == "''" ]] || [[ "${KUBE_CONFIG_PATH}" == "None" ]]); then
     if [[ "${FETCH_KUBECONFIG}" == "True" ]]; then
         if [[ "${CLUSTER_NAME}" == "" ]] || [[ "${CLUSTER_NAME}" == "''" ]] || [[ "${CLUSTER_NAME}" == "None" ]]; then
             >&2 echo "{\"error\":\"CLUSTER_NAME config is required.Exiting...\"}"
@@ -58,6 +58,9 @@ else
         KUBE_CONFIG_FILE="$KUBE_CONFIG_PATH"
         KUBECONFIG="$KUBE_CONFIG_FILE"
         export KUBECONFIG=$KUBECONFIG:$KUBE_CONFIG_FILE
+    elif [[ -f "$KUBE_CONFIG_FILE" ]]; then
+        echo "KUBE_CONFIG_FILE ($KUBE_CONFIG_FILE) exists."
+        export KUBECONFIG="$KUBE_CONFIG_FILE"
     else
         >&2 echo "{\"error\":\"kubeconfig path variable wrong in bitops.config.yaml.Exiting...\"}"
         exit 1