Remove ingress/routes logic from SDK (#495)

* WIP - Remove ingress/routes logic from SDK

* Remove ingress_options and update tests

Author: ChristianZaccaria

.github/workflows/e2e_tests.yaml

@@ -84,6 +84,7 @@ jobs:
           cd codeflare-operator
           echo Deploying CodeFlare operator
           IMG="${REGISTRY_ADDRESS}"/codeflare-operator
+          sed -i 's/RayDashboardOAuthEnabled: pointer.Bool(true)/RayDashboardOAuthEnabled: pointer.Bool(false)/' main.go
           make image-push -e IMG="${IMG}"
           make deploy -e IMG="${IMG}" -e ENV="e2e"
           kubectl wait --timeout=120s --for=condition=Available=true deployment -n openshift-operators codeflare-operator-manager

src/codeflare_sdk/cluster/cluster.py

@@ -187,8 +187,6 @@ def create_app_wrapper(self):
         local_interactive = self.config.local_interactive
         image_pull_secrets = self.config.image_pull_secrets
         dispatch_priority = self.config.dispatch_priority
-        ingress_domain = self.config.ingress_domain
-        ingress_options = self.config.ingress_options
         write_to_file = self.config.write_to_file
         verify_tls = self.config.verify_tls
         return generate_appwrapper(
@@ -213,8 +211,6 @@ def create_app_wrapper(self):
             image_pull_secrets=image_pull_secrets,
             dispatch_priority=dispatch_priority,
             priority_val=priority_val,
-            ingress_domain=ingress_domain,
-            ingress_options=ingress_options,
             write_to_file=write_to_file,
             verify_tls=verify_tls,
         )
@@ -493,8 +489,6 @@ def torchx_config(
     def from_k8_cluster_object(
         rc,
         mcad=True,
-        ingress_domain=None,
-        ingress_options={},
         write_to_file=False,
         verify_tls=True,
     ):
@@ -512,11 +506,6 @@ def from_k8_cluster_object(
             else []
         )
 
-        if local_interactive and ingress_domain == None:
-            ingress_domain = rc["metadata"]["annotations"][
-                "sdk.codeflare.dev/ingress_domain"
-            ]
-
         cluster_config = ClusterConfiguration(
             name=rc["metadata"]["name"],
             namespace=rc["metadata"]["namespace"],
@@ -553,8 +542,6 @@ def from_k8_cluster_object(
             ]["image"],
             local_interactive=local_interactive,
             mcad=mcad,
-            ingress_domain=ingress_domain,
-            ingress_options=ingress_options,
             write_to_file=write_to_file,
             verify_tls=verify_tls,
         )
@@ -661,62 +648,9 @@ def get_cluster(
     for rc in rcs["items"]:
         if rc["metadata"]["name"] == cluster_name:
             mcad = _check_aw_exists(cluster_name, namespace)
-            ingress_host = None
-            ingress_options = {}
-            if not is_openshift_cluster():
-                try:
-                    config_check()
-                    api_instance = client.NetworkingV1Api(api_config_handler())
-                    ingresses = api_instance.list_namespaced_ingress(namespace)
-                    for ingress in ingresses.items:
-                        # Search for ingress with AppWrapper name as the owner
-                        if (
-                            "ingress-owner" in ingress.metadata.labels
-                            and ingress.metadata.labels["ingress-owner"] == cluster_name
-                        ):
-                            ingress_host = ingress.spec.rules[0].host
-                            if (
-                                "ingress-options" in ingress.metadata.labels
-                                and ingress.metadata.labels["ingress-options"] == "true"
-                            ):
-                                ingress_name = ingress.metadata.name
-                                port = (
-                                    ingress.spec.rules[0]
-                                    .http.paths[0]
-                                    .backend.service.port.number
-                                )
-                                annotations = ingress.metadata.annotations
-                                path = ingress.spec.rules[0].http.paths[0].path
-                                ingress_class_name = ingress.spec.ingress_class_name
-                                path_type = (
-                                    ingress.spec.rules[0].http.paths[0].path_type
-                                )
-
-                                ingress_options = {
-                                    "ingresses": [
-                                        {
-                                            "ingressName": ingress_name,
-                                            "port": port,
-                                            "annotations": annotations,
-                                            "ingressClassName": ingress_class_name,
-                                            "pathType": path_type,
-                                            "path": path,
-                                            "host": ingress_host,
-                                        }
-                                    ]
-                                }
-                except Exception as e:  # pragma: no cover
-                    return _kube_api_error_handling(e)
-            # We gather the ingress domain from the host
-            if ingress_host is not None and ingress_options == {}:
-                ingress_domain = ingress_host.split(".", 1)[1]
-            else:
-                ingress_domain = None
             return Cluster.from_k8_cluster_object(
                 rc,
                 mcad=mcad,
-                ingress_domain=ingress_domain,
-                ingress_options=ingress_options,
                 write_to_file=write_to_file,
                 verify_tls=verify_tls,
             )
@@ -739,24 +673,6 @@ def _delete_resources(
                 plural="rayclusters",
                 name=name,
             )
-        elif resource["kind"] == "Ingress":
-            name = resource["metadata"]["name"]
-            api_instance.delete_namespaced_custom_object(
-                group="networking.k8s.io",
-                version="v1",
-                namespace=namespace,
-                plural="ingresses",
-                name=name,
-            )
-        elif resource["kind"] == "Route":
-            name = resource["metadata"]["name"]
-            api_instance.delete_namespaced_custom_object(
-                group="route.openshift.io",
-                version="v1",
-                namespace=namespace,
-                plural="routes",
-                name=name,
-            )
         elif resource["kind"] == "Secret":
             name = resource["metadata"]["name"]
             secret_instance = client.CoreV1Api(api_config_handler())
@@ -776,22 +692,6 @@ def _create_resources(yamls, namespace: str, api_instance: client.CustomObjectsA
                 plural="rayclusters",
                 body=resource,
             )
-        elif resource["kind"] == "Ingress":
-            api_instance.create_namespaced_custom_object(
-                group="networking.k8s.io",
-                version="v1",
-                namespace=namespace,
-                plural="ingresses",
-                body=resource,
-            )
-        elif resource["kind"] == "Route":
-            api_instance.create_namespaced_custom_object(
-                group="route.openshift.io",
-                version="v1",
-                namespace=namespace,
-                plural="routes",
-                body=resource,
-            )
         elif resource["kind"] == "Secret":
             secret_instance = client.CoreV1Api(api_config_handler())
             secret_instance.create_namespaced_secret(

src/codeflare_sdk/cluster/config.py

@@ -52,8 +52,6 @@ class ClusterConfiguration:
     local_interactive: bool = False
     image_pull_secrets: list = field(default_factory=list)
     dispatch_priority: str = None
-    ingress_options: dict = field(default_factory=dict)
-    ingress_domain: str = None
     write_to_file: bool = False
     verify_tls: bool = True
 

src/codeflare_sdk/templates/base-template.yaml

@@ -338,91 +338,6 @@ spec:
                     - key: odh-ca-bundle.crt
                       path: odh-ca-bundle.crt
                     optional: true
-    - replicas: 1
-      generictemplate:
-        apiVersion: networking.k8s.io/v1
-        kind: Ingress
-        metadata:
-          name: ray-dashboard-deployment-ingress
-          namespace: default
-          annotations:
-            annotations-example:annotations-example
-          labels:
-            ingress-options: "false"
-            ingress-owner: appwrapper-name
-        spec:
-          ingressClassName: nginx
-          rules:
-            - http:
-                paths:
-                  - backend:
-                      service:
-                        name: raytest-head-svc
-                        port:
-                          number: 8265
-                    pathType: Prefix
-                    path: /
-              host: ray-dashboard-raytest.<ingress-domain>
-    - replicas: 1
-      generictemplate:
-        kind: Route
-        apiVersion: route.openshift.io/v1
-        metadata:
-          name: ray-dashboard-deployment-route
-          namespace: default
-          labels:
-            # allows me to return name of service that Ray operator creates
-            odh-ray-cluster-service: deployment-name-head-svc
-        spec:
-          to:
-            kind: Service
-            name: deployment-name-head-svc
-          port:
-            targetPort: dashboard
-          tls:
-            termination: edge
-    - replicas: 1
-      generictemplate:
-        apiVersion: networking.k8s.io/v1
-        kind: Ingress
-        metadata:
-          name: rayclient-deployment-ingress
-          namespace: default
-          annotations:
-            annotations-example:annotations-example
-          labels:
-            odh-ray-cluster-service: deployment-name-head-svc
-        spec:
-          ingressClassName: nginx
-          rules:
-            - http:
-                paths:
-                - backend:
-                    service:
-                      name: deployment-name-head-svc
-                      port:
-                        number: 10001
-                  path: ''
-                  pathType: ImplementationSpecific
-              host: rayclient-raytest.<ingress-domain>
-    - replicas: 1
-      generictemplate:
-        apiVersion: route.openshift.io/v1
-        kind: Route
-        metadata:
-          name: rayclient-deployment-route
-          namespace: default
-          labels:
-            # allows me to return name of service that Ray operator creates
-            odh-ray-cluster-service: deployment-name-head-svc
-        spec:
-          port:
-            targetPort: client
-          tls:
-            termination: passthrough
-          to:
-            kind: Service
-            name: deployment-name-head-svc
     - replicas: 1
       generictemplate:
         apiVersion: v1

src/codeflare_sdk/utils/generate_yaml.py

@@ -49,10 +49,6 @@ def gen_names(name):
         return name, name
 
 
-def gen_dashboard_ingress_name(cluster_name):
-    return f"ray-dashboard-{cluster_name}"
-
-
 # Check if the routes api exists
 def is_openshift_cluster():
     try:
@@ -67,156 +63,17 @@ def is_openshift_cluster():
         return _kube_api_error_handling(e)
 
 
-def update_dashboard_route(route_item, cluster_name, namespace):
-    metadata = route_item.get("generictemplate", {}).get("metadata")
-    metadata["name"] = gen_dashboard_ingress_name(cluster_name)
-    metadata["namespace"] = namespace
-    metadata["labels"]["odh-ray-cluster-service"] = f"{cluster_name}-head-svc"
-    spec = route_item.get("generictemplate", {}).get("spec")
-    spec["to"]["name"] = f"{cluster_name}-head-svc"
-
-
-# ToDo: refactor the update_x_route() functions
-def update_rayclient_route(route_item, cluster_name, namespace):
-    metadata = route_item.get("generictemplate", {}).get("metadata")
-    metadata["name"] = f"rayclient-{cluster_name}"
-    metadata["namespace"] = namespace
-    metadata["labels"]["odh-ray-cluster-service"] = f"{cluster_name}-head-svc"
-    spec = route_item.get("generictemplate", {}).get("spec")
-    spec["to"]["name"] = f"{cluster_name}-head-svc"
-
-
-def update_dashboard_exposure(
-    ingress_item, route_item, cluster_name, namespace, ingress_options, ingress_domain
-):
-    if is_openshift_cluster():
-        update_dashboard_route(route_item, cluster_name, namespace)
-    else:
-        update_dashboard_ingress(
-            ingress_item, cluster_name, namespace, ingress_options, ingress_domain
-        )
-
-
-def update_rayclient_exposure(
-    client_route_item, client_ingress_item, cluster_name, namespace, ingress_domain
-):
-    if is_openshift_cluster():
-        update_rayclient_route(client_route_item, cluster_name, namespace)
-    else:
-        update_rayclient_ingress(
-            client_ingress_item, cluster_name, namespace, ingress_domain
-        )
-
-
-def update_dashboard_ingress(
-    ingress_item, cluster_name, namespace, ingress_options, ingress_domain
-):  # pragma: no cover
-    metadata = ingress_item.get("generictemplate", {}).get("metadata")
-    spec = ingress_item.get("generictemplate", {}).get("spec")
-    if ingress_options != {}:
-        for index, ingress_option in enumerate(ingress_options["ingresses"]):
-            if "ingressName" not in ingress_option.keys():
-                raise ValueError(
-                    f"Error: 'ingressName' is missing or empty for ingress item at index {index}"
-                )
-            if "port" not in ingress_option.keys():
-                raise ValueError(
-                    f"Error: 'port' is missing or empty for ingress item at index {index}"
-                )
-            elif not isinstance(ingress_option["port"], int):
-                raise ValueError(
-                    f"Error: 'port' is not of type int for ingress item at index {index}"
-                )
-            if ingress_option is not None:
-                metadata["name"] = ingress_option["ingressName"]
-                metadata["namespace"] = namespace
-                metadata["labels"]["ingress-owner"] = cluster_name
-                metadata["labels"]["ingress-options"] = "true"
-                if (
-                    "annotations" not in ingress_option.keys()
-                    or ingress_option["annotations"] is None
-                ):
-                    del metadata["annotations"]
-                else:
-                    metadata["annotations"] = ingress_option["annotations"]
-                if (
-                    "path" not in ingress_option.keys()
-                    or ingress_option["path"] is None
-                ):
-                    del spec["rules"][0]["http"]["paths"][0]["path"]
-                else:
-                    spec["rules"][0]["http"]["paths"][0]["path"] = ingress_option[
-                        "path"
-                    ]
-                if (
-                    "pathType" not in ingress_option.keys()
-                    or ingress_option["pathType"] is None
-                ):
-                    spec["rules"][0]["http"]["paths"][0][
-                        "pathType"
-                    ] = "ImplementationSpecific"
-                if (
-                    "host" not in ingress_option.keys()
-                    or ingress_option["host"] is None
-                ):
-                    del spec["rules"][0]["host"]
-                else:
-                    spec["rules"][0]["host"] = ingress_option["host"]
-                if (
-                    "ingressClassName" not in ingress_option.keys()
-                    or ingress_option["ingressClassName"] is None
-                ):
-                    del spec["ingressClassName"]
-                else:
-                    spec["ingressClassName"] = ingress_option["ingressClassName"]
-
-                spec["rules"][0]["http"]["paths"][0]["backend"]["service"][
-                    "name"
-                ] = f"{cluster_name}-head-svc"
-    else:
-        spec["ingressClassName"] = "nginx"
-        metadata["name"] = gen_dashboard_ingress_name(cluster_name)
-        metadata["labels"]["ingress-owner"] = cluster_name
-        metadata["namespace"] = namespace
-        spec["rules"][0]["http"]["paths"][0]["backend"]["service"][
-            "name"
-        ] = f"{cluster_name}-head-svc"
-        if ingress_domain is None:
-            raise ValueError(
-                "ingress_domain is invalid. Please specify an ingress domain"
-            )
-        else:
-            domain = ingress_domain
-        del metadata["annotations"]
-        spec["rules"][0]["host"] = f"ray-dashboard-{cluster_name}-{namespace}.{domain}"
-
-
-def update_rayclient_ingress(
-    ingress_item, cluster_name, namespace, ingress_domain
-):  # pragma: no cover
-    metadata = ingress_item.get("generictemplate", {}).get("metadata")
-    spec = ingress_item.get("generictemplate", {}).get("spec")
-    metadata["name"] = f"rayclient-{cluster_name}"
-    metadata["namespace"] = namespace
-    metadata["labels"]["odh-ray-cluster-service"] = f"{cluster_name}-head-svc"
-
-    spec["rules"][0]["http"]["paths"][0]["backend"]["service"][
-        "name"
-    ] = f"{cluster_name}-head-svc"
-
-    if ingress_domain is not None:
-        ingressClassName = "nginx"
-        annotations = {
-            "nginx.ingress.kubernetes.io/rewrite-target": "/",
-            "nginx.ingress.kubernetes.io/ssl-redirect": "true",
-            "nginx.ingress.kubernetes.io/ssl-passthrough": "true",
-        }
-    else:
-        raise ValueError("ingress_domain is invalid. Please specify a domain")
-
-    metadata["annotations"] = annotations
-    spec["ingressClassName"] = ingressClassName
-    spec["rules"][0]["host"] = f"rayclient-{cluster_name}-{namespace}.{ingress_domain}"
+def is_kind_cluster():
+    try:
+        config_check()
+        v1 = client.CoreV1Api()
+        label_selector = "kubernetes.io/hostname=kind-control-plane"
+        nodes = v1.list_node(label_selector=label_selector)
+        # If we find one or more nodes with the label, assume it's a KinD cluster
+        return len(nodes.items) > 0
+    except Exception as e:
+        print(f"Error checking if cluster is KinD: {e}")
+        return False
 
 
 def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
@@ -433,10 +290,10 @@ def update_ca_secret(ca_secret_item, cluster_name, namespace):
     data["ca.key"], data["ca.crt"] = generate_cert.generate_ca_cert(365)
 
 
-def enable_local_interactive(resources, cluster_name, namespace, ingress_domain):
-    rayclient_ingress_item = resources["resources"].get("GenericItems")[3]
-    rayclient_route_item = resources["resources"].get("GenericItems")[4]
-    ca_secret_item = resources["resources"].get("GenericItems")[5]
+def enable_local_interactive(resources, cluster_name, namespace):  # pragma: no cover
+    from ..cluster.cluster import _get_ingress_domain
+
+    ca_secret_item = resources["resources"].get("GenericItems")[1]
     item = resources["resources"].get("GenericItems")[0]
     update_ca_secret(ca_secret_item, cluster_name, namespace)
     # update_ca_secret_volumes
@@ -460,40 +317,18 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
 
     command = command.replace("deployment-name", cluster_name)
 
-    if ingress_domain is None:
-        raise ValueError(
-            "ingress_domain is invalid. For creating the client route/ingress please specify an ingress domain"
-        )
-    else:
-        domain = ingress_domain
+    domain = ""  ## FIX - We can't retrieve ingress domain - move init container to CFO
 
     command = command.replace("server-name", domain)
-    update_rayclient_exposure(
-        rayclient_route_item,
-        rayclient_ingress_item,
-        cluster_name,
-        namespace,
-        ingress_domain,
-    )
     item["generictemplate"]["metadata"]["annotations"][
         "sdk.codeflare.dev/local_interactive"
     ] = "True"
-    item["generictemplate"]["metadata"]["annotations"][
-        "sdk.codeflare.dev/ingress_domain"
-    ] = ingress_domain
 
     item["generictemplate"]["spec"]["headGroupSpec"]["template"]["spec"][
         "initContainers"
     ][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]
 
@@ -544,26 +379,6 @@ def disable_raycluster_tls(resources):
     resources["GenericItems"] = updated_items
 
 
-def delete_route_or_ingress(resources):
-    if is_openshift_cluster():
-        client_to_remove_name = "rayclient-deployment-ingress"
-        dashboard_to_remove_name = "ray-dashboard-deployment-ingress"
-    else:
-        client_to_remove_name = "rayclient-deployment-route"
-        dashboard_to_remove_name = "ray-dashboard-deployment-route"
-
-    updated_items = []
-    for i in resources["GenericItems"][:]:
-        if dashboard_to_remove_name in i["generictemplate"]["metadata"]["name"]:
-            continue
-        elif client_to_remove_name in i["generictemplate"]["metadata"]["name"]:
-            continue
-
-        updated_items.append(i)
-
-    resources["GenericItems"] = updated_items
-
-
 def write_user_appwrapper(user_yaml, output_file_name):
     # Create the directory if it doesn't exist
     directory_path = os.path.dirname(output_file_name)
@@ -602,7 +417,6 @@ def enable_openshift_oauth(user_yaml, cluster_name, namespace):
     ray_headgroup_pod = user_yaml["spec"]["resources"]["GenericItems"][0][
         "generictemplate"
     ]["spec"]["headGroupSpec"]["template"]["spec"]
-    user_yaml["spec"]["resources"]["GenericItems"].pop(1)
     ray_headgroup_pod["serviceAccount"] = oauth_sa_name
     ray_headgroup_pod["volumes"] = ray_headgroup_pod.get("volumes", [])
 
@@ -707,18 +521,20 @@ def generate_appwrapper(
     image_pull_secrets: list,
     dispatch_priority: str,
     priority_val: int,
-    ingress_domain: str,
-    ingress_options: dict,
     write_to_file: bool,
     verify_tls: bool,
 ):
     user_yaml = read_template(template)
     appwrapper_name, cluster_name = gen_names(name)
     resources = user_yaml.get("spec", "resources")
     item = resources["resources"].get("GenericItems")[0]
-    ingress_item = resources["resources"].get("GenericItems")[1]
-    route_item = resources["resources"].get("GenericItems")[2]
-    update_names(user_yaml, item, appwrapper_name, cluster_name, namespace)
+    update_names(
+        user_yaml,
+        item,
+        appwrapper_name,
+        cluster_name,
+        namespace,
+    )
     update_labels(user_yaml, instascale, instance_types)
     update_priority(user_yaml, item, dispatch_priority, priority_val)
     update_custompodresources(
@@ -750,24 +566,12 @@ def generate_appwrapper(
         head_memory,
         head_gpus,
     )
-    update_dashboard_exposure(
-        ingress_item,
-        route_item,
-        cluster_name,
-        namespace,
-        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)
+        enable_local_interactive(resources, cluster_name, namespace)
     else:
         disable_raycluster_tls(resources["resources"])
 
-    delete_route_or_ingress(resources["resources"])
-
     if is_openshift_cluster():
         enable_openshift_oauth(user_yaml, cluster_name, namespace)
 

tests/e2e/mnist_raycluster_sdk_test.py

@@ -36,24 +36,6 @@ def test_mnist_ray_cluster_sdk(self):
 
     def run_mnist_raycluster_sdk(self):
         ray_image = get_ray_image()
-        host = os.getenv("CLUSTER_HOSTNAME")
-
-        ingress_options = {}
-        if host is not None:
-            ingress_options = {
-                "ingresses": [
-                    {
-                        "ingressName": "ray-dashboard",
-                        "port": 8265,
-                        "pathType": "Prefix",
-                        "path": "/",
-                        "host": host,
-                        "annotations": {
-                            "nginx.ingress.kubernetes.io/proxy-body-size": "100M",
-                        },
-                    },
-                ]
-            }
 
         cluster = Cluster(
             ClusterConfiguration(
@@ -69,7 +51,6 @@ def run_mnist_raycluster_sdk(self):
                 num_gpus=0,
                 instascale=False,
                 image=ray_image,
-                ingress_options=ingress_options,
                 write_to_file=True,
             )
         )

tests/e2e/start_ray_cluster.py

@@ -7,21 +7,6 @@
 
 namespace = sys.argv[1]
 ray_image = os.getenv("RAY_IMAGE")
-host = os.getenv("CLUSTER_HOSTNAME")
-
-ingress_options = {}
-if host is not None:
-    ingress_options = {
-        "ingresses": [
-            {
-                "ingressName": "ray-dashboard",
-                "port": 8265,
-                "pathType": "Prefix",
-                "path": "/",
-                "host": host,
-            },
-        ]
-    }
 
 cluster = Cluster(
     ClusterConfiguration(
@@ -37,7 +22,6 @@
         num_gpus=0,
         instascale=False,
         image=ray_image,
-        ingress_options=ingress_options,
     )
 )
 

tests/test-case-no-mcad.yamls

@@ -3,7 +3,6 @@ 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'
@@ -197,25 +196,3 @@ spec:
             name: odh-trusted-ca-bundle
             optional: true
           name: odh-ca-cert
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  labels:
-    ingress-options: 'false'
-    ingress-owner: unit-test-cluster-ray
-  name: ray-dashboard-unit-test-cluster-ray
-  namespace: ns
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: ray-dashboard-unit-test-cluster-ray-ns.apps.cluster.awsroute.org
-    http:
-      paths:
-      - backend:
-          service:
-            name: unit-test-cluster-ray-head-svc
-            port:
-              number: 8265
-        path: /
-        pathType: Prefix

tests/test-case-prio.yaml

@@ -33,7 +33,6 @@ 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'
@@ -230,27 +229,4 @@ spec:
                     optional: true
                   name: odh-ca-cert
       replicas: 1
-    - generictemplate:
-        apiVersion: networking.k8s.io/v1
-        kind: Ingress
-        metadata:
-          labels:
-            ingress-options: 'false'
-            ingress-owner: prio-test-cluster
-          name: ray-dashboard-prio-test-cluster
-          namespace: ns
-        spec:
-          ingressClassName: nginx
-          rules:
-          - host: ray-dashboard-prio-test-cluster-ns.apps.cluster.awsroute.org
-            http:
-              paths:
-              - backend:
-                  service:
-                    name: prio-test-cluster-head-svc
-                    port:
-                      number: 8265
-                path: /
-                pathType: Prefix
-      replicas: 1
     Items: []

tests/test-case.yaml

@@ -32,7 +32,6 @@ 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'
@@ -227,27 +226,4 @@ spec:
                     optional: true
                   name: odh-ca-cert
       replicas: 1
-    - generictemplate:
-        apiVersion: networking.k8s.io/v1
-        kind: Ingress
-        metadata:
-          labels:
-            ingress-options: 'false'
-            ingress-owner: unit-test-cluster
-          name: ray-dashboard-unit-test-cluster
-          namespace: ns
-        spec:
-          ingressClassName: nginx
-          rules:
-          - host: ray-dashboard-unit-test-cluster-ns.apps.cluster.awsroute.org
-            http:
-              paths:
-              - backend:
-                  service:
-                    name: unit-test-cluster-head-svc
-                    port:
-                      number: 8265
-                path: /
-                pathType: Prefix
-      replicas: 1
     Items: []

tests/test-default-appwrapper.yaml

@@ -30,7 +30,6 @@ 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'
@@ -205,27 +204,4 @@ spec:
                     optional: true
                   name: odh-ca-cert
       replicas: 1
-    - generictemplate:
-        apiVersion: networking.k8s.io/v1
-        kind: Ingress
-        metadata:
-          labels:
-            ingress-options: 'false'
-            ingress-owner: unit-test-default-cluster
-          name: ray-dashboard-unit-test-default-cluster
-          namespace: opendatahub
-        spec:
-          ingressClassName: nginx
-          rules:
-          - host: ray-dashboard-unit-test-default-cluster-opendatahub.apps.cluster.awsroute.org
-            http:
-              paths:
-              - backend:
-                  service:
-                    name: unit-test-default-cluster-head-svc
-                    port:
-                      number: 8265
-                path: /
-                pathType: Prefix
-      replicas: 1
     Items: []

tests/unit_test.py

@@ -46,7 +46,6 @@ def createClusterConfig():
         instascale=True,
         machine_types=["cpu.small", "gpu.large"],
         image_pull_secrets=["unit-test-pull-secret"],
-        ingress_domain="apps.cluster.awsroute.org",
         image="quay.io/project-codeflare/ray:latest-py39-cu118",
         write_to_file=True,
     )