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

Commit d4af6ee

Browse files
committed
remove required idp-certificate-authority-data in kubeconfig for oidc toke refresh, kubernetes-client/python#493
fix pep8 style
1 parent 5784a38 commit d4af6ee

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

config/kube_config.py

+19-14
Original file line numberDiff line numberDiff line change
@@ -255,22 +255,27 @@ def _load_oid_token(self):
255255
return self.token
256256

257257
def _refresh_oidc(self, provider):
258-
ca_cert = tempfile.NamedTemporaryFile(delete=True)
258+
config = Configuration()
259259

260-
if PY3:
261-
cert = base64.b64decode(
262-
provider['config']['idp-certificate-authority-data']
263-
).decode('utf-8')
264-
else:
265-
cert = base64.b64decode(
266-
provider['config']['idp-certificate-authority-data'] + "=="
267-
)
260+
if 'idp-certificate-authority-data' in provider['config']:
261+
ca_cert = tempfile.NamedTemporaryFile(delete=True)
268262

269-
with open(ca_cert.name, 'w') as fh:
270-
fh.write(cert)
263+
if PY3:
264+
cert = base64.b64decode(
265+
provider['config']['idp-certificate-authority-data']
266+
).decode('utf-8')
267+
else:
268+
cert = base64.b64decode(
269+
provider['config']['idp-certificate-authority-data'] + "=="
270+
)
271271

272-
config = Configuration()
273-
config.ssl_ca_cert = ca_cert.name
272+
with open(ca_cert.name, 'w') as fh:
273+
fh.write(cert)
274+
275+
config.ssl_ca_cert = ca_cert.name
276+
277+
else:
278+
config.verify_ssl = False
274279

275280
client = ApiClient(configuration=config)
276281

@@ -301,7 +306,7 @@ def _refresh_oidc(self, provider):
301306
refresh_token=provider['config']['refresh-token'],
302307
auth=(provider['config']['client-id'],
303308
provider['config']['client-secret']),
304-
verify=ca_cert.name
309+
verify=config.ssl_ca_cert if config.verify_ssl else None
305310
)
306311
except oauthlib.oauth2.rfc6749.errors.InvalidClientIdError:
307312
return

0 commit comments

Comments
 (0)