zuul/nodepool
Code Issues Proposed changes

kubernetes: handle situation where the configuration is empty

Browse Source 
This change is a follow-up to I5bdd369f6c9a78e5f79a926d8690f285fda94af9
where it missed the case where the configuration could be None.

Change-Id: I613cbf82932e14a8048e4dcfbf539fe1d83bf9e3
This commit is contained in:
Tristan Cacqueray 2021-07-08 18:35:08 +00:00 committed by Clark Boylan
parent 9757e3f1ce
commit 39ff609835
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodepool/driver/utils_k8s.py
View File

@ -41,10 +41,11 @@ def get_client(log, context, extra_client_constructor=None):
token, ca, client, extra_client = None, None, None, None token, ca, client, extra_client = None, None, None, None
try: try:
conf = _get_conf(log, context) conf = _get_conf(log, context)
auth = conf.configuration.api_key.get('authorization') if conf:
if auth: auth = conf.configuration.api_key.get('authorization')
token = auth.split()[-1] if auth:
if conf.configuration.ssl_ca_cert: token = auth.split()[-1]
if conf and conf.configuration.ssl_ca_cert:
with open(conf.configuration.ssl_ca_cert) as ca_file: with open(conf.configuration.ssl_ca_cert) as ca_file:
ca = ca_file.read() ca = ca_file.read()
ca = base64.b64encode(ca.encode('utf-8')).decode('utf-8') ca = base64.b64encode(ca.encode('utf-8')).decode('utf-8')

6
releasenotes/notes/fix-k8s-conf-loading-a54a371a3392f665.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fix Kubernetes in-cluster configuration loading if no local config
is present. The previous release missed a fallback case which has
been corrected.