Updated ingress_domain annotation

Author: Bobbins228

src/codeflare_sdk/utils/generate_yaml.py

@@ -473,6 +473,13 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
     ][0].get("command")[2] = command
 
 
+def apply_ingress_domain_annotation(resources, ingress_domain):
+    item = resources["resources"].get("GenericItems")[0]
+    item["generictemplate"]["metadata"]["annotations"][
+        "sdk.codeflare.dev/ingress_domain"
+    ] = ingress_domain
+
+
 def del_from_list_by_name(l: list, target: typing.List[str]) -> list:
     return [x for x in l if x["name"] not in target]
 
@@ -740,6 +747,9 @@ def generate_appwrapper(
         ingress_options,
         ingress_domain,
     )
+    if ingress_domain is not None:
+        apply_ingress_domain_annotation(resources, ingress_domain)
+
     if local_interactive:
         enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
     else:

tests/test-case-no-mcad.yamls

@@ -3,6 +3,7 @@ apiVersion: ray.io/v1
 kind: RayCluster
 metadata:
   annotations:
+    sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
     sdk.codeflare.dev/local_interactive: 'false'
   labels:
     controller-tools.k8s.io: '1.0'

tests/test-case-prio.yaml

@@ -33,6 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
+            sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'false'
           labels:
             controller-tools.k8s.io: '1.0'

tests/test-case.yaml

@@ -32,6 +32,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
+            sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'false'
           labels:
             controller-tools.k8s.io: '1.0'

tests/test-default-appwrapper.yaml

@@ -30,6 +30,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
+            sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'false'
           labels:
             controller-tools.k8s.io: '1.0'

tests/unit_test.py

@@ -3434,6 +3434,7 @@ def test_cleanup():
     os.remove(f"{aw_dir}prio-test-cluster.yaml")
     os.remove(f"{aw_dir}test.yaml")
     os.remove(f"{aw_dir}raytest2.yaml")
+    os.remove(f"{aw_dir}unit-test-cluster-ray.yaml")
     os.remove("tls-cluster-namespace/ca.crt")
     os.remove("tls-cluster-namespace/tls.crt")
     os.remove("tls-cluster-namespace/tls.key")