eliminate dependency on workload.codeflare.dev/appwrapper label

Author: dgrove-oss

src/codeflare_sdk/templates/base-template.yaml

@@ -16,7 +16,6 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            workload.codeflare.dev/appwrapper: "aw-kuberay"
             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

@@ -82,7 +82,6 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
     metadata["name"] = appwrapper_name
     metadata["namespace"] = namespace
     lower_meta = item.get("generictemplate", {}).get("metadata")
-    lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
     lower_meta["name"] = cluster_name
     lower_meta["namespace"] = namespace
 
@@ -209,6 +208,12 @@ def get_default_kueue_name(namespace: str):
     )
 
 
+def add_local_queue(item: dict, namespace: str, local_queue: Optional[str]):
+    lq_name = local_queue or get_default_kueue_name(namespace)
+    labels = item["metadata"]["labels"]
+    labels.update({"kueue.x-k8s.io/queue-name": lq_name})
+
+
 def write_components(
     user_yaml: dict, output_file_name: str, namespace: str, local_queue: Optional[str]
 ):
@@ -219,19 +224,10 @@ def write_components(
 
     components = user_yaml.get("spec", "resources")["resources"].get("GenericItems")
     open(output_file_name, "w").close()
-    lq_name = local_queue or get_default_kueue_name(namespace)
     with open(output_file_name, "a") as outfile:
         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})
+                add_local_queue(component["generictemplate"], namespace, local_queue)
                 outfile.write("---\n")
                 yaml.dump(
                     component["generictemplate"], outfile, default_flow_style=False
@@ -244,18 +240,9 @@ def load_components(
 ):
     component_list = []
     components = user_yaml.get("spec", "resources")["resources"].get("GenericItems")
-    lq_name = local_queue or get_default_kueue_name(namespace)
     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})
+            add_local_queue(component["generictemplate"], namespace, local_queue)
             component_list.append(component["generictemplate"])
 
     resources = "---\n" + "---\n".join(

tests/test-case-bad.yaml

@@ -13,7 +13,6 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            workload.codeflare.dev/appwrapper: unit-test-cluster
             controller-tools.k8s.io: '1.0'
           name: unit-test-cluster
           namespace: ns

tests/test-case.yaml

@@ -12,7 +12,6 @@ spec:
         metadata:
           labels:
             controller-tools.k8s.io: '1.0'
-            workload.codeflare.dev/appwrapper: unit-test-cluster
           name: unit-test-cluster
           namespace: ns
         spec:

tests/test-default-appwrapper.yaml

@@ -12,7 +12,6 @@ spec:
         metadata:
           labels:
             controller-tools.k8s.io: '1.0'
-            workload.codeflare.dev/appwrapper: unit-test-default-cluster
           name: unit-test-default-cluster
           namespace: opendatahub
         spec:

tests/unit_test.py

@@ -965,7 +965,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "labels": {
                         "controller-tools.k8s.io": "1.0",
                         "resourceName": "quicktest",
-                        "workload.codeflare.dev/appwrapper": "quicktest",
                         "orderedinstance": "m4.xlarge_g4dn.xlarge",
                     },
                     "name": "quicktest",
@@ -1272,7 +1271,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "creationTimestamp": "2023-02-22T16:26:07Z",
                     "generation": 1,
                     "labels": {
-                        "workload.codeflare.dev/appwrapper": "quicktest2",
                         "controller-tools.k8s.io": "1.0",
                         "resourceName": "quicktest2",
                         "orderedinstance": "m4.xlarge_g4dn.xlarge",
@@ -1463,7 +1461,6 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "workload.codeflare.dev/appwrapper": "quicktest1",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest1",
@@ -1667,7 +1664,6 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "workload.codeflare.dev/appwrapper": "quicktest2",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest2",