Change Error Handling

kubernetes-client · Mar 19, 2019 · 3d4a602 · 3d4a602
1 parent 35a1cdd
commit 3d4a602
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/examples/create_deployment_from_yaml.py b/examples/create_deployment_from_yaml.py
@@ -23,7 +23,8 @@ def main():
     # default location.
     config.load_kube_config()
     k8s_client = client.ApiClient()
-    k8s_api = utils.create_from_yaml(k8s_client, "nginx-deployment.yaml")
+    utils.create_from_yaml(k8s_client, "nginx-deployment.yaml")
+    k8s_api = client.ExtensionsV1beta1Api(k8s_client)
     deps = k8s_api.read_namespaced_deployment("nginx-deployment", "default")
     print("Deployment {0} created".format(deps.metadata.name))
 

diff --git a/kubernetes/e2e_test/test_utils.py b/kubernetes/e2e_test/test_utils.py
@@ -138,8 +138,14 @@ def test_create_apiservice_from_yaml_with_conflict(self):
             utils.create_from_yaml(
                 k8s_client, "kubernetes/e2e_test/test_yaml/api-service.yaml")
         exp_error = ('Error from server (Conflict): '
-                     'apiservices.apiregistration.k8s.io '
-                     '"v1alpha1.wardle.k8s.io" already exists\n'
+                     '{"kind":"Status","apiVersion":"v1","metadata":{},'
+                     '"status":"Failure",'
+                     '"message":"apiservices.apiregistration.k8s.io '
+                     '\\"v1alpha1.wardle.k8s.io\\" already exists",'
+                     '"reason":"AlreadyExists",'
+                     '"details":{"name":"v1alpha1.wardle.k8s.io",'
+                     '"group":"apiregistration.k8s.io","kind":"apiservices"},'
+                     '"code":409}\n'
                      )
         self.assertEqual(exp_error, str(cm.exception))
         reg_api.delete_api_service(
@@ -270,8 +276,11 @@ def test_create_from_multi_resource_yaml_with_conflict(self):
         with self.assertRaises(utils.FailToCreateError) as cm:
             utils.create_from_yaml(
                 k8s_client, self.path_prefix + "yaml-conflict-multi.yaml")
-        exp_error = ('Error from server (Conflict): '
-                     'services "mock-2" already exists\n'
+        exp_error = ('Error from server (Conflict): {"kind":"Status",'
+                     '"apiVersion":"v1","metadata":{},"status":"Failure",'
+                     '"message":"services \\"mock-2\\" already exists",'
+                     '"reason":"AlreadyExists","details":{"name":"mock-2",'
+                     '"kind":"services"},"code":409}\n'
                      )
         self.assertEqual(exp_error, str(cm.exception))
         ctr = core_api.read_namespaced_replication_controller(
@@ -292,9 +301,12 @@ def test_create_from_multi_resource_yaml_with_multi_conflicts(self):
         with self.assertRaises(utils.FailToCreateError) as cm:
             utils.create_from_yaml(
                 k8s_client, self.path_prefix + "triple-nginx.yaml")
-        exp_error = ('Error from server (Conflict): '
-                     'deployments.extensions "triple-nginx" '
-                     'already exists\n'
+        exp_error = ('Error from server (Conflict): {"kind":"Status",'
+                     '"apiVersion":"v1","metadata":{},"status":"Failure",'
+                     '"message":"deployments.extensions \\"triple-nginx\\" '
+                     'already exists","reason":"AlreadyExists",'
+                     '"details":{"name":"triple-nginx","group":"extensions",'
+                     '"kind":"deployments"},"code":409}\n'
                      )
         exp_error += exp_error
         self.assertEqual(exp_error, str(cm.exception))

diff --git a/kubernetes/utils/create_from_yaml.py b/kubernetes/utils/create_from_yaml.py
@@ -133,7 +133,6 @@ def __init__(self, api_exceptions):
     def __str__(self):
         msg = ""
         for api_exception in self.api_exceptions:
-            body = yaml.safe_load(api_exception.body)
-            msg += "Error from server ({0}): {1}\n".format(
-                api_exception.reason, body["message"])
+            msg += "Error from server ({0}): {1}".format(
+                api_exception.reason, api_exception.body)
         return msg