From 1b1ef522d1227ab5edee15aa241672960f4c7484 Mon Sep 17 00:00:00 2001 From: Felix Eckhardt Date: Mon, 1 May 2017 14:36:41 +1000 Subject: [PATCH 1/2] added configuration 'http_proxy' to allow the usage of a proxy --- kubernetes/client/configuration.py | 3 +++ kubernetes/client/rest.py | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py index bf0fd73343..ee06e0b00e 100644 --- a/kubernetes/client/configuration.py +++ b/kubernetes/client/configuration.py @@ -89,6 +89,9 @@ def __init__(self): # Set this to True/False to enable/disable SSL hostname verification. self.assert_hostname = None + # http proxy setting + self.http_proxy = None + @property def logger_file(self): """ diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py index 826d4467b4..fba059c8a3 100644 --- a/kubernetes/client/rest.py +++ b/kubernetes/client/rest.py @@ -107,9 +107,14 @@ def __init__(self, pools_size=4, config=configuration): kwargs['assert_hostname'] = config.assert_hostname # https pool manager - self.pool_manager = urllib3.PoolManager( - **kwargs - ) + if config.http_proxy is not None: + self.pool_manager = urllib3.proxy_from_url( + config.http_proxy, **kwargs + ) + else: + self.pool_manager = urllib3.PoolManager( + **kwargs + ) def request(self, method, url, query_params=None, headers=None, body=None, post_params=None, _preload_content=True, _request_timeout=None): From eb374c4533224151fa202a2a2b8e1b7adf458df3 Mon Sep 17 00:00:00 2001 From: Felix Eckhardt Date: Wed, 10 May 2017 10:32:57 +1000 Subject: [PATCH 2/2] renamed configuration to http_proxy_url --- kubernetes/client/configuration.py | 2 +- kubernetes/client/rest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py index ee06e0b00e..886d37897c 100644 --- a/kubernetes/client/configuration.py +++ b/kubernetes/client/configuration.py @@ -90,7 +90,7 @@ def __init__(self): self.assert_hostname = None # http proxy setting - self.http_proxy = None + self.http_proxy_url = None @property def logger_file(self): diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py index fba059c8a3..c4eb11a37b 100644 --- a/kubernetes/client/rest.py +++ b/kubernetes/client/rest.py @@ -107,9 +107,9 @@ def __init__(self, pools_size=4, config=configuration): kwargs['assert_hostname'] = config.assert_hostname # https pool manager - if config.http_proxy is not None: + if config.http_proxy_url is not None: self.pool_manager = urllib3.proxy_from_url( - config.http_proxy, **kwargs + config.http_proxy_url, **kwargs ) else: self.pool_manager = urllib3.PoolManager(