Skip to content

Commit 2272482

Browse files
committed
set proxy first
1 parent 06faf24 commit 2272482

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

ocp_resources/resource.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ def get_client(
107107
Returns:
108108
DynamicClient: a kubernetes client.
109109
"""
110+
proxy = os.environ.get("HTTPS_PROXY") or os.environ.get("HTTP_PROXY")
111+
112+
client_configuration = client_configuration or kubernetes.client.Configuration()
113+
114+
if not client_configuration.proxy and proxy:
115+
LOGGER.info(f"Setting proxy from environment variable: {proxy}")
116+
client_configuration.proxy = proxy
117+
110118
# Ref: https://github.com/kubernetes-client/python/blob/v26.1.0/kubernetes/base/config/kube_config.py
111119
if config_dict:
112120
_client = kubernetes.config.new_client_from_config_dict(
@@ -132,12 +140,6 @@ def get_client(
132140
persist_config=persist_config,
133141
)
134142

135-
proxy = os.environ.get("HTTPS_PROXY") or os.environ.get("HTTP_PROXY")
136-
137-
if not _client.configuration.proxy and proxy:
138-
LOGGER.info(f"Setting proxy from environment variable: {proxy}")
139-
_client.configuration.proxy = proxy
140-
141143
try:
142144
return kubernetes.dynamic.DynamicClient(client=_client)
143145
except MaxRetryError:

0 commit comments

Comments
 (0)