From 7606e0d67a00040be475263cf2230036ae578048 Mon Sep 17 00:00:00 2001
From: Roy Golan <rgolan@redhat.com>
Date: Mon, 23 Jul 2018 14:54:13 +0300
Subject: [PATCH] Set KUBECONFIG to the $HOME/.kube/config if missing

To support root or non-root docker invocations, set the KUBECONFIG
specifically to the passed .kube dir. The reason is that 'oc' incovation
as root is by default looking for the .kube dir uner
`/root/.kube/config` where as non-root is looking at $HOME/.kube/config.

With this we always set KUBECONFIG, so root invocation of `oc` commands
will always find the passed in config.

Fixes: https://github.com/ansibleplaybookbundle/ansible-playbook-bundle/issues/298

Signed-off-by: Roy Golan <rgolan@redhat.com>
---
 scripts/apb-docker-run.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/apb-docker-run.sh b/scripts/apb-docker-run.sh
index 5d18ed7..ed339d4 100755
--- a/scripts/apb-docker-run.sh
+++ b/scripts/apb-docker-run.sh
@@ -16,6 +16,7 @@ if ! [[ -z "${DOCKER_CERT_PATH}" ]] && [[ ${DOCKER_CERT_PATH} = *"minishift"* ]]
 fi
 
 KUBECONFIG_ENV="${KUBECONFIG:+-v ${KUBECONFIG}:${KUBECONFIG} -e KUBECONFIG=${KUBECONFIG}}"
+[[ -z $KUBECONFIG ]] && KUBECONFIG_ENV="${KUBECONFIG:--v $HOME/.kube:/.kube -e KUBECONFIG=/.kube/config}"
 
 if [[ $IS_MINISHIFT = true ]]; then
   # If targetting minishift, there are some unique issues with using the apb
@@ -36,7 +37,7 @@ if [[ $IS_MINISHIFT = true ]]; then
   unset DOCKER_CERT_PATH
 
   docker run --rm --privileged \
-    -v $PWD:/mnt -v $HOME/.kube:/.kube \
+    -v $PWD:/mnt \
     -v $MINISHIFT_DOCKER_CERT_SRC:$MINISHIFT_DOCKER_CERT_DEST \
     -e DOCKER_TLS_VERIFY="1" \
     -e DOCKER_HOST="${MINISHIFT_DOCKER_HOST}" \
@@ -46,7 +47,7 @@ if [[ $IS_MINISHIFT = true ]]; then
     -u $UID $APB_IMAGE "$@"
 else
   docker run --rm --privileged \
-    -v $PWD:/mnt -v $HOME/.kube:/.kube \
+    -v $PWD:/mnt \
     -v /var/run/docker.sock:/var/run/docker.sock \
     ${KUBECONFIG_ENV} \
     -u $UID $APB_IMAGE "$@"