Skip to content

Commit c73467e

Browse files
authored
Use local logger instance to prevent reconfiguring user's logger (#271)
* Use local logger instance to prevent reconfiguring user's logger * fix linter issue
1 parent a2a2986 commit c73467e

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

kubernetes_asyncio/config/kube_config.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
ENV_KUBECONFIG_PATH_SEPARATOR = ';' if platform.system() == 'Windows' else ':'
3939
PROVIDER_TYPE_OIDC = 'oidc'
4040
_temp_files = {}
41+
logger = logging.getLogger(__name__)
4142

4243

4344
def _cleanup_temp_files():
@@ -174,11 +175,11 @@ def set_active_context(self, context_name=None):
174175
if self._user is not None and 'auth-provider' in self._user and 'name' in self._user['auth-provider']:
175176
self.provider = self._user['auth-provider']['name']
176177

177-
logging.debug('kubeconfig loader - current-context %s, cluster %s, user %s, provider %s',
178-
context_name,
179-
self._current_context['context']['cluster'],
180-
self._current_context['context'].safe_get('user'),
181-
self.provider)
178+
logger.debug('kubeconfig loader - current-context %s, cluster %s, user %s, provider %s',
179+
context_name,
180+
self._current_context['context']['cluster'],
181+
self._current_context['context'].safe_get('user'),
182+
self.provider)
182183

183184
async def _load_authentication(self):
184185
"""Read authentication from kube-config user section if exists.
@@ -195,7 +196,7 @@ async def _load_authentication(self):
195196
"""
196197

197198
if not self._user:
198-
logging.debug('No user section in current context.')
199+
logger.debug('No user section in current context.')
199200
return
200201

201202
if self.provider == 'gcp':
@@ -207,16 +208,16 @@ async def _load_authentication(self):
207208
return
208209

209210
if 'exec' in self._user:
210-
logging.debug('Try to use exec provider')
211+
logger.debug('Try to use exec provider')
211212
res_exec_plugin = await self.load_from_exec_plugin()
212213
if res_exec_plugin:
213214
return
214215

215-
logging.debug('Try to load user token')
216+
logger.debug('Try to load user token')
216217
if self._load_user_token():
217218
return
218219

219-
logging.debug('Try to use username and password')
220+
logger.debug('Try to use username and password')
220221
self._load_user_pass_token()
221222

222223
async def load_gcp_token(self):
@@ -315,14 +316,14 @@ async def load_from_exec_plugin(self):
315316
return True
316317
status = await ExecProvider(self._user['exec']).run()
317318
if 'token' not in status:
318-
logging.error('exec: missing token field in plugin output')
319+
logger.error('exec: missing token field in plugin output')
319320
return None
320321
self.token = "Bearer %s" % status['token']
321322
if 'expirationTimestamp' in status:
322323
self.exec_plugin_expiry = parse_rfc3339(status['expirationTimestamp'])
323324
return True
324325
except Exception as e:
325-
logging.error(str(e))
326+
logger.error(str(e))
326327

327328
def _load_user_token(self):
328329
base_path = self._get_base_path(self._user.path)
@@ -483,7 +484,7 @@ def __init__(self, paths):
483484
file_loaded = True
484485
self.config_saved = copy.deepcopy(self.config_files)
485486
if not file_loaded:
486-
logging.warning('Config not found: %s', paths)
487+
logger.warning('Config not found: %s', paths)
487488

488489
@property
489490
def config(self):

kubernetes_asyncio/dynamic/discovery.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
from .resource import Resource, ResourceList
3434

3535
DISCOVERY_PREFIX = 'apis'
36+
logger = logging.getLogger(__name__)
3637

3738

3839
class Discoverer(object):
@@ -78,7 +79,7 @@ async def __init_cache(self, refresh=False):
7879
# Version mismatch, need to refresh cache
7980
await self.invalidate_cache()
8081
except Exception as e:
81-
logging.error("load cache error: %s", e)
82+
logger.error("load cache error: %s", e)
8283
await self.invalidate_cache()
8384
await self._load_server_info()
8485
await self.discover()

0 commit comments

Comments
 (0)