wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly format API key when set in an enviroment variable (#42202)

Browse source 
(cherry picked from commit 0421305254)
This commit is contained in:
Fabian von Feilitzsch 2018-07-13 16:31:22 -04:00 committed by Matt Clay
parent 18ef94d56c
commit 134ed24474
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/module_utils/k8s/common.py
View file

@ -138,8 +138,11 @@ class K8sAnsibleMixin(object):
elif key in auth_args and value is None:
env_value = os.getenv('K8S_AUTH_{0}'.format(key.upper()), None)
if env_value is not None:
setattr(configuration, key, env_value)
auth[key] = env_value
if key == 'api_key':
setattr(configuration, key, {'authorization': "Bearer {0}".format(env_value)})
else:
setattr(configuration, key, env_value)
auth[key] = env_value
kubernetes.client.Configuration.set_default(configuration)