From 4cd6bf42af4016c02041f4b8f5d53e098034bf1c Mon Sep 17 00:00:00 2001
From: jayunit100 <jay@apache.org>
Date: Fri, 29 Jul 2016 20:14:11 -0400
Subject: [PATCH] [minor] couple of quick cleanups for kill reporoot

---
 hack/update-bindata.sh                    | 5 ++---
 test/e2e/framework/util.go                | 5 -----
 test/e2e_node/jenkins/e2e-node-jenkins.sh | 6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/hack/update-bindata.sh b/hack/update-bindata.sh
index cbb0b474122..9fad4abbe9d 100755
--- a/hack/update-bindata.sh
+++ b/hack/update-bindata.sh
@@ -16,14 +16,13 @@
 
 set -o errexit
 set -o pipefail
+set -o nounset
 
-if [[ -z ${KUBE_ROOT} ]]; then
+if [[ -z "${KUBE_ROOT:-}" ]]; then
 	echo "KUBE_ROOT not detected, setting default."
 	KUBE_ROOT="../../../"
 fi
 
-set -o nounset
-
 if [[ ! -d "${KUBE_ROOT}/examples" ]]; then
 	echo "${KUBE_ROOT}/examples not detected.  This script should be run from a location where the source dirs are available."
 	exit 1
diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index a18f821d785..48593e45a1d 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -653,11 +653,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
 // Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
 // to flip to Ready, log its output and delete it.
 func RunKubernetesServiceTestContainer(c *client.Client, ns string) {
-	c, err := LoadClient()
-	if err != nil {
-		Logf("Failed to load client")
-		return
-	}
 	path := "test/images/clusterapi-tester/pod.yaml"
 	p, err := podFromManifest(path)
 	if err != nil {
diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh
index 53f32dc1554..1ab26e3842c 100755
--- a/test/e2e_node/jenkins/e2e-node-jenkins.sh
+++ b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -28,12 +28,6 @@ set -x
 
 . $1
 
-if [ "$INSTALL_GODEP" = true ] ; then
-  go get -u github.com/tools/godep
-  go get -u github.com/onsi/ginkgo/ginkgo
-  go get -u github.com/onsi/gomega
-fi
-
 make generated_files
 
 # TODO converge build steps with hack/build-go some day if possible.