Skip to content

Commit 06776ce

Browse files
johscheuerjohscheuer
committed
Rebase code and add namespaced method
1 parent 0af22b1 commit 06776ce

3 files changed

Lines changed: 121 additions & 8 deletions

File tree

‎kubernetes/e2e_test/test_utils.py‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,17 @@ class TestUtils(unittest.TestCase):
2424
def setUpClass(cls):
2525
cls.config = base.get_e2e_configuration()
2626
cls.path_prefix = "kubernetes/e2e_test/test_yaml/"
27+
cls.test_namespace = "e2e-test-utils"
28+
k8s_client = client.api_client.ApiClient(configuration=cls.config)
29+
core_v1 = client.CoreV1Api(api_client=k8s_client)
30+
body = client.V1Namespace(metadata=client.V1ObjectMeta(name=cls.test_namespace))
31+
core_v1.create_namespace(body=body)
2732

33+
@classmethod
34+
def tearDownClass(cls):
35+
k8s_client = client.api_client.ApiClient(configuration=cls.config)
36+
core_v1 = client.CoreV1Api(api_client=k8s_client)
37+
core_v1.delete_namespace(name=cls.test_namespace)
2838
# Tests for creating individual API objects
2939

3040
def test_create_apps_deployment_from_yaml(self):
@@ -317,3 +327,44 @@ def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
317327
ext_api.delete_namespaced_deployment(
318328
name="triple-nginx", namespace="default",
319329
body={})
330+
331+
def test_create_namespaces_apps_deployment_from_yaml(self):
332+
"""
333+
Should be able to create an apps/v1beta1 deployment.
334+
"""
335+
k8s_client = client.api_client.ApiClient(configuration=self.config)
336+
utils.create_namespaced_from_yaml(
337+
k8s_client, self.path_prefix + "apps-deployment.yaml", namespace=self.test_namespace)
338+
app_api = client.AppsV1beta1Api(k8s_client)
339+
dep = app_api.read_namespaced_deployment(name="nginx-app",
340+
namespace=self.test_namespace)
341+
self.assertIsNotNone(dep)
342+
app_api.delete_namespaced_deployment(
343+
name="nginx-app", namespace=self.test_namespace,
344+
body={})
345+
346+
def test_create_from_list_in_multi_resource_yaml(self):
347+
"""
348+
Should be able to create the items in the PodList and a deployment
349+
specified in the multi-resource file
350+
"""
351+
k8s_client = client.api_client.ApiClient(configuration=self.config)
352+
utils.create_namespaced_from_yaml(
353+
k8s_client, self.path_prefix + "multi-resource-with-list.yaml", namespace=self.test_namespace)
354+
core_api = client.CoreV1Api(k8s_client)
355+
app_api = client.AppsV1beta1Api(k8s_client)
356+
pod_0 = core_api.read_namespaced_pod(
357+
name="mock-pod-0", namespace=self.test_namespace)
358+
self.assertIsNotNone(pod_0)
359+
pod_1 = core_api.read_namespaced_pod(
360+
name="mock-pod-1", namespace=self.test_namespace)
361+
self.assertIsNotNone(pod_1)
362+
dep = app_api.read_namespaced_deployment(
363+
name="mock", namespace=self.test_namespace)
364+
self.assertIsNotNone(dep)
365+
core_api.delete_namespaced_pod(
366+
name="mock-pod-0", namespace=self.test_namespace, body={})
367+
core_api.delete_namespaced_pod(
368+
name="mock-pod-1", namespace=self.test_namespace, body={})
369+
app_api.delete_namespaced_deployment(
370+
name="mock", namespace=self.test_namespace, body={})

‎kubernetes/utils/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414

1515
from __future__ import absolute_import
1616

17-
from .create_from_yaml import FailToCreateError, create_from_yaml
17+
from .create_from_yaml import (FailToCreateError, create_from_yaml,
18+
create_namespaced_from_yaml)

‎kubernetes/utils/create_from_yaml.py‎

Lines changed: 68 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,52 @@ def create_from_yaml(
5555
Valid values are: - All: all dry run stages will be processed
5656
"""
5757

58+
create_namespaced_from_yaml(
59+
k8s_client,
60+
yaml_file,
61+
verbose,
62+
namespace="default",
63+
**kwargs
64+
)
65+
66+
67+
def create_namespaced_from_yaml(
68+
k8s_client,
69+
yaml_file,
70+
verbose=False,
71+
namespace="default",
72+
**kwargs):
73+
"""
74+
Perform an action from a yaml file. Pass True for verbose to
75+
print confirmation information.
76+
Input:
77+
yaml_file: string. Contains the path to yaml file.
78+
k8s_client: an ApiClient object, initialized with the client args.
79+
verbose: If True, print confirmation from the create action.
80+
Default is False.
81+
namespace: string. Contains the namespace to create all
82+
resources inside
83+
84+
Returns:
85+
An k8s api object or list of apis objects created from YAML.
86+
When a single object is generated, return type is dependent
87+
on output_list.
88+
89+
Throws a FailToCreateError exception if creation of any object
90+
fails with helpful messages from the server.
91+
92+
Available parameters for creating <kind>:
93+
:param async_req bool
94+
:param bool include_uninitialized: If true, partially initialized
95+
resources are included in the response.
96+
:param str pretty: If 'true', then the output is pretty printed.
97+
:param str dry_run: When present, indicates that modifications
98+
should not be persisted. An invalid or unrecognized dryRun
99+
directive will result in an error response and no further
100+
processing of the request.
101+
Valid values are: - All: all dry run stages will be processed
102+
"""
103+
58104
with open(path.abspath(yaml_file)) as f:
59105
yml_document_all = yaml.safe_load_all(f)
60106
api_exceptions = []
@@ -72,15 +118,15 @@ def create_from_yaml(
72118
yml_object["apiVersion"] = yml_document["apiVersion"]
73119
yml_object["kind"] = kind
74120
try:
75-
create_from_yaml_single_item(
76-
k8s_client, yml_object, verbose, **kwargs)
121+
create_namespaced_from_yaml_single_item(
122+
k8s_client, yml_object, verbose, namespace, **kwargs)
77123
except client.rest.ApiException as api_exception:
78124
api_exceptions.append(api_exception)
79125
else:
80126
# This is a single object. Call the single item method
81127
try:
82-
create_from_yaml_single_item(
83-
k8s_client, yml_document, verbose, **kwargs)
128+
create_namespaced_from_yaml_single_item(
129+
k8s_client, yml_document, verbose, namespace, **kwargs)
84130
except client.rest.ApiException as api_exception:
85131
api_exceptions.append(api_exception)
86132
# In case we have exceptions waiting for us, raise them
@@ -89,7 +135,24 @@ def create_from_yaml(
89135

90136

91137
def create_from_yaml_single_item(
92-
k8s_client, yml_object, verbose=False, **kwargs):
138+
k8s_client,
139+
yml_object,
140+
verbose=False,
141+
**kwargs):
142+
create_namespaced_from_yaml_single_item(
143+
k8s_client,
144+
yml_object,
145+
verbose,
146+
namespace="default",
147+
**kwargs)
148+
149+
150+
def create_namespaced_from_yaml_single_item(
151+
k8s_client,
152+
yml_object,
153+
verbose=False,
154+
namespace="default",
155+
**kwargs):
93156
group, _, version = yml_object["apiVersion"].partition("/")
94157
if version == "":
95158
version = group
@@ -108,8 +171,6 @@ def create_from_yaml_single_item(
108171
# if any
109172
if "namespace" in yml_object["metadata"]:
110173
namespace = yml_object["metadata"]["namespace"]
111-
else:
112-
namespace = "default"
113174
# Expect the user to create namespaced objects more often
114175
if hasattr(k8s_api, "create_namespaced_{0}".format(kind)):
115176
resp = getattr(k8s_api, "create_namespaced_{0}".format(kind))(

0 commit comments

Comments
 (0)