Skip to content

Commit 6f18b72

Browse files
karimzakzoukkarimzakzouk
committed
Nest async client under kubernetes.aio to fix kubernetes-asyncio collision
1 parent 26761f3 commit 6f18b72

847 files changed

Lines changed: 2596 additions & 2591 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples_asyncio/in_cluster_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import sys
5454
import traceback
5555

56-
from kubernetes_asyncio import client, config
56+
from kubernetes.aio import client, config
5757

5858

5959
async def main():

‎examples_asyncio/list_pods.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import asyncio
22

3-
from kubernetes_asyncio import client, config
4-
from kubernetes_asyncio.client.api_client import ApiClient
3+
from kubernetes.aio import client, config
4+
from kubernetes.aio.client.api_client import ApiClient
55

66

77
async def main():

‎examples_asyncio/patch.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import asyncio
22

3-
from kubernetes_asyncio import client, config
4-
from kubernetes_asyncio.client.api_client import ApiClient
3+
from kubernetes.aio import client, config
4+
from kubernetes.aio.client.api_client import ApiClient
55

66
SERVICE_NAME = "example-service"
77
SERVICE_NS = "default"

‎kubernetes/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@
2424
from . import utils
2525
from . import leaderelection
2626
from . import informer
27+
try:
28+
from . import aio
29+
except ImportError:
30+
pass

‎kubernetes_asyncio/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
# The version is auto-updated. Please do not edit.
1717
__version__ = "36.0.0+snapshot"
1818

19-
import kubernetes_asyncio.client as client
19+
from . import client
2020

2121
__all__ = ["client"]

‎kubernetes_asyncio/client/__init__.py‎

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

‎kubernetes_asyncio/client/api/__init__.py‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,68 @@
33
# flake8: noqa
44

55
# import apis into api package
6-
from kubernetes_asyncio.client.api.well_known_api import WellKnownApi
7-
from kubernetes_asyncio.client.api.admissionregistration_api import AdmissionregistrationApi
8-
from kubernetes_asyncio.client.api.admissionregistration_v1_api import AdmissionregistrationV1Api
9-
from kubernetes_asyncio.client.api.admissionregistration_v1alpha1_api import AdmissionregistrationV1alpha1Api
10-
from kubernetes_asyncio.client.api.admissionregistration_v1beta1_api import AdmissionregistrationV1beta1Api
11-
from kubernetes_asyncio.client.api.apiextensions_api import ApiextensionsApi
12-
from kubernetes_asyncio.client.api.apiextensions_v1_api import ApiextensionsV1Api
13-
from kubernetes_asyncio.client.api.apiregistration_api import ApiregistrationApi
14-
from kubernetes_asyncio.client.api.apiregistration_v1_api import ApiregistrationV1Api
15-
from kubernetes_asyncio.client.api.apis_api import ApisApi
16-
from kubernetes_asyncio.client.api.apps_api import AppsApi
17-
from kubernetes_asyncio.client.api.apps_v1_api import AppsV1Api
18-
from kubernetes_asyncio.client.api.authentication_api import AuthenticationApi
19-
from kubernetes_asyncio.client.api.authentication_v1_api import AuthenticationV1Api
20-
from kubernetes_asyncio.client.api.authorization_api import AuthorizationApi
21-
from kubernetes_asyncio.client.api.authorization_v1_api import AuthorizationV1Api
22-
from kubernetes_asyncio.client.api.autoscaling_api import AutoscalingApi
23-
from kubernetes_asyncio.client.api.autoscaling_v1_api import AutoscalingV1Api
24-
from kubernetes_asyncio.client.api.autoscaling_v2_api import AutoscalingV2Api
25-
from kubernetes_asyncio.client.api.batch_api import BatchApi
26-
from kubernetes_asyncio.client.api.batch_v1_api import BatchV1Api
27-
from kubernetes_asyncio.client.api.certificates_api import CertificatesApi
28-
from kubernetes_asyncio.client.api.certificates_v1_api import CertificatesV1Api
29-
from kubernetes_asyncio.client.api.certificates_v1alpha1_api import CertificatesV1alpha1Api
30-
from kubernetes_asyncio.client.api.certificates_v1beta1_api import CertificatesV1beta1Api
31-
from kubernetes_asyncio.client.api.coordination_api import CoordinationApi
32-
from kubernetes_asyncio.client.api.coordination_v1_api import CoordinationV1Api
33-
from kubernetes_asyncio.client.api.coordination_v1alpha2_api import CoordinationV1alpha2Api
34-
from kubernetes_asyncio.client.api.coordination_v1beta1_api import CoordinationV1beta1Api
35-
from kubernetes_asyncio.client.api.core_api import CoreApi
36-
from kubernetes_asyncio.client.api.core_v1_api import CoreV1Api
37-
from kubernetes_asyncio.client.api.custom_objects_api import CustomObjectsApi
38-
from kubernetes_asyncio.client.api.discovery_api import DiscoveryApi
39-
from kubernetes_asyncio.client.api.discovery_v1_api import DiscoveryV1Api
40-
from kubernetes_asyncio.client.api.events_api import EventsApi
41-
from kubernetes_asyncio.client.api.events_v1_api import EventsV1Api
42-
from kubernetes_asyncio.client.api.flowcontrol_apiserver_api import FlowcontrolApiserverApi
43-
from kubernetes_asyncio.client.api.flowcontrol_apiserver_v1_api import FlowcontrolApiserverV1Api
44-
from kubernetes_asyncio.client.api.internal_apiserver_api import InternalApiserverApi
45-
from kubernetes_asyncio.client.api.internal_apiserver_v1alpha1_api import InternalApiserverV1alpha1Api
46-
from kubernetes_asyncio.client.api.logs_api import LogsApi
47-
from kubernetes_asyncio.client.api.networking_api import NetworkingApi
48-
from kubernetes_asyncio.client.api.networking_v1_api import NetworkingV1Api
49-
from kubernetes_asyncio.client.api.networking_v1beta1_api import NetworkingV1beta1Api
50-
from kubernetes_asyncio.client.api.node_api import NodeApi
51-
from kubernetes_asyncio.client.api.node_v1_api import NodeV1Api
52-
from kubernetes_asyncio.client.api.openid_api import OpenidApi
53-
from kubernetes_asyncio.client.api.policy_api import PolicyApi
54-
from kubernetes_asyncio.client.api.policy_v1_api import PolicyV1Api
55-
from kubernetes_asyncio.client.api.rbac_authorization_api import RbacAuthorizationApi
56-
from kubernetes_asyncio.client.api.rbac_authorization_v1_api import RbacAuthorizationV1Api
57-
from kubernetes_asyncio.client.api.resource_api import ResourceApi
58-
from kubernetes_asyncio.client.api.resource_v1_api import ResourceV1Api
59-
from kubernetes_asyncio.client.api.resource_v1alpha3_api import ResourceV1alpha3Api
60-
from kubernetes_asyncio.client.api.resource_v1beta1_api import ResourceV1beta1Api
61-
from kubernetes_asyncio.client.api.resource_v1beta2_api import ResourceV1beta2Api
62-
from kubernetes_asyncio.client.api.scheduling_api import SchedulingApi
63-
from kubernetes_asyncio.client.api.scheduling_v1_api import SchedulingV1Api
64-
from kubernetes_asyncio.client.api.scheduling_v1alpha2_api import SchedulingV1alpha2Api
65-
from kubernetes_asyncio.client.api.storage_api import StorageApi
66-
from kubernetes_asyncio.client.api.storage_v1_api import StorageV1Api
67-
from kubernetes_asyncio.client.api.storage_v1beta1_api import StorageV1beta1Api
68-
from kubernetes_asyncio.client.api.storagemigration_api import StoragemigrationApi
69-
from kubernetes_asyncio.client.api.storagemigration_v1beta1_api import StoragemigrationV1beta1Api
70-
from kubernetes_asyncio.client.api.version_api import VersionApi
6+
from .well_known_api import WellKnownApi
7+
from .admissionregistration_api import AdmissionregistrationApi
8+
from .admissionregistration_v1_api import AdmissionregistrationV1Api
9+
from .admissionregistration_v1alpha1_api import AdmissionregistrationV1alpha1Api
10+
from .admissionregistration_v1beta1_api import AdmissionregistrationV1beta1Api
11+
from .apiextensions_api import ApiextensionsApi
12+
from .apiextensions_v1_api import ApiextensionsV1Api
13+
from .apiregistration_api import ApiregistrationApi
14+
from .apiregistration_v1_api import ApiregistrationV1Api
15+
from .apis_api import ApisApi
16+
from .apps_api import AppsApi
17+
from .apps_v1_api import AppsV1Api
18+
from .authentication_api import AuthenticationApi
19+
from .authentication_v1_api import AuthenticationV1Api
20+
from .authorization_api import AuthorizationApi
21+
from .authorization_v1_api import AuthorizationV1Api
22+
from .autoscaling_api import AutoscalingApi
23+
from .autoscaling_v1_api import AutoscalingV1Api
24+
from .autoscaling_v2_api import AutoscalingV2Api
25+
from .batch_api import BatchApi
26+
from .batch_v1_api import BatchV1Api
27+
from .certificates_api import CertificatesApi
28+
from .certificates_v1_api import CertificatesV1Api
29+
from .certificates_v1alpha1_api import CertificatesV1alpha1Api
30+
from .certificates_v1beta1_api import CertificatesV1beta1Api
31+
from .coordination_api import CoordinationApi
32+
from .coordination_v1_api import CoordinationV1Api
33+
from .coordination_v1alpha2_api import CoordinationV1alpha2Api
34+
from .coordination_v1beta1_api import CoordinationV1beta1Api
35+
from .core_api import CoreApi
36+
from .core_v1_api import CoreV1Api
37+
from .custom_objects_api import CustomObjectsApi
38+
from .discovery_api import DiscoveryApi
39+
from .discovery_v1_api import DiscoveryV1Api
40+
from .events_api import EventsApi
41+
from .events_v1_api import EventsV1Api
42+
from .flowcontrol_apiserver_api import FlowcontrolApiserverApi
43+
from .flowcontrol_apiserver_v1_api import FlowcontrolApiserverV1Api
44+
from .internal_apiserver_api import InternalApiserverApi
45+
from .internal_apiserver_v1alpha1_api import InternalApiserverV1alpha1Api
46+
from .logs_api import LogsApi
47+
from .networking_api import NetworkingApi
48+
from .networking_v1_api import NetworkingV1Api
49+
from .networking_v1beta1_api import NetworkingV1beta1Api
50+
from .node_api import NodeApi
51+
from .node_v1_api import NodeV1Api
52+
from .openid_api import OpenidApi
53+
from .policy_api import PolicyApi
54+
from .policy_v1_api import PolicyV1Api
55+
from .rbac_authorization_api import RbacAuthorizationApi
56+
from .rbac_authorization_v1_api import RbacAuthorizationV1Api
57+
from .resource_api import ResourceApi
58+
from .resource_v1_api import ResourceV1Api
59+
from .resource_v1alpha3_api import ResourceV1alpha3Api
60+
from .resource_v1beta1_api import ResourceV1beta1Api
61+
from .resource_v1beta2_api import ResourceV1beta2Api
62+
from .scheduling_api import SchedulingApi
63+
from .scheduling_v1_api import SchedulingV1Api
64+
from .scheduling_v1alpha2_api import SchedulingV1alpha2Api
65+
from .storage_api import StorageApi
66+
from .storage_v1_api import StorageV1Api
67+
from .storage_v1beta1_api import StorageV1beta1Api
68+
from .storagemigration_api import StoragemigrationApi
69+
from .storagemigration_v1beta1_api import StoragemigrationV1beta1Api
70+
from .version_api import VersionApi

‎kubernetes_asyncio/client/api/admissionregistration_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# python 2 and python 3 compatibility library
1818
import six
1919

20-
from kubernetes_asyncio.client.api_client import ApiClient
21-
from kubernetes_asyncio.client.exceptions import ( # noqa: F401
20+
from ..api_client import ApiClient
21+
from ..exceptions import ( # noqa: F401
2222
ApiTypeError,
2323
ApiValueError
2424
)

‎kubernetes_asyncio/client/api/admissionregistration_v1_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# python 2 and python 3 compatibility library
1818
import six
1919

20-
from kubernetes_asyncio.client.api_client import ApiClient
21-
from kubernetes_asyncio.client.exceptions import ( # noqa: F401
20+
from ..api_client import ApiClient
21+
from ..exceptions import ( # noqa: F401
2222
ApiTypeError,
2323
ApiValueError
2424
)

‎kubernetes_asyncio/client/api/admissionregistration_v1alpha1_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# python 2 and python 3 compatibility library
1818
import six
1919

20-
from kubernetes_asyncio.client.api_client import ApiClient
21-
from kubernetes_asyncio.client.exceptions import ( # noqa: F401
20+
from ..api_client import ApiClient
21+
from ..exceptions import ( # noqa: F401
2222
ApiTypeError,
2323
ApiValueError
2424
)

0 commit comments

Comments
 (0)