From 068a541d88b4abd6c61e4c50ada2b82ae49326fe Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Sun, 24 Oct 2021 21:01:41 -0700 Subject: [PATCH] generated client change --- kubernetes/README.md | 2 +- kubernetes/__init__.py | 2 +- kubernetes/client/__init__.py | 2 +- kubernetes/client/api_client.py | 2 +- kubernetes/client/configuration.py | 5 +---- kubernetes/client/rest.py | 3 +-- kubernetes/test/test_api_client.py | 28 +--------------------------- setup.py | 4 ++-- 8 files changed, 9 insertions(+), 39 deletions(-) diff --git a/kubernetes/README.md b/kubernetes/README.md index 700930725c..81665d6a75 100644 --- a/kubernetes/README.md +++ b/kubernetes/README.md @@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: release-1.19 -- Package version: 19.15.0b1 +- Package version: 19.15.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/kubernetes/__init__.py b/kubernetes/__init__.py index f3dd46bd13..1957be4ce8 100644 --- a/kubernetes/__init__.py +++ b/kubernetes/__init__.py @@ -14,7 +14,7 @@ __project__ = 'kubernetes' # The version is auto-updated. Please do not edit. -__version__ = "19.15.0b1" +__version__ = "19.15.0" import kubernetes.client import kubernetes.config diff --git a/kubernetes/client/__init__.py b/kubernetes/client/__init__.py index 51689de28c..66bb740e1a 100644 --- a/kubernetes/client/__init__.py +++ b/kubernetes/client/__init__.py @@ -14,7 +14,7 @@ from __future__ import absolute_import -__version__ = "19.15.0b1" +__version__ = "19.15.0" # import apis into sdk package from kubernetes.client.api.admissionregistration_api import AdmissionregistrationApi diff --git a/kubernetes/client/api_client.py b/kubernetes/client/api_client.py index 9bb973bfd7..b9699c74fd 100644 --- a/kubernetes/client/api_client.py +++ b/kubernetes/client/api_client.py @@ -78,7 +78,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None, self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'OpenAPI-Generator/19.15.0b1/python' + self.user_agent = 'OpenAPI-Generator/19.15.0/python' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/kubernetes/client/configuration.py b/kubernetes/client/configuration.py index 4dc1a0bfd6..d6b8f5f6e3 100644 --- a/kubernetes/client/configuration.py +++ b/kubernetes/client/configuration.py @@ -156,9 +156,6 @@ def __init__(self, host="http://localhost", self.proxy = None """Proxy URL """ - self.no_proxy = None - """bypass proxy for host in the no_proxy list. - """ self.proxy_headers = None """Proxy headers """ @@ -350,7 +347,7 @@ def to_debug_report(self): "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: release-1.19\n"\ - "SDK Package Version: 19.15.0b1".\ + "SDK Package Version: 19.15.0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/kubernetes/client/rest.py b/kubernetes/client/rest.py index 9e1b3859d5..2f3241611e 100644 --- a/kubernetes/client/rest.py +++ b/kubernetes/client/rest.py @@ -25,7 +25,6 @@ import urllib3 from kubernetes.client.exceptions import ApiException, ApiValueError -from requests.utils import should_bypass_proxies logger = logging.getLogger(__name__) @@ -84,7 +83,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None): maxsize = 4 # https pool manager - if configuration.proxy and not should_bypass_proxies(configuration.host, no_proxy=configuration.no_proxy or ''): + if configuration.proxy: self.pool_manager = urllib3.ProxyManager( num_pools=pools_size, maxsize=maxsize, diff --git a/kubernetes/test/test_api_client.py b/kubernetes/test/test_api_client.py index 486b4ac5b8..f0a9416cf7 100644 --- a/kubernetes/test/test_api_client.py +++ b/kubernetes/test/test_api_client.py @@ -6,8 +6,7 @@ import unittest import kubernetes -from kubernetes.client.configuration import Configuration -import urllib3 + class TestApiClient(unittest.TestCase): @@ -24,28 +23,3 @@ def test_atexit_closes_threadpool(self): self.assertIsNotNone(client._pool) atexit._run_exitfuncs() self.assertIsNone(client._pool) - - def test_rest_proxycare(self): - - pool = { 'proxy': urllib3.ProxyManager, 'direct': urllib3.PoolManager } - - for dst, proxy, no_proxy, expected_pool in [ - ( 'http://kube.local/', None, None, pool['direct']), - ( 'http://kube.local/', 'http://proxy.local:8080/', None, pool['proxy']), - ( 'http://127.0.0.1:8080/', 'http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['direct']), - ( 'http://kube.local/', 'http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['direct']), - ( 'http://kube.others.com:1234/','http://proxy.local:8080/', 'localhost,127.0.0.0/8,.local', pool['proxy']), - ( 'http://kube.others.com:1234/','http://proxy.local:8080/', '*', pool['direct']), - ]: - # setup input - config = Configuration() - setattr(config, 'host', dst) - if proxy is not None: - setattr(config, 'proxy', proxy) - if no_proxy is not None: - setattr(config, 'no_proxy', no_proxy) - # setup done - - # test - client = kubernetes.client.ApiClient(configuration=config) - self.assertEqual( expected_pool, type(client.rest_client.pool_manager) ) diff --git a/setup.py b/setup.py index f8e72906fd..ad126889be 100644 --- a/setup.py +++ b/setup.py @@ -16,9 +16,9 @@ # Do not edit these constants. They will be updated automatically # by scripts/update-client.sh. -CLIENT_VERSION = "19.15.0b1" +CLIENT_VERSION = "19.15.0" PACKAGE_NAME = "kubernetes" -DEVELOPMENT_STATUS = "4 - Beta" +DEVELOPMENT_STATUS = "5 - Production/Stable" # To install the library, run the following #