Merge pull request kubernetes-client#779 from chowmean/proxy-header-option

k8s-ci-robot · web-flow · commit 374233d05c78 · 2019-03-15T15:26:57.000-07:00
Adding proxy headers options for configurations.
diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py
@@ -101,6 +101,8 @@ def __init__(self):
 
         # Proxy URL
         self.proxy = None
+        # Proxy Headers
+        self.proxy_headers = None
         # Safe chars for path_param
         self.safe_chars_for_path_param = ''
 
diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py
@@ -96,6 +96,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
                 cert_file=configuration.cert_file,
                 key_file=configuration.key_file,
                 proxy_url=configuration.proxy,
+                proxy_headers=configuration.proxy_headers,
                 **addition_pool_args
             )
         else:

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None):`
`96`	`96`	`cert_file=configuration.cert_file,`
`97`	`97`	`key_file=configuration.key_file,`
`98`	`98`	`proxy_url=configuration.proxy,`
	`99`	`+ proxy_headers=configuration.proxy_headers,`
`99`	`100`	`**addition_pool_args`
`100`	`101`	`)`
`101`	`102`	`else:`