Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 874d410

Browse filesBrowse files
k8s-ci-robotfabianvf
k8s-ci-robot
authored and
fabianvf
committed
Merge pull request kubernetes-client#966 from micw523/testfix116
Address API Changes Introduced in k8s v1.16 (cherry picked from commit c310289)
1 parent 36f2129 commit 874d410
Copy full SHA for 874d410

File tree

4 files changed

+25
-18
lines changed
Filter options

4 files changed

+25
-18
lines changed

‎kubernetes/e2e_test/test_extensions.py renamed to ‎kubernetes/e2e_test/test_apps.py

Copy file name to clipboardExpand all lines: kubernetes/e2e_test/test_apps.py
+15-9Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,38 @@
1717
import yaml
1818

1919
from kubernetes.client import api_client
20-
from kubernetes.client.apis import extensions_v1beta1_api
20+
from kubernetes.client.apis import apps_v1_api
2121
from kubernetes.client.models import v1_delete_options
2222
from kubernetes.e2e_test import base
2323

2424

25-
class TestClientExtensions(unittest.TestCase):
25+
class TestClientApps(unittest.TestCase):
2626

2727
@classmethod
2828
def setUpClass(cls):
2929
cls.config = base.get_e2e_configuration()
3030

3131
def test_create_deployment(self):
3232
client = api_client.ApiClient(configuration=self.config)
33-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
33+
api = apps_v1_api.AppsV1Api(client)
3434
name = 'nginx-deployment-' + str(uuid.uuid4())
35-
deployment = '''apiVersion: extensions/v1beta1
35+
deployment = '''apiVersion: apps/v1
3636
kind: Deployment
3737
metadata:
3838
name: %s
3939
spec:
4040
replicas: 3
41+
selector:
42+
matchLabels:
43+
app: nginx
4144
template:
4245
metadata:
4346
labels:
4447
app: nginx
4548
spec:
4649
containers:
4750
- name: nginx
48-
image: nginx:1.7.9
51+
image: nginx:1.15.4
4952
ports:
5053
- containerPort: 80
5154
'''
@@ -60,24 +63,27 @@ def test_create_deployment(self):
6063

6164
def test_create_daemonset(self):
6265
client = api_client.ApiClient(configuration=self.config)
63-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
66+
api = apps_v1_api.AppsV1Api(client)
6467
name = 'nginx-app-' + str(uuid.uuid4())
6568
daemonset = {
66-
'apiVersion': 'extensions/v1beta1',
69+
'apiVersion': 'apps/v1',
6770
'kind': 'DaemonSet',
6871
'metadata': {
6972
'labels': {'app': 'nginx'},
7073
'name': '%s' % name,
7174
},
7275
'spec': {
76+
'selector': {
77+
'matchLabels': {'app': 'nginx'},
78+
},
7379
'template': {
7480
'metadata': {
7581
'labels': {'app': 'nginx'},
7682
'name': name},
7783
'spec': {
7884
'containers': [
7985
{'name': 'nginx-app',
80-
'image': 'nginx:1.10'},
86+
'image': 'nginx:1.15.4'},
8187
],
8288
},
8389
},
@@ -91,4 +97,4 @@ def test_create_daemonset(self):
9197
self.assertIsNotNone(resp)
9298

9399
options = v1_delete_options.V1DeleteOptions()
94-
resp = api.delete_namespaced_daemon_set(name, 'default', body=options)
100+
resp = api.delete_namespaced_daemon_set(name, 'default', body=options)

‎kubernetes/e2e_test/test_utils.py

Copy file name to clipboardExpand all lines: kubernetes/e2e_test/test_utils.py
+8-7Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ def tearDownClass(cls):
3939

4040
def test_create_apps_deployment_from_yaml(self):
4141
"""
42-
Should be able to create an apps/v1beta1 deployment.
42+
Should be able to create an apps/v1 deployment.
4343
"""
4444
k8s_client = client.api_client.ApiClient(configuration=self.config)
4545
utils.create_from_yaml(
4646
k8s_client, self.path_prefix + "apps-deployment.yaml")
47-
app_api = client.AppsV1beta1Api(k8s_client)
47+
app_api = client.AppsV1Api(k8s_client)
4848
dep = app_api.read_namespaced_deployment(name="nginx-app",
4949
namespace="default")
5050
self.assertIsNotNone(dep)
@@ -251,7 +251,7 @@ def test_create_from_list_in_multi_resource_yaml(self):
251251
utils.create_from_yaml(
252252
k8s_client, self.path_prefix + "multi-resource-with-list.yaml")
253253
core_api = client.CoreV1Api(k8s_client)
254-
app_api = client.AppsV1beta1Api(k8s_client)
254+
app_api = client.AppsV1Api(k8s_client)
255255
pod_0 = core_api.read_namespaced_pod(
256256
name="mock-pod-0", namespace="default")
257257
self.assertIsNotNone(pod_0)
@@ -327,15 +327,16 @@ def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
327327
name="triple-nginx", namespace="default",
328328
body={})
329329

330-
def test_create_namespaces_apps_deployment_from_yaml(self):
330+
def test_create_namespaced_apps_deployment_from_yaml(self):
331331
"""
332-
Should be able to create an apps/v1beta1 deployment.
332+
Should be able to create an apps/v1beta1 deployment
333+
in a test namespace.
333334
"""
334335
k8s_client = client.api_client.ApiClient(configuration=self.config)
335336
utils.create_from_yaml(
336337
k8s_client, self.path_prefix + "apps-deployment.yaml",
337338
namespace=self.test_namespace)
338-
app_api = client.AppsV1beta1Api(k8s_client)
339+
app_api = client.AppsV1Api(k8s_client)
339340
dep = app_api.read_namespaced_deployment(name="nginx-app",
340341
namespace=self.test_namespace)
341342
self.assertIsNotNone(dep)
@@ -353,7 +354,7 @@ def test_create_from_list_in_multi_resource_yaml_namespaced(self):
353354
k8s_client, self.path_prefix + "multi-resource-with-list.yaml",
354355
namespace=self.test_namespace)
355356
core_api = client.CoreV1Api(k8s_client)
356-
app_api = client.AppsV1beta1Api(k8s_client)
357+
app_api = client.AppsV1Api(k8s_client)
357358
pod_0 = core_api.read_namespaced_pod(
358359
name="mock-pod-0", namespace=self.test_namespace)
359360
self.assertIsNotNone(pod_0)

‎kubernetes/e2e_test/test_yaml/apps-deployment.yaml

Copy file name to clipboardExpand all lines: kubernetes/e2e_test/test_yaml/apps-deployment.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: apps/v1beta1
1+
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: nginx-app

‎kubernetes/e2e_test/test_yaml/multi-resource-with-list.yaml

Copy file name to clipboardExpand all lines: kubernetes/e2e_test/test_yaml/multi-resource-with-list.yaml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ items:
2424
image: busybox
2525
command: ['sh', '-c', 'echo Hello Kubernetes! && sleep 3600']
2626
---
27-
apiVersion: apps/v1beta1
27+
apiVersion: apps/v1
2828
kind: Deployment
2929
metadata:
3030
name: mock

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.