From 999e742da73204f5fe556b1aafc73459df5135dc Mon Sep 17 00:00:00 2001 From: micw523 Date: Sun, 11 Nov 2018 15:52:32 -0500 Subject: [PATCH] remove absolute dependence of adal in config --- config/kube_config.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/kube_config.py b/config/kube_config.py index 305b2e0a..de717c2d 100644 --- a/config/kube_config.py +++ b/config/kube_config.py @@ -21,7 +21,11 @@ import tempfile import time -import adal +try: + import adal +except ImportError: + pass + import google.auth import google.auth.transport.requests import oauthlib.oauth2 @@ -202,7 +206,13 @@ def _load_auth_provider_token(self): if provider['name'] == 'gcp': return self._load_gcp_token(provider) if provider['name'] == 'azure': - return self._load_azure_token(provider) + try: + if 'adal' not in globals(): + raise ImportError("Package adal is not installed. Please install this package using pip install kubernetes[adal] or install adal separately.") + else: + return self._load_azure_token(provider) + except ImportError as e: + logging.error(str(e)) if provider['name'] == 'oidc': return self._load_oid_token(provider)