Filter to OCP4 Anarchy subjects for status update (#37)

Author: jacobsee

generate-status/collect_info.py

@@ -1,34 +1,39 @@
 from kubernetes import client, config
 import gitlab
 
-g = gitlab.Gitlab(context["gitlab_url"] , private_token=context["gitlab_private_key"])
+g = gitlab.Gitlab(context["gitlab_url"],
+                  private_token=context["gitlab_private_key"])
 gitlab_group = g.groups.get(context["gitlab_group"])
 
 config.load_incluster_config()
 custom_object_api = client.CustomObjectsApi()
 anarchy_subject_list = custom_object_api.list_namespaced_custom_object(
-  group="anarchy.gpte.redhat.com",
-  version="v1",
-  namespace=context["babylon_namespace"],
-  plural="anarchysubjects",
+    group="anarchy.gpte.redhat.com",
+    version="v1",
+    namespace=context["babylon_namespace"],
+    plural="anarchysubjects",
 )
 
-def getAnarchySubject(project_id):
-  subject = list(filter(lambda x: project_id in x["metadata"]["annotations"]["poolboy.gpte.redhat.com/resource-claim-name"], anarchy_subject_list["items"]))
-  if len(subject) > 0:
-    return subject[0]
-  else:
-    return None
+
+def getOCPAnarchySubject(project_id):
+    subject = list(filter(lambda x: 'ocp4' in x["metadata"]["annotations"]["poolboy.gpte.redhat.com/resource-claim-name"]
+                          and project_id in x["metadata"]["annotations"]["poolboy.gpte.redhat.com/resource-claim-name"], anarchy_subject_list["items"]))
+    if len(subject) > 0:
+        return subject[0]
+    else:
+        return None
+
 
 context["repositories"] = [
-  {
-    "url": project.ssh_url_to_repo,
-    "directory": str(project.id),
-    "anarchy_subject": getAnarchySubject(str(project.id))
-  }
-for project in gitlab_group.projects.list(all=True, include_subgroups=True)]
-
-context["repositories"] = list(filter(lambda x: x["anarchy_subject"] is not None, context["repositories"]))
+    {
+        "url": project.ssh_url_to_repo,
+        "directory": str(project.id),
+        "ocp_anarchy_subject": getOCPAnarchySubject(str(project.id))
+    }
+    for project in gitlab_group.projects.list(all=True, include_subgroups=True)]
+
+context["repositories"] = list(
+    filter(lambda x: x["ocp_anarchy_subject"] is not None, context["repositories"]))
 
 need_to_process = [element["directory"] for element in context["repositories"]]
 

generate-status/write_status.py

@@ -28,19 +28,19 @@
 else:
   existing_status = False
 
-if "current_state" not in subject["anarchy_subject"]["spec"]["vars"] or "desired_state" not in subject["anarchy_subject"]["spec"]["vars"]:
+if "current_state" not in subject["ocp_anarchy_subject"]["spec"]["vars"] or "desired_state" not in subject["ocp_anarchy_subject"]["spec"]["vars"]:
   print(f"Skipping {subject['directory']} - state information not found in the Anarchy subject")
   return
 
 if existing_status:
   existing_ocp_subsystem = [subsystem for subsystem in existing_status["subsystems"] if subsystem["name"] == "OpenShift"]
   if len(existing_ocp_subsystem) > 0:
-    if subject["anarchy_subject"]["spec"]["vars"]["current_state"] == existing_ocp_subsystem[0]["state"]:
+    if subject["ocp_anarchy_subject"]["spec"]["vars"]["current_state"] == existing_ocp_subsystem[0]["state"]:
       print(f"Skipping {subject['directory']} - state has not changed since last update")
       return
 
-current_state = subject["anarchy_subject"]["spec"]["vars"]["current_state"]
-desired_state = subject["anarchy_subject"]["spec"]["vars"]["desired_state"]
+current_state = subject["ocp_anarchy_subject"]["spec"]["vars"]["current_state"]
+desired_state = subject["ocp_anarchy_subject"]["spec"]["vars"]["desired_state"]
 
 region = engagement["engagement_region"].lower() if "engagement_region" in engagement else "na"
 region_url = f"{region}-1"