Merge branch 'stable' into ibai

Author: IanBoden

.github/CODEOWNERS

@@ -1 +1 @@
-* @durera @sanjayprab @terenceq @whitfiea @ianBoden @rawa-resul @leo-miran @terc1997
+* @ibm-mas/pr-review-team

src/mas/devops/mas.py

@@ -123,16 +123,29 @@ def listMasInstances(dynClient: DynamicClient) -> list:
     """
     Get a list of MAS instances on the cluster
     """
-    suitesAPI = dynClient.resources.get(api_version="core.mas.ibm.com/v1", kind="Suite")
+    return listInstances(dynClient, "core.mas.ibm.com/v1", "Suite")
 
-    suites = suitesAPI.get().to_dict()['items']
-    if len(suites) > 0:
-        logger.info(f"There are {len(suites)} MAS instances installed on this cluster:")
-        for suite in suites:
-            logger.info(f" * {suite['metadata']['name']} v{suite['status']['versions']['reconciled']}")
+
+def listAiServiceInstances(dynClient: DynamicClient) -> list:
+    """
+    Get a list of AI Service instances on the cluster
+    """
+    return listInstances(dynClient, "aiservice.ibm.com/v1", "AIServiceApp")
+
+
+def listInstances(dynClient: DynamicClient, apiVersion: str, kind: str) -> list:
+    """
+    Get a list of instances of a particular CR on the cluster
+    """
+    api = dynClient.resources.get(api_version=apiVersion, kind=kind)
+    instances = api.get().to_dict()['items']
+    if len(instances) > 0:
+        logger.info(f"There are {len(instances)} {kind} instances installed on this cluster:")
+    for instance in instances:
+        logger.info(f" * {instance['metadata']['name']} v{instance['status']['versions']['reconciled']}")
     else:
-        logger.info("There are no MAS instances installed on this cluster")
-    return suites
+        logger.info(f"There are no {kind} instances installed on this cluster")
+    return instances
 
 
 def getWorkspaceId(dynClient: DynamicClient, instanceId: str) -> str:

src/mas/devops/ocp.py

@@ -94,14 +94,23 @@ def getNamespace(dynClient: DynamicClient, namespace: str) -> dict:
     return {}
 
 
-def createNamespace(dynClient: DynamicClient, namespace: str) -> bool:
+def createNamespace(dynClient: DynamicClient, namespace: str, kyvernoLabel: str = None) -> bool:
     """
     Create a namespace if it does not exist
     """
     namespaceAPI = dynClient.resources.get(api_version="v1", kind="Namespace")
     try:
-        namespaceAPI.get(name=namespace)
-        logger.debug(f"Namespace {namespace} already exists")
+        ns = namespaceAPI.get(name=namespace)
+        logger.info(f"Namespace {namespace} already exists")
+        if kyvernoLabel is not None:
+            if ns.metadata.labels is None or "ibm.com/kyverno" not in ns.metadata.labels.keys() or ns.metadata.labels["ibm.com/kyverno"] != kyvernoLabel:
+                logger.info(f"Patching namespace with Kyverno Labels ibm.com/kyverno: {kyvernoLabel}")
+                body = {"metadata": {"labels": {"ibm.com/kyverno": kyvernoLabel}}}
+                namespaceAPI.patch(
+                    name=namespace,
+                    body=body,
+                    content_type="application/merge-patch+json"
+                )
     except NotFoundError:
         nsObj = {
             "apiVersion": "v1",
@@ -110,6 +119,10 @@ def createNamespace(dynClient: DynamicClient, namespace: str) -> bool:
                 "name": namespace
             }
         }
+        if kyvernoLabel is not None:
+            nsObj["metadata"]["labels"] = {
+                "ibm.com/kyverno": kyvernoLabel
+            }
         namespaceAPI.create(body=nsObj)
         logger.debug(f"Created namespace {namespace}")
     return True