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

Commit 27a1b81

Browse files
committed
Re-using the _get_kube_config_loader in _get_kube_config_loader_for_yaml_file
1 parent ab51510 commit 27a1b81

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

Diff for: config/kube_config.py

+8-17
Original file line numberDiff line numberDiff line change
@@ -688,28 +688,19 @@ def save_config(self, path):
688688
yaml.safe_dump(self.config_files[path], f,
689689
default_flow_style=False)
690690

691-
692691
def _get_kube_config_loader_for_yaml_file(
693692
filename, persist_config=False, **kwargs):
694-
695-
kcfg = KubeConfigMerger(filename)
696-
if persist_config and 'config_persister' not in kwargs:
697-
kwargs['config_persister'] = kcfg.save_changes
698-
699-
if kcfg.config is None:
700-
raise ConfigException(
701-
'Invalid kube-config file. '
702-
'No configuration found.')
703-
704-
return KubeConfigLoader(
705-
config_dict=kcfg.config,
706-
config_base_path=None,
693+
return _get_kube_config_loader(
694+
filename=filename,
695+
persist_config=persist_config,
707696
**kwargs)
708697

709698
def _get_kube_config_loader(
710-
filename=None,config_dict=None, persist_config=False, **kwargs):
711-
712-
if (config_dict is None):
699+
filename=None,
700+
config_dict=None,
701+
persist_config=False,
702+
**kwargs):
703+
if config_dict is None:
713704
kcfg = KubeConfigMerger(filename)
714705
if persist_config and 'config_persister' not in kwargs:
715706
kwargs['config_persister'] = kcfg.save_changes

0 commit comments

Comments
 (0)