Addressed comments & added SUSPENDED status

Author: Bobbins228

src/codeflare_sdk/cluster/cluster.py

@@ -334,6 +334,9 @@ def status(
         # check the ray cluster status
         cluster = _ray_cluster_status(self.config.name, self.config.namespace)
         if cluster:
+            if cluster.status == RayClusterStatus.SUSPENDED:
+                ready = False
+                status = CodeFlareClusterStatus.SUSPENDED
             if cluster.status == RayClusterStatus.UNKNOWN:
                 ready = False
                 status = CodeFlareClusterStatus.STARTING

src/codeflare_sdk/cluster/model.py

@@ -32,6 +32,7 @@ class RayClusterStatus(Enum):
     UNHEALTHY = "unhealthy"
     FAILED = "failed"
     UNKNOWN = "unknown"
+    SUSPENDED = "suspended"
 
 
 class AppWrapperStatus(Enum):
@@ -59,6 +60,7 @@ class CodeFlareClusterStatus(Enum):
     QUEUEING = 4
     FAILED = 5
     UNKNOWN = 6
+    SUSPENDED = 7
 
 
 @dataclass

src/codeflare_sdk/templates/base-template.yaml

@@ -44,7 +44,6 @@ spec:
             sdk.codeflare.dev/local_interactive: "False"
           labels:
             workload.codeflare.dev/appwrapper: "aw-kuberay"
-            kueue.x-k8s.io/queue-name: local-queue
             controller-tools.k8s.io: "1.0"
             # A unique identifier for the head node and workers of this cluster.
           name: kuberay-cluster

src/codeflare_sdk/utils/generate_yaml.py

@@ -557,9 +557,6 @@ def write_user_appwrapper(user_yaml, output_file_name):
         os.makedirs(directory_path)
 
     with open(output_file_name, "w") as outfile:
-        del user_yaml["spec"]["resources"]["GenericItems"][0]["generictemplate"][
-            "metadata"
-        ]["labels"]["kueue.x-k8s.io/queue-name"]
         yaml.dump(user_yaml, outfile, default_flow_style=False)
 
     print(f"Written to: {output_file_name}")
@@ -638,7 +635,8 @@ def _create_oauth_sidecar_object(
     )
 
 
-def update_local_kueue_label(local_queue: str, namespace: str):
+def get_default_kueue_name(local_queue: str, namespace: str):
+    # If the local queue is set, use it. Otherwise, try to use the default queue.
     if local_queue is not None:
         return local_queue
     else:
@@ -688,9 +686,14 @@ def write_components(
                     del component["generictemplate"]["metadata"]["labels"][
                         "workload.codeflare.dev/appwrapper"
                     ]
-                    component["generictemplate"]["metadata"]["labels"][
-                        "kueue.x-k8s.io/queue-name"
-                    ] = update_local_kueue_label(local_queue, namespace)
+                    labels = component["generictemplate"]["metadata"]["labels"]
+                    labels.update(
+                        {
+                            "kueue.x-k8s.io/queue-name": get_default_kueue_name(
+                                local_queue, namespace
+                            )
+                        }
+                    )
                 outfile.write("---\n")
                 yaml.dump(
                     component["generictemplate"], outfile, default_flow_style=False