fix cfg is none, load kube config error

Signed-off-by: zhu hui <hui.zhu@daocloud.io>
This commit is contained in:
ACXLM 2020-06-02 13:55:43 +08:00
parent 49ec06096e
commit 3ff79da50c

View File

@ -663,9 +663,8 @@ class KubeConfigMerger:
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):