From 75b1e6ec44a70c5b3eb90b84fef0b8c5306cb23b Mon Sep 17 00:00:00 2001
From: Paul Morie <pmorie@redhat.com>
Date: Mon, 2 Nov 2015 20:00:22 -0500
Subject: [PATCH] Fix panic bringing up e2e cluster when kubeconfig is empty

---
 pkg/kubectl/cmd/config/config.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go
index d73ea26804e..9c8fd465ba3 100644
--- a/pkg/kubectl/cmd/config/config.go
+++ b/pkg/kubectl/cmd/config/config.go
@@ -225,6 +225,7 @@ func ModifyConfig(configAccess ConfigAccess, newConfig clientcmdapi.Config, rela
 
 			configToWrite := getConfigFromFileOrDie(destinationFile)
 			t := *cluster
+
 			configToWrite.Clusters[key] = &t
 			configToWrite.Clusters[key].LocationOfOrigin = destinationFile
 			if relativizePaths {
@@ -429,6 +430,10 @@ func getConfigFromFileOrDie(filename string) *clientcmdapi.Config {
 		return clientcmdapi.NewConfig()
 	}
 
+	if config.Clusters == nil {
+		config.Clusters = map[string]*clientcmdapi.Cluster{}
+	}
+
 	return config
 }