Skip to content
This repository has been archived by the owner on Mar 13, 2022. It is now read-only.

fix cfg is none, load kube config error #198

Merged
merged 2 commits into from
Jun 25, 2020
Merged

fix cfg is none, load kube config error #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff79da
fix cfg is none, load kube config error
ACXLM Jun 2, 2020
30d9e2a
change test case
ACXLM Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/kube_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,8 @@ def load_config(self, path):
for item in ('clusters', 'contexts', 'users'):
config_merged[item] = []
self.config_merged = ConfigNode(path, config_merged, path)

for item in ('clusters', 'contexts', 'users'):
self._merge(item, config.get(item, {}), path)
self._merge(item, config.get(item, []) or [], path)
self.config_files[path] = config

def _merge(self, item, add_cfg, path):
Expand Down
25 changes: 23 additions & 2 deletions config/kube_config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ def test__get_kube_config_loader_for_yaml_file_persist(self):
actual = _get_kube_config_loader_for_yaml_file(config_file,
persist_config=True)
self.assertTrue(callable(actual._config_persister))
self.assertEquals(actual._config_persister.__name__, "save_changes")
self.assertEqual(actual._config_persister.__name__, "save_changes")


class TestKubernetesClientConfiguration(BaseTestCase):
Expand Down Expand Up @@ -1517,6 +1517,26 @@ class TestKubeConfigMerger(BaseTestCase):
}
]
}
TEST_KUBE_CONFIG_PART6 = {
"current-context": "no_user",
"contexts": [
{
"name": "no_user",
"context": {
"cluster": "default"
}
},
],
"clusters": [
{
"name": "default",
"cluster": {
"server": TEST_HOST
}
},
],
"users": None
}

def _create_multi_config(self):
files = []
Expand All @@ -1525,7 +1545,8 @@ def _create_multi_config(self):
self.TEST_KUBE_CONFIG_PART2,
self.TEST_KUBE_CONFIG_PART3,
self.TEST_KUBE_CONFIG_PART4,
self.TEST_KUBE_CONFIG_PART5):
self.TEST_KUBE_CONFIG_PART5,
self.TEST_KUBE_CONFIG_PART6):
files.append(self._create_temp_file(yaml.safe_dump(part)))
return ENV_KUBECONFIG_PATH_SEPARATOR.join(files)

Expand Down