valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify connection setup logic

Browse Source
This commit is contained in:
Michael Calmer 2018-03-01 10:16:09 +01:00
parent 46f88d5f50
commit 453b3d26a6
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/kubernetes.py
View File

@ -104,22 +104,11 @@ def _setup_conn(**kwargs):
'''
Setup kubernetes API connection singleton
'''
kubeconfig = __salt__['config.option']('kubernetes.kubeconfig')
kubeconfig_data = __salt__['config.option']('kubernetes.kubeconfig-data')
context = __salt__['config.option']('kubernetes.context')
kubeconfig = kwargs.get('kubeconfig') or __salt__['config.option']('kubernetes.kubeconfig')
kubeconfig_data = kwargs.get('kubeconfig_data') or __salt__['config.option']('kubernetes.kubeconfig-data')
context = kwargs.get('context') or __salt__['config.option']('kubernetes.context')
kubeconfig_data_overwrite = False
# Override default API settings when settings are provided
if 'kubeconfig' in kwargs:
kubeconfig = kwargs.get('kubeconfig')
elif 'kubeconfig_data' in kwargs:
kubeconfig_data = kwargs.get('kubeconfig_data')
kubeconfig_data_overwrite = True
if 'context' in kwargs:
context = kwargs.get('context')
if (kubeconfig_data and not kubeconfig) or (kubeconfig_data and kubeconfig_data_overwrite):
if (kubeconfig_data and not kubeconfig) or (kubeconfig_data and kwargs.get('kubeconfig_data')):
with tempfile.NamedTemporaryFile(prefix='salt-kubeconfig-', delete=False) as kcfg:
kcfg.write(base64.b64decode(kubeconfig_data))
kubeconfig = kcfg.name