address feedback

Author: Fiona-Waters

src/codeflare_sdk/utils/generate_yaml.py

@@ -380,31 +380,30 @@ def load_components(
     components = user_yaml.get("spec", "resources")["resources"].get("GenericItems")
     lq_name = local_queue or get_default_kueue_name(namespace)
     cluster_labels = labels
-    if local_queue_exists(namespace, lq_name):
-        for component in components:
-            if "generictemplate" in component:
-                if (
-                    "workload.codeflare.dev/appwrapper"
-                    in component["generictemplate"]["metadata"]["labels"]
-                ):
-                    del component["generictemplate"]["metadata"]["labels"][
-                        "workload.codeflare.dev/appwrapper"
-                    ]
-                    labels = component["generictemplate"]["metadata"]["labels"]
-                    labels.update({"kueue.x-k8s.io/queue-name": lq_name})
-                    labels.update(cluster_labels)
-                component_list.append(component["generictemplate"])
-
-        resources = "---\n" + "---\n".join(
-            [yaml.dump(component) for component in component_list]
-        )
-        user_yaml = resources
-        print(f"Yaml resources loaded for {name}")
-        return user_yaml
-    else:
+    if not local_queue_exists(namespace, lq_name):
         raise ValueError(
-            "local_queue provided does not exist. Please provide the correct local_queue name in Cluster Configuration"
+            "local_queue provided does not exist or is not in this namespace. Please provide the correct local_queue name in Cluster Configuration"
         )
+    for component in components:
+        if "generictemplate" in component:
+            if (
+                "workload.codeflare.dev/appwrapper"
+                in component["generictemplate"]["metadata"]["labels"]
+            ):
+                del component["generictemplate"]["metadata"]["labels"][
+                    "workload.codeflare.dev/appwrapper"
+                ]
+                labels = component["generictemplate"]["metadata"]["labels"]
+                labels.update({"kueue.x-k8s.io/queue-name": lq_name})
+                labels.update(cluster_labels)
+            component_list.append(component["generictemplate"])
+
+    resources = "---\n" + "---\n".join(
+        [yaml.dump(component) for component in component_list]
+    )
+    user_yaml = resources
+    print(f"Yaml resources loaded for {name}")
+    return user_yaml
 
 
 def load_appwrapper(user_yaml: dict, name: str):