From 9a5759f72e6ef70bf21d02b96a6f9ba1011f563e Mon Sep 17 00:00:00 2001
From: Tomasz Prus <tomasz.prus@gmail.com>
Date: Mon, 16 Dec 2019 23:19:29 +0100
Subject: [PATCH 1/2] fix: e2e tests use api in version apps/v1 instead of
 removed ext/v1beta1

---
 examples/nginx-deployment.yaml                   |  2 +-
 .../e2e_test/{test_extensions.py => test_api.py} | 16 ++++++++--------
 .../utils/create_from_yaml_test.py               |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename kubernetes_asyncio/e2e_test/{test_extensions.py => test_api.py} (89%)

diff --git a/examples/nginx-deployment.yaml b/examples/nginx-deployment.yaml
index 7a0dd431e..b470bbc36 100644
--- a/examples/nginx-deployment.yaml
+++ b/examples/nginx-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
diff --git a/kubernetes_asyncio/e2e_test/test_extensions.py b/kubernetes_asyncio/e2e_test/test_api.py
similarity index 89%
rename from kubernetes_asyncio/e2e_test/test_extensions.py
rename to kubernetes_asyncio/e2e_test/test_api.py
index 3f60bd525..de453dec0 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,9 +34,9 @@ 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
@@ -64,10 +64,10 @@ 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
@@ -96,10 +96,10 @@ 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'},
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__':

From 84a5640a3617d3cc804f8aaf52a67390cd159474 Mon Sep 17 00:00:00 2001
From: Tomasz Prus <tomasz.prus@gmail.com>
Date: Mon, 16 Dec 2019 23:50:20 +0100
Subject: [PATCH 2/2] fix: add required label-selectors to examples and e2e
 tests

---
 examples/nginx-deployment.yaml          |  3 +++
 kubernetes_asyncio/e2e_test/test_api.py | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/examples/nginx-deployment.yaml b/examples/nginx-deployment.yaml
index b470bbc36..ae8eb59d2 100644
--- a/examples/nginx-deployment.yaml
+++ b/examples/nginx-deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: nginx-deployment
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
diff --git a/kubernetes_asyncio/e2e_test/test_api.py b/kubernetes_asyncio/e2e_test/test_api.py
index de453dec0..7b9de34d1 100644
--- a/kubernetes_asyncio/e2e_test/test_api.py
+++ b/kubernetes_asyncio/e2e_test/test_api.py
@@ -42,6 +42,9 @@ async def test_create_deployment(self):
   name: %s
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -73,6 +76,9 @@ async def test_create_deployment_from_yaml_file(self):
   name: %s
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx  
   template:
     metadata:
       labels:
@@ -103,9 +109,12 @@ async def test_create_daemonset(self):
             'kind': 'DaemonSet',
             'metadata': {
                 'labels': {'app': 'nginx'},
-                'name': '%s' % name,
+                'name': name,
             },
             'spec': {
+                'selector': {
+                    'matchLabels': {'app': 'nginx'}
+                },
                 'template': {
                     'metadata': {
                         'labels': {'app': 'nginx'},