From 4ea69211e3253930dcb0d9b588914d850770d4c7 Mon Sep 17 00:00:00 2001
From: Richard Godden <7768980+goddenrich@users.noreply.github.com>
Date: Mon, 23 Sep 2019 17:43:20 +0100
Subject: [PATCH 1/2] added test that should fail

---
 config/kube_config_test.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/kube_config_test.py b/config/kube_config_test.py
index b29525e8..7f11043c 100644
--- a/config/kube_config_test.py
+++ b/config/kube_config_test.py
@@ -1353,13 +1353,17 @@ class TestKubeConfigMerger(BaseTestCase):
             },
         ]
     }
+    TEST_KUBE_CONFIG_PART4 = {
+        "current-context": "no_user",
+    }
 
     def _create_multi_config(self):
         files = []
         for part in (
                 self.TEST_KUBE_CONFIG_PART1,
                 self.TEST_KUBE_CONFIG_PART2,
-                self.TEST_KUBE_CONFIG_PART3):
+                self.TEST_KUBE_CONFIG_PART3,
+                self.TEST_KUBE_CONFIG_PART4):
             files.append(self._create_temp_file(yaml.safe_dump(part)))
         return ENV_KUBECONFIG_PATH_SEPARATOR.join(files)
 

From 7ce0198af22d105f3ae2dfbfeb99cb61384c7c63 Mon Sep 17 00:00:00 2001
From: Richard Godden <7768980+goddenrich@users.noreply.github.com>
Date: Mon, 23 Sep 2019 17:57:50 +0100
Subject: [PATCH 2/2] default empty dict

---
 config/kube_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/kube_config.py b/config/kube_config.py
index 9f3df7ea..cee71b2a 100644
--- a/config/kube_config.py
+++ b/config/kube_config.py
@@ -586,7 +586,7 @@ def load_config(self, path):
             self.config_merged = ConfigNode(path, config_merged, path)
 
         for item in ('clusters', 'contexts', 'users'):
-            self._merge(item, config[item], path)
+            self._merge(item, config.get(item, {}), path)
         self.config_files[path] = config
 
     def _merge(self, item, add_cfg, path):