diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py index 5e150b4..bcc1cf3 100644 --- a/kubernetes/client/configuration.py +++ b/kubernetes/client/configuration.py @@ -11,6 +11,7 @@ import copy +import ssl import http.client as httplib import logging from logging import FileHandler @@ -173,6 +174,7 @@ class Configuration: :param proxy: Proxy URL. :param no_proxy: Comma-separated hosts that bypass the proxy. :param proxy_headers: Proxy headers. + :param proxy_ssl_context: SSL context used only for the TLS handshake with the proxy itself, independent of the destination TLS settings. :param safe_chars_for_path_param: Safe characters for path parameter encoding. :param client_side_validation: Enable client-side validation. Default True. :param socket_options: Options to pass down to the underlying urllib3 socket. @@ -228,6 +230,7 @@ conf = client.Configuration( proxy: Optional[str]=None, no_proxy: Optional[str]=None, proxy_headers: Optional[Any]=None, + proxy_ssl_context: Optional[ssl.SSLContext]=None, safe_chars_for_path_param: str='', client_side_validation: bool=True, socket_options: Optional[Any]=None, @@ -351,6 +354,11 @@ conf = client.Configuration( self.proxy_headers = proxy_headers """Proxy headers """ + self.proxy_ssl_context = proxy_ssl_context + """SSL context used only for the TLS handshake with + the proxy itself (e.g. an HTTPS CONNECT tunnel), + independent of the destination TLS settings above. + """ self.safe_chars_for_path_param = safe_chars_for_path_param """Safe chars for path_param """ @@ -387,6 +395,9 @@ conf = client.Configuration( if callable(copy_method): setattr(result, k, copy_method()) continue + if k == 'proxy_ssl_context': + setattr(result, k, v) + continue setattr(result, k, copy.deepcopy(v, memo)) # Loggers and their handlers are process-global. diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py index 9fca6dc..04a812d 100644 --- a/kubernetes/client/rest.py +++ b/kubernetes/client/rest.py @@ -155,6 +155,10 @@ class RESTClientObject: else: pool_args["proxy_url"] = configuration.proxy pool_args["proxy_headers"] = configuration.proxy_headers + if configuration.proxy_ssl_context is not None: + pool_args["proxy_ssl_context"] = ( + configuration.proxy_ssl_context + ) self.pool_manager = urllib3.ProxyManager(**pool_args) else: self.pool_manager = urllib3.PoolManager(**pool_args)