kubernetes-client/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #158 from qlemaire22/master

Browse Source 
Check is not None in safe_get
This commit is contained in:
Kubernetes Prow Robot 2019-09-20 13:41:27 -07:00 committed by GitHub
commit af42f24d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/kube_config.py
View File

@ -140,7 +140,11 @@ class KubeConfigLoader(object):
config_base_path="",
config_persister=None):
if isinstance(config_dict, ConfigNode):
if config_dict is None:
raise ConfigException(
'Invalid kube-config. '
'Expected config_dict to not be None.')
elif isinstance(config_dict, ConfigNode):
self._config = config_dict
else:
self._config = ConfigNode('kube-config', config_dict)
@ -613,6 +617,11 @@ def _get_kube_config_loader_for_yaml_file(
if persist_config and 'config_persister' not in kwargs:
kwargs['config_persister'] = kcfg.save_changes()
if kcfg.config is None:
raise ConfigException(
'Invalid kube-config file. '
'No configuration found.')
return KubeConfigLoader(
config_dict=kcfg.config,
config_base_path=None,