removing is_manged_by_kueue logic as it needs to be reworked

Author: memalhot

batchtools/bd.py

@@ -1,26 +1,23 @@
 import sys
 import argparse
 from typing import cast
+
 import openshift_client as oc
+
 from .basecommand import Command, override
 from .basecommand import SubParserFactory
-from .helpers import oc_delete, is_kueue_managed_job
+from .helpers import oc_delete
 
 
 class DeleteJobsCommand(Command):
     """
     batchtools bd [job-name [job-name ...]]
 
-    Delete specified Kueue-managed GPU jobs, or all such jobs if none are specified.
-
-    Description:
-        Deletes only those Jobs that are both:
-          - named like your GPU jobs (name starts with 'job-'), and
-          - detected as Kueue-managed (via labels/Workload linkage).
+    Delete specified Jobs, or all Jobs if none are specified.
     """
 
     name: str = "bd"
-    help: str = "Delete specified Kueue-managed GPU jobs, or all if none are specified"
+    help: str = "Delete specified Jobs, or all if none are specified"
 
     @classmethod
     @override
@@ -29,43 +26,34 @@ def build_parser(cls, subparsers: SubParserFactory):
         p.add_argument(
             "job_names",
             nargs="*",
-            help="Optional list of job names to delete (must be Kueue-managed)",
+            help="Optional list of job names to delete",
         )
         return p
 
     @staticmethod
     @override
     def run(args: argparse.Namespace):
         args = cast(DeleteJobsCommand, args)
+
         try:
             jobs = oc.selector("jobs").objects()
             if not jobs:
                 print("No jobs found.")
                 return
 
-            gpu_jobs = [
-                job for job in jobs if job.model.metadata.name.startswith("job-")
-            ]
-
-            # only want to delete kueue jobs so filter for kueue jobs
-            kueue_gpu_jobs = [job for job in gpu_jobs if is_kueue_managed_job(job)]
-
-            if not kueue_gpu_jobs:
-                print("No Kueue-managed GPU jobs to delete.")
-                return
-
             if args.job_names:
-                # if jobs are specified, only delete specified jobs
-                allowed = {job.model.metadata.name for job in kueue_gpu_jobs}
+                # delete only specified jobs
+                existing = {job.model.metadata.name for job in jobs}
                 for name in args.job_names:
-                    if name not in allowed:
-                        print(f"{name} is not a Kueue-managed GPU job; skipping.")
+                    if name not in existing:
+                        print(f"{name} does not exist; skipping.")
                         continue
                     oc_delete("job", name)
                     print(f"Deleted job: {name}")
             else:
-                print("No job names provided -> deleting all Kueue-managed GPU jobs:\n")
-                for job in kueue_gpu_jobs:
+                # delete all jobs
+                print("No job names provided -> deleting ALL jobs:\n")
+                for job in jobs:
                     name = job.model.metadata.name
                     oc_delete("job", name)
                     print(f"Deleted job: {name}")

batchtools/bj.py

@@ -5,7 +5,6 @@
 import openshift_client as oc
 
 from .basecommand import Command
-from .helpers import is_kueue_managed_job
 
 
 class ListJobsCommand(Command):
@@ -38,8 +37,7 @@ def run(args: argparse.Namespace):
 
             print(f"Found {len(jobs)} job(s):\n")
             for job in jobs:
-                if is_kueue_managed_job(job):
-                    print(f"- {job.model.metadata.name}")
+                print(f"- {job.model.metadata.name}")
 
         except oc.OpenShiftPythonException as e:
             sys.exit(f"Error occurred while retrieving jobs: {e}")

batchtools/helpers.py

@@ -29,40 +29,40 @@ def oc_delete(obj_type: str, obj_name: str) -> None:
         print(f"Error occurred while deleting {obj_type}/{obj_name}: {e}")
 
 
-def is_kueue_managed_job(job_obj) -> bool:
-    """
-    Returns True if the Job is managed by Kueue.
-    Checks:
-      1) Job has label 'kueue.x-k8s.io/queue-name'
-      2) A Workload exists that either:
-         - has an ownerReference pointing to this Job, or
-         - has label job-name=<job-name>
-    """
-    try:
-        md = job_obj.model.metadata
-        labels = getattr(md, "labels", {}) or {}
-        if "kueue.x-k8s.io/queue-name" in labels:
-            return True
+# def is_kueue_managed_job(job_obj) -> bool:
+# """
+# Returns True if the Job is managed by Kueue.
+# Checks:
+#   1) Job has label 'kueue.x-k8s.io/queue-name'
+#   2) A Workload exists that either:
+#      - has an ownerReference pointing to this Job, or
+#      - has label job-name=<job-name>
+# """
+# try:
+#     md = job_obj.model.metadata
+#     labels = getattr(md, "labels", {}) or {}
+#     if "kueue.x-k8s.io/queue-name" in labels:
+#         return True
 
-        job_name = md.name
-        try:
-            workloads = oc.selector("workloads").objects()
-        except oc.OpenShiftPythonException:
-            workloads = []
+#     job_name = md.name
+#     try:
+#         workloads = oc.selector("workloads").objects()
+#     except oc.OpenShiftPythonException:
+#         workloads = []
 
-        for wl in workloads:
-            wl_md = wl.model.metadata
-            owners = getattr(wl_md, "ownerReferences", []) or []
-            for o in owners:
-                if (
-                    getattr(o, "kind", "") == "Job"
-                    and getattr(o, "name", "") == job_name
-                ):
-                    return True
-            wl_labels = getattr(wl_md, "labels", {}) or {}
-            if wl_labels.get("job-name") == job_name:
-                return True
-    except Exception:
-        return False
+#     for wl in workloads:
+#         wl_md = wl.model.metadata
+#         owners = getattr(wl_md, "ownerReferences", []) or []
+#         for o in owners:
+#             if (
+#                 getattr(o, "kind", "") == "Job"
+#                 and getattr(o, "name", "") == job_name
+#             ):
+#                 return True
+#         wl_labels = getattr(wl_md, "labels", {}) or {}
+#         if wl_labels.get("job-name") == job_name:
+#             return True
+# except Exception:
+#     return False
 
-    return False
+# return False