Nest async client under kubernetes.aio to fix kubernetes-asyncio collision

examples_asyncio/in_cluster_config.py

@@ -53,7 +53,7 @@
 import sys
 import traceback
 
-from kubernetes_asyncio import client, config
+from kubernetes.aio import client, config
 
 
 async def main():

examples_asyncio/list_pods.py

@@ -1,7 +1,7 @@
 import asyncio
 
-from kubernetes_asyncio import client, config
-from kubernetes_asyncio.client.api_client import ApiClient
+from kubernetes.aio import client, config
+from kubernetes.aio.client.api_client import ApiClient
 
 
 async def main():

examples_asyncio/patch.py

@@ -1,7 +1,7 @@
 import asyncio
 
-from kubernetes_asyncio import client, config
-from kubernetes_asyncio.client.api_client import ApiClient
+from kubernetes.aio import client, config
+from kubernetes.aio.client.api_client import ApiClient
 
 SERVICE_NAME = "example-service"
 SERVICE_NS = "default"

kubernetes/__init__.py

@@ -24,3 +24,7 @@
 from . import utils
 from . import leaderelection
 from . import informer
+try:
+    from . import aio
+except ImportError:
+    pass

kubernetes_asyncio/__init__.py

@@ -16,6 +16,6 @@
 # The version is auto-updated. Please do not edit.
 __version__ = "36.0.0+snapshot"
 
-import kubernetes_asyncio.client as client
+from . import client
 
 __all__ = ["client"]

kubernetes_asyncio/client/api/__init__.py

@@ -3,68 +3,68 @@
 # flake8: noqa
 
 # import apis into api package
-from kubernetes_asyncio.client.api.well_known_api import WellKnownApi
-from kubernetes_asyncio.client.api.admissionregistration_api import AdmissionregistrationApi
-from kubernetes_asyncio.client.api.admissionregistration_v1_api import AdmissionregistrationV1Api
-from kubernetes_asyncio.client.api.admissionregistration_v1alpha1_api import AdmissionregistrationV1alpha1Api
-from kubernetes_asyncio.client.api.admissionregistration_v1beta1_api import AdmissionregistrationV1beta1Api
-from kubernetes_asyncio.client.api.apiextensions_api import ApiextensionsApi
-from kubernetes_asyncio.client.api.apiextensions_v1_api import ApiextensionsV1Api
-from kubernetes_asyncio.client.api.apiregistration_api import ApiregistrationApi
-from kubernetes_asyncio.client.api.apiregistration_v1_api import ApiregistrationV1Api
-from kubernetes_asyncio.client.api.apis_api import ApisApi
-from kubernetes_asyncio.client.api.apps_api import AppsApi
-from kubernetes_asyncio.client.api.apps_v1_api import AppsV1Api
-from kubernetes_asyncio.client.api.authentication_api import AuthenticationApi
-from kubernetes_asyncio.client.api.authentication_v1_api import AuthenticationV1Api
-from kubernetes_asyncio.client.api.authorization_api import AuthorizationApi
-from kubernetes_asyncio.client.api.authorization_v1_api import AuthorizationV1Api
-from kubernetes_asyncio.client.api.autoscaling_api import AutoscalingApi
-from kubernetes_asyncio.client.api.autoscaling_v1_api import AutoscalingV1Api
-from kubernetes_asyncio.client.api.autoscaling_v2_api import AutoscalingV2Api
-from kubernetes_asyncio.client.api.batch_api import BatchApi
-from kubernetes_asyncio.client.api.batch_v1_api import BatchV1Api
-from kubernetes_asyncio.client.api.certificates_api import CertificatesApi
-from kubernetes_asyncio.client.api.certificates_v1_api import CertificatesV1Api
-from kubernetes_asyncio.client.api.certificates_v1alpha1_api import CertificatesV1alpha1Api
-from kubernetes_asyncio.client.api.certificates_v1beta1_api import CertificatesV1beta1Api
-from kubernetes_asyncio.client.api.coordination_api import CoordinationApi
-from kubernetes_asyncio.client.api.coordination_v1_api import CoordinationV1Api
-from kubernetes_asyncio.client.api.coordination_v1alpha2_api import CoordinationV1alpha2Api
-from kubernetes_asyncio.client.api.coordination_v1beta1_api import CoordinationV1beta1Api
-from kubernetes_asyncio.client.api.core_api import CoreApi
-from kubernetes_asyncio.client.api.core_v1_api import CoreV1Api
-from kubernetes_asyncio.client.api.custom_objects_api import CustomObjectsApi
-from kubernetes_asyncio.client.api.discovery_api import DiscoveryApi
-from kubernetes_asyncio.client.api.discovery_v1_api import DiscoveryV1Api
-from kubernetes_asyncio.client.api.events_api import EventsApi
-from kubernetes_asyncio.client.api.events_v1_api import EventsV1Api
-from kubernetes_asyncio.client.api.flowcontrol_apiserver_api import FlowcontrolApiserverApi
-from kubernetes_asyncio.client.api.flowcontrol_apiserver_v1_api import FlowcontrolApiserverV1Api
-from kubernetes_asyncio.client.api.internal_apiserver_api import InternalApiserverApi
-from kubernetes_asyncio.client.api.internal_apiserver_v1alpha1_api import InternalApiserverV1alpha1Api
-from kubernetes_asyncio.client.api.logs_api import LogsApi
-from kubernetes_asyncio.client.api.networking_api import NetworkingApi
-from kubernetes_asyncio.client.api.networking_v1_api import NetworkingV1Api
-from kubernetes_asyncio.client.api.networking_v1beta1_api import NetworkingV1beta1Api
-from kubernetes_asyncio.client.api.node_api import NodeApi
-from kubernetes_asyncio.client.api.node_v1_api import NodeV1Api
-from kubernetes_asyncio.client.api.openid_api import OpenidApi
-from kubernetes_asyncio.client.api.policy_api import PolicyApi
-from kubernetes_asyncio.client.api.policy_v1_api import PolicyV1Api
-from kubernetes_asyncio.client.api.rbac_authorization_api import RbacAuthorizationApi
-from kubernetes_asyncio.client.api.rbac_authorization_v1_api import RbacAuthorizationV1Api
-from kubernetes_asyncio.client.api.resource_api import ResourceApi
-from kubernetes_asyncio.client.api.resource_v1_api import ResourceV1Api
-from kubernetes_asyncio.client.api.resource_v1alpha3_api import ResourceV1alpha3Api
-from kubernetes_asyncio.client.api.resource_v1beta1_api import ResourceV1beta1Api
-from kubernetes_asyncio.client.api.resource_v1beta2_api import ResourceV1beta2Api
-from kubernetes_asyncio.client.api.scheduling_api import SchedulingApi
-from kubernetes_asyncio.client.api.scheduling_v1_api import SchedulingV1Api
-from kubernetes_asyncio.client.api.scheduling_v1alpha2_api import SchedulingV1alpha2Api
-from kubernetes_asyncio.client.api.storage_api import StorageApi
-from kubernetes_asyncio.client.api.storage_v1_api import StorageV1Api
-from kubernetes_asyncio.client.api.storage_v1beta1_api import StorageV1beta1Api
-from kubernetes_asyncio.client.api.storagemigration_api import StoragemigrationApi
-from kubernetes_asyncio.client.api.storagemigration_v1beta1_api import StoragemigrationV1beta1Api
-from kubernetes_asyncio.client.api.version_api import VersionApi
+from .well_known_api import WellKnownApi
+from .admissionregistration_api import AdmissionregistrationApi
+from .admissionregistration_v1_api import AdmissionregistrationV1Api
+from .admissionregistration_v1alpha1_api import AdmissionregistrationV1alpha1Api
+from .admissionregistration_v1beta1_api import AdmissionregistrationV1beta1Api
+from .apiextensions_api import ApiextensionsApi
+from .apiextensions_v1_api import ApiextensionsV1Api
+from .apiregistration_api import ApiregistrationApi
+from .apiregistration_v1_api import ApiregistrationV1Api
+from .apis_api import ApisApi
+from .apps_api import AppsApi
+from .apps_v1_api import AppsV1Api
+from .authentication_api import AuthenticationApi
+from .authentication_v1_api import AuthenticationV1Api
+from .authorization_api import AuthorizationApi
+from .authorization_v1_api import AuthorizationV1Api
+from .autoscaling_api import AutoscalingApi
+from .autoscaling_v1_api import AutoscalingV1Api
+from .autoscaling_v2_api import AutoscalingV2Api
+from .batch_api import BatchApi
+from .batch_v1_api import BatchV1Api
+from .certificates_api import CertificatesApi
+from .certificates_v1_api import CertificatesV1Api
+from .certificates_v1alpha1_api import CertificatesV1alpha1Api
+from .certificates_v1beta1_api import CertificatesV1beta1Api
+from .coordination_api import CoordinationApi
+from .coordination_v1_api import CoordinationV1Api
+from .coordination_v1alpha2_api import CoordinationV1alpha2Api
+from .coordination_v1beta1_api import CoordinationV1beta1Api
+from .core_api import CoreApi
+from .core_v1_api import CoreV1Api
+from .custom_objects_api import CustomObjectsApi
+from .discovery_api import DiscoveryApi
+from .discovery_v1_api import DiscoveryV1Api
+from .events_api import EventsApi
+from .events_v1_api import EventsV1Api
+from .flowcontrol_apiserver_api import FlowcontrolApiserverApi
+from .flowcontrol_apiserver_v1_api import FlowcontrolApiserverV1Api
+from .internal_apiserver_api import InternalApiserverApi
+from .internal_apiserver_v1alpha1_api import InternalApiserverV1alpha1Api
+from .logs_api import LogsApi
+from .networking_api import NetworkingApi
+from .networking_v1_api import NetworkingV1Api
+from .networking_v1beta1_api import NetworkingV1beta1Api
+from .node_api import NodeApi
+from .node_v1_api import NodeV1Api
+from .openid_api import OpenidApi
+from .policy_api import PolicyApi
+from .policy_v1_api import PolicyV1Api
+from .rbac_authorization_api import RbacAuthorizationApi
+from .rbac_authorization_v1_api import RbacAuthorizationV1Api
+from .resource_api import ResourceApi
+from .resource_v1_api import ResourceV1Api
+from .resource_v1alpha3_api import ResourceV1alpha3Api
+from .resource_v1beta1_api import ResourceV1beta1Api
+from .resource_v1beta2_api import ResourceV1beta2Api
+from .scheduling_api import SchedulingApi
+from .scheduling_v1_api import SchedulingV1Api
+from .scheduling_v1alpha2_api import SchedulingV1alpha2Api
+from .storage_api import StorageApi
+from .storage_v1_api import StorageV1Api
+from .storage_v1beta1_api import StorageV1beta1Api
+from .storagemigration_api import StoragemigrationApi
+from .storagemigration_v1beta1_api import StoragemigrationV1beta1Api
+from .version_api import VersionApi

kubernetes_asyncio/client/api/admissionregistration_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/admissionregistration_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/admissionregistration_v1alpha1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/admissionregistration_v1beta1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apiextensions_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apiextensions_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apiregistration_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apiregistration_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apis_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apps_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/apps_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/authentication_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/authentication_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/authorization_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/authorization_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/autoscaling_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/autoscaling_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/autoscaling_v2_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/batch_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )

kubernetes_asyncio/client/api/batch_v1_api.py

@@ -17,8 +17,8 @@
 # python 2 and python 3 compatibility library
 import six
 
-from kubernetes_asyncio.client.api_client import ApiClient
-from kubernetes_asyncio.client.exceptions import (  # noqa: F401
+from ..api_client import ApiClient
+from ..exceptions import (  # noqa: F401
     ApiTypeError,
     ApiValueError
 )