Skip to content

Commit 6d785aa

Browse files
yliaogyliaog
committed
generated client change
1 parent b0dbe41 commit 6d785aa

File tree

10 files changed

+150
-71
lines changed

10 files changed

+150
-71
lines changed

‎kubernetes/.openapi-generator/swagger.json.sha256‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f4253abb4471ec2c5e92abaf7ead7de7739d6506a23c8af199332a47c03cb642
1+
c4a1b3550c60b1f3c01ed9c12eafcbdb4b8d75964f76a1971a138019d1db0f4e

‎kubernetes/README.md‎

Lines changed: 89 additions & 20 deletions
Large diffs are not rendered by default.

‎kubernetes/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
__project__ = 'kubernetes'
1616
# The version is auto-updated. Please do not edit.
17-
__version__ = "19.0.0-snapshot"
17+
__version__ = "20.0.0-snapshot"
1818

1919
import kubernetes.client
2020
import kubernetes.config

‎kubernetes/client/__init__.py‎

Lines changed: 49 additions & 9 deletions
Large diffs are not rendered by default.

‎kubernetes/client/api_client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501
66
7-
The version of the OpenAPI document: release-1.19
7+
The version of the OpenAPI document: release-1.20
88
Generated by: https://openapi-generator.tech
99
"""
1010

@@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
7878
self.default_headers[header_name] = header_value
7979
self.cookie = cookie
8080
# Set default User-Agent.
81-
self.user_agent = 'OpenAPI-Generator/19.0.0-snapshot/python'
81+
self.user_agent = 'OpenAPI-Generator/20.0.0-snapshot/python'
8282
self.client_side_validation = configuration.client_side_validation
8383

8484
def __enter__(self):

‎kubernetes/client/configuration.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501
77
8-
The version of the OpenAPI document: release-1.19
8+
The version of the OpenAPI document: release-1.20
99
Generated by: https://openapi-generator.tech
1010
"""
1111

@@ -156,9 +156,6 @@ def __init__(self, host="http://localhost",
156156
self.proxy = None
157157
"""Proxy URL
158158
"""
159-
self.no_proxy = None
160-
"""bypass proxy for host in the no_proxy list.
161-
"""
162159
self.proxy_headers = None
163160
"""Proxy headers
164161
"""
@@ -349,8 +346,8 @@ def to_debug_report(self):
349346
return "Python SDK Debug Report:\n"\
350347
"OS: {env}\n"\
351348
"Python Version: {pyversion}\n"\
352-
"Version of the API: release-1.19\n"\
353-
"SDK Package Version: 19.0.0-snapshot".\
349+
"Version of the API: release-1.20\n"\
350+
"SDK Package Version: 20.0.0-snapshot".\
354351
format(env=sys.platform, pyversion=sys.version)
355352

356353
def get_host_settings(self):

‎kubernetes/client/exceptions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501
77
8-
The version of the OpenAPI document: release-1.19
8+
The version of the OpenAPI document: release-1.20
99
Generated by: https://openapi-generator.tech
1010
"""
1111

‎kubernetes/client/rest.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) # noqa: E501
77
8-
The version of the OpenAPI document: release-1.19
8+
The version of the OpenAPI document: release-1.20
99
Generated by: https://openapi-generator.tech
1010
"""
1111

@@ -25,7 +25,6 @@
2525
import urllib3
2626

2727
from kubernetes.client.exceptions import ApiException, ApiValueError
28-
from requests.utils import should_bypass_proxies
2928

3029

3130
logger = logging.getLogger(__name__)
@@ -84,7 +83,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
8483
maxsize = 4
8584

8685
# https pool manager
87-
if configuration.proxy and not should_bypass_proxies(configuration.host, no_proxy=configuration.no_proxy or ''):
86+
if configuration.proxy:
8887
self.pool_manager = urllib3.ProxyManager(
8988
num_pools=pools_size,
9089
maxsize=maxsize,

‎kubernetes/test/test_api_client.py‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import unittest
77

88
import kubernetes
9-
from kubernetes.client.configuration import Configuration
10-
import urllib3
9+
1110

1211
class TestApiClient(unittest.TestCase):
1312

@@ -24,28 +23,3 @@ def test_atexit_closes_threadpool(self):
2423
self.assertIsNotNone(client._pool)
2524
atexit._run_exitfuncs()
2625
self.assertIsNone(client._pool)
27-
28-
def test_rest_proxycare(self):
29-
30-
pool = { 'proxy': urllib3.ProxyManager, 'direct': urllib3.PoolManager }
31-
32-
for dst, proxy, no_proxy, expected_pool in [
33-
( 'http://kube.local/', None, None, pool['direct']),
34-
( 'http://kube.local/', 'http://proxy.local:8080/', None, pool['proxy']),
35-
( 'http://127.0.0.1:8080/', 'http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['direct']),
36-
( 'http://kube.local/', 'http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['direct']),
37-
( 'http://kube.others.com:1234/','http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['proxy']),
38-
( 'http://kube.others.com:1234/','http://proxy.local:8080/', '*', pool['direct']),
39-
]:
40-
# setup input
41-
config = Configuration()
42-
setattr(config, 'host', dst)
43-
if proxy is not None:
44-
setattr(config, 'proxy', proxy)
45-
if no_proxy is not None:
46-
setattr(config, 'no_proxy', no_proxy)
47-
# setup done
48-
49-
# test
50-
client = kubernetes.client.ApiClient(configuration=config)
51-
self.assertEqual( expected_pool, type(client.rest_client.pool_manager) )

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# Do not edit these constants. They will be updated automatically
1818
# by scripts/update-client.sh.
19-
CLIENT_VERSION = "19.0.0-snapshot"
19+
CLIENT_VERSION = "20.0.0-snapshot"
2020
PACKAGE_NAME = "kubernetes"
2121
DEVELOPMENT_STATUS = "3 - Alpha"
2222

0 commit comments

Comments
 (0)