Skip to content

Commit 69f692d

Browse files
authored
Merge pull request #85 from tomplus/fix/removed-api
fix: e2e tests use apps/v1 api
2 parents e4ba5ef + 84a5640 commit 69f692d

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

examples/nginx-deployment.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
apiVersion: extensions/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: nginx-deployment
55
spec:
66
replicas: 3
7+
selector:
8+
matchLabels:
9+
app: nginx
710
template:
811
metadata:
912
labels:

kubernetes_asyncio/e2e_test/test_extensions.py kubernetes_asyncio/e2e_test/test_api.py

+18-9
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,30 @@
2121

2222
from kubernetes_asyncio.client import api_client
2323
from kubernetes_asyncio import utils
24-
from kubernetes_asyncio.client.api import extensions_v1beta1_api
24+
from kubernetes_asyncio.client.api import apps_v1_api
2525
from kubernetes_asyncio.client.models import v1_delete_options
2626
from kubernetes_asyncio.e2e_test import base
2727

2828

29-
class TestClientExtensions(asynctest.TestCase):
29+
class TestClientApi(asynctest.TestCase):
3030

3131
@classmethod
3232
def setUpClass(cls):
3333
cls.config = base.get_e2e_configuration()
3434

3535
async def test_create_deployment(self):
3636
client = api_client.ApiClient(configuration=self.config)
37-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
37+
api = apps_v1_api.AppsV1Api(client)
3838
name = 'nginx-deployment-' + str(uuid.uuid4())
39-
deployment = '''apiVersion: extensions/v1beta1
39+
deployment = '''apiVersion: apps/v1
4040
kind: Deployment
4141
metadata:
4242
name: %s
4343
spec:
4444
replicas: 3
45+
selector:
46+
matchLabels:
47+
app: nginx
4548
template:
4649
metadata:
4750
labels:
@@ -64,15 +67,18 @@ async def test_create_deployment(self):
6467

6568
async def test_create_deployment_from_yaml_file(self):
6669
client = api_client.ApiClient(configuration=self.config)
67-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
70+
api = apps_v1_api.AppsV1Api(client)
6871
name = 'nginx-deployment-' + str(uuid.uuid4())
6972
tempfile = 'temp.yaml'
70-
deployment = '''apiVersion: extensions/v1beta1
73+
deployment = '''apiVersion: apps/v1
7174
kind: Deployment
7275
metadata:
7376
name: %s
7477
spec:
7578
replicas: 3
79+
selector:
80+
matchLabels:
81+
app: nginx
7682
template:
7783
metadata:
7884
labels:
@@ -96,16 +102,19 @@ async def test_create_deployment_from_yaml_file(self):
96102

97103
async def test_create_daemonset(self):
98104
client = api_client.ApiClient(configuration=self.config)
99-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
105+
api = apps_v1_api.AppsV1Api(client)
100106
name = 'nginx-app-' + str(uuid.uuid4())
101107
daemonset = {
102-
'apiVersion': 'extensions/v1beta1',
108+
'apiVersion': 'apps/v1',
103109
'kind': 'DaemonSet',
104110
'metadata': {
105111
'labels': {'app': 'nginx'},
106-
'name': '%s' % name,
112+
'name': name,
107113
},
108114
'spec': {
115+
'selector': {
116+
'matchLabels': {'app': 'nginx'}
117+
},
109118
'template': {
110119
'metadata': {
111120
'labels': {'app': 'nginx'},

kubernetes_asyncio/utils/create_from_yaml_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ async def test_create_from_yaml(self):
2727

2828
# simple check for api call
2929
self.assertEqual(api_client.call_api.call_args[0][0],
30-
'/apis/extensions/v1beta1/namespaces/{namespace}/deployments')
30+
'/apis/apps/v1/namespaces/{namespace}/deployments')
3131

3232

3333
if __name__ == '__main__':

0 commit comments

Comments
 (0)