diff --git a/examples/nginx-deployment.yaml b/examples/nginx-deployment.yaml index 7a0dd431e..ae8eb59d2 100644 --- a/examples/nginx-deployment.yaml +++ b/examples/nginx-deployment.yaml @@ -1,9 +1,12 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-deployment spec: replicas: 3 + selector: + matchLabels: + app: nginx template: metadata: labels: diff --git a/kubernetes_asyncio/e2e_test/test_extensions.py b/kubernetes_asyncio/e2e_test/test_api.py similarity index 86% rename from kubernetes_asyncio/e2e_test/test_extensions.py rename to kubernetes_asyncio/e2e_test/test_api.py index 3f60bd525..7b9de34d1 100644 --- a/kubernetes_asyncio/e2e_test/test_extensions.py +++ b/kubernetes_asyncio/e2e_test/test_api.py @@ -21,12 +21,12 @@ from kubernetes_asyncio.client import api_client from kubernetes_asyncio import utils -from kubernetes_asyncio.client.api import extensions_v1beta1_api +from kubernetes_asyncio.client.api import apps_v1_api from kubernetes_asyncio.client.models import v1_delete_options from kubernetes_asyncio.e2e_test import base -class TestClientExtensions(asynctest.TestCase): +class TestClientApi(asynctest.TestCase): @classmethod def setUpClass(cls): @@ -34,14 +34,17 @@ def setUpClass(cls): async def test_create_deployment(self): client = api_client.ApiClient(configuration=self.config) - api = extensions_v1beta1_api.ExtensionsV1beta1Api(client) + api = apps_v1_api.AppsV1Api(client) name = 'nginx-deployment-' + str(uuid.uuid4()) - deployment = '''apiVersion: extensions/v1beta1 + deployment = '''apiVersion: apps/v1 kind: Deployment metadata: name: %s spec: replicas: 3 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -64,15 +67,18 @@ async def test_create_deployment(self): async def test_create_deployment_from_yaml_file(self): client = api_client.ApiClient(configuration=self.config) - api = extensions_v1beta1_api.ExtensionsV1beta1Api(client) + api = apps_v1_api.AppsV1Api(client) name = 'nginx-deployment-' + str(uuid.uuid4()) tempfile = 'temp.yaml' - deployment = '''apiVersion: extensions/v1beta1 + deployment = '''apiVersion: apps/v1 kind: Deployment metadata: name: %s spec: replicas: 3 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -96,16 +102,19 @@ async def test_create_deployment_from_yaml_file(self): async def test_create_daemonset(self): client = api_client.ApiClient(configuration=self.config) - api = extensions_v1beta1_api.ExtensionsV1beta1Api(client) + api = apps_v1_api.AppsV1Api(client) name = 'nginx-app-' + str(uuid.uuid4()) daemonset = { - 'apiVersion': 'extensions/v1beta1', + 'apiVersion': 'apps/v1', 'kind': 'DaemonSet', 'metadata': { 'labels': {'app': 'nginx'}, - 'name': '%s' % name, + 'name': name, }, 'spec': { + 'selector': { + 'matchLabels': {'app': 'nginx'} + }, 'template': { 'metadata': { 'labels': {'app': 'nginx'}, diff --git a/kubernetes_asyncio/utils/create_from_yaml_test.py b/kubernetes_asyncio/utils/create_from_yaml_test.py index 9f1630fa6..85588855d 100644 --- a/kubernetes_asyncio/utils/create_from_yaml_test.py +++ b/kubernetes_asyncio/utils/create_from_yaml_test.py @@ -27,7 +27,7 @@ async def test_create_from_yaml(self): # simple check for api call self.assertEqual(api_client.call_api.call_args[0][0], - '/apis/extensions/v1beta1/namespaces/{namespace}/deployments') + '/apis/apps/v1/namespaces/{namespace}/deployments') if __name__ == '__main__':