Update kubectl methods for generic objects to enable cluster scope

Change-Id: I6508bd4f147331c4f3d04ba5c30c485947a3a24b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/n2vc/kubectl.py b/n2vc/kubectl.py
index 8089c7b..81d1a49 100644 (file)
--- a/n2vc/kubectl.py
+++ b/n2vc/kubectl.py
@@ -697,13 +697,21 @@ class Kubectl:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:

-            client.create_namespaced_custom_object(
-                group=api_group,
-                plural=api_plural,
-                version=api_version,
-                body=manifest_dict,
-                namespace=namespace,
-            )
+            if namespace:
+                client.create_namespaced_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    body=manifest_dict,
+                    namespace=namespace,
+                )
+            else:
+                client.create_cluster_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    body=manifest_dict,
+                )

         except ApiException as e:
             info = json.loads(e.body)
             if info.get("reason").lower() == "alreadyexists":
         except ApiException as e:
             info = json.loads(e.body)
             if info.get("reason").lower() == "alreadyexists":


@@ -731,13 +739,21 @@ class Kubectl:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:

-            client.delete_namespaced_custom_object(
-                group=api_group,
-                plural=api_plural,
-                version=api_version,
-                name=name,
-                namespace=namespace,
-            )
+            if namespace:
+                client.delete_namespaced_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    name=name,
+                    namespace=namespace,
+                )
+            else:
+                client.delete_cluster_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    name=name,
+                )

         except ApiException as e:
             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":
         except ApiException as e:
             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":


@@ -765,20 +781,30 @@ class Kubectl:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:

-            object_dict = client.list_namespaced_custom_object(
-                group=api_group,
-                plural=api_plural,
-                version=api_version,
-                namespace=namespace,
-                field_selector=f"metadata.name={name}",
-            )
+            if namespace:
+                object_dict = client.list_namespaced_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    namespace=namespace,
+                    field_selector=f"metadata.name={name}",
+                )
+            else:
+                object_dict = client.list_cluster_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    field_selector=f"metadata.name={name}",
+                )

             if len(object_dict.get("items")) == 0:
                 return None
             return object_dict.get("items")[0]
         except ApiException as e:
             if len(object_dict.get("items")) == 0:
                 return None
             return object_dict.get("items")[0]
         except ApiException as e:

+            self.logger.debug(f"Exception: {e}")

             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":
                 self.logger.warning("Cannot get custom object: {}".format(e))
             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":
                 self.logger.warning("Cannot get custom object: {}".format(e))

+                return None

             else:
                 raise e
 
             else:
                 raise e
 


@@ -800,20 +826,29 @@ class Kubectl:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:
         """
         client = self.clients[CUSTOM_OBJECT_CLIENT]
         try:

-            object_dict = client.list_namespaced_custom_object(
-                group=api_group,
-                plural=api_plural,
-                version=api_version,
-                namespace=namespace,
-            )
+            if namespace:
+                object_dict = client.list_namespaced_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                    namespace=namespace,
+                )
+            else:
+                object_dict = client.list_cluster_custom_object(
+                    group=api_group,
+                    plural=api_plural,
+                    version=api_version,
+                )

             self.logger.debug(f"Object-list: {object_dict.get('items')}")
             return object_dict.get("items")
         except ApiException as e:
             self.logger.debug(f"Object-list: {object_dict.get('items')}")
             return object_dict.get("items")
         except ApiException as e:

+            self.logger.debug(f"Exception: {e}")

             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":
                 self.logger.warning(
             info = json.loads(e.body)
             if info.get("reason").lower() == "notfound":
                 self.logger.warning(

-                    "Cannot retrieve list of custom objects: {}".format(e)
+                    "Cannot find specified custom objects: {}".format(e)

                 )
                 )

+                return []

             else:
                 raise e
 
             else:
                 raise e