Skip to content

Commit 6672f50

Browse files
authored
Get kubeconfig config file from os env if not passed to get_client (#321)
* Get kubeconfig config file from os env if not passed to get_client * remove print * remove newline
1 parent c49bc91 commit 6672f50

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ocp_utilities/infra.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ def get_client(config_file=None, config_dict=None, context=None, **kwargs):
5656
try:
5757
# Ref: https://github.com/kubernetes-client/python/blob/v26.1.0/kubernetes/base/config/__init__.py
5858
LOGGER.info("Trying to get client via new_client_from_config")
59+
60+
# kubernetes.config.kube_config.load_kube_config sets KUBE_CONFIG_DEFAULT_LOCATION during module import.
61+
# If `KUBECONFIG` environment variable is set via code, the `KUBE_CONFIG_DEFAULT_LOCATION` will be None since
62+
# is populated during import which comes before setting the variable in code.
63+
config_file = config_file or os.environ.get("KUBECONFIG", "~/.kube/config")
5964
return kubernetes.dynamic.DynamicClient(
6065
client=kubernetes.config.new_client_from_config(config_file=config_file, context=context, **kwargs)
6166
)

0 commit comments

Comments
 (0)