From a48d9573d10608170eeecf648a4169e31a30c8d4 Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Thu, 31 Mar 2016 13:29:26 -0700
Subject: [PATCH] fix(e2e): clean up duplicate code

---
 scripts/kubectl.sh | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/scripts/kubectl.sh b/scripts/kubectl.sh
index 4597bc045..0c039670c 100755
--- a/scripts/kubectl.sh
+++ b/scripts/kubectl.sh
@@ -18,26 +18,12 @@ set -eo pipefail
 
 HELM_ROOT="${BASH_SOURCE[0]%/*}/.."
 source "${HELM_ROOT}/scripts/common.sh"
-
-if [ -f "${HELM_ROOT}/scripts/env.sh" ]; then
-  source "${HELM_ROOT}/scripts/env.sh"
-fi
+source "${HELM_ROOT}/scripts/docker.sh"
 
 K8S_VERSION=${K8S_VERSION:-1.2.0}
 KUBE_PORT=${KUBE_PORT:-8080}
-KUBE_CONFIG="${HELM_ROOT}/scripts/kubeconfig"
 KUBE_HOST=${KUBE_HOST:-localhost}
 
-is_docker_machine() {
-  [[ $(docker-machine active 2>/dev/null) ]]
-}
-
-active_docker_machine() {
-  if command -v docker-machine >/dev/null 2>&1; then
-    docker-machine active
-  fi
-}
-
 if is_docker_machine; then
   KUBE_HOST=$(docker-machine ip "$(active_docker_machine)")
 fi