Altered ingress creation code

Author: Bobbins228

src/codeflare_sdk/cluster/cluster.py

@@ -128,8 +128,6 @@ def up(self):
                 plural="appwrappers",
                 body=aw,
             )
-            # Create the ingress
-            create_ingress(self)
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -149,11 +147,6 @@ def down(self):
                 plural="appwrappers",
                 name=self.app_wrapper_name,
             )
-            # Delete the ingress
-            api_instance = client.NetworkingV1Api(api_config_handler())
-            api_instance.delete_namespaced_ingress(
-                name=f"ray-dashboard-{self.config.name}", namespace=namespace
-            )
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
@@ -362,54 +355,6 @@ def local_client_url(self):
             return "None"
 
 
-def create_ingress(self):
-    """
-    Create a Kubernetes Ingress resource to expose the Ray dashboard service externally.
-    """
-    ingress_domain = _get_ingress_domain()
-    try:
-        config_check()
-        api_instance = client.NetworkingV1Api(api_config_handler())
-
-        ingress_manifest = {
-            "apiVersion": "networking.k8s.io/v1",
-            "kind": "Ingress",
-            "metadata": {
-                "name": f"ray-dashboard-{self.config.name}",
-                "namespace": self.config.namespace,
-            },
-            "spec": {
-                "rules": [
-                    {
-                        "host": f"ray-dashboard-{self.config.name}.{self.config.namespace}.{ingress_domain}",
-                        "http": {
-                            "paths": [
-                                {
-                                    "path": "/",
-                                    "pathType": "Prefix",
-                                    "backend": {
-                                        "service": {
-                                            "name": f"{self.config.name}-head-svc",
-                                            "port": {
-                                                "number": 8265,
-                                            },
-                                        }
-                                    },
-                                }
-                            ]
-                        },
-                    }
-                ],
-            },
-        }
-
-        api_instance.create_namespaced_ingress(
-            namespace=self.config.namespace, body=ingress_manifest
-        )
-    except Exception as e:
-        return _kube_api_error_handling(e)
-
-
 def list_all_clusters(namespace: str, print_to_console: bool = True):
     """
     Returns (and prints by default) a list of all clusters in a given namespace.
@@ -486,7 +431,7 @@ def _get_ingress_domain():
         config.load_kube_config()
         api_client = client.CustomObjectsApi()
         ingress = api_client.get_cluster_custom_object(
-            "config.openshift.io", "v1", "ingresses", "cluster"
+            "networking.k8s.io", "v1", "ingresses", "cluster"
         )
     except Exception as e:  # pragma: no cover
         return _kube_api_error_handling(e)

src/codeflare_sdk/templates/base-template.yaml

@@ -287,40 +287,25 @@ spec:
                   optional: false
                 - name: server-cert
                   emptyDir: {}
-    - replica: 1
-      generictemplate:
-        kind: Route
-        apiVersion: route.openshift.io/v1
-        metadata:
-          name: ray-dashboard-deployment-name
-          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
     - replicas: 1
       generictemplate:
-        apiVersion: route.openshift.io/v1
-        kind: Route
+        apiVersion: networking.k8s.io/v1
+        kind: Ingress
         metadata:
-          name: rayclient-deployment-name
-          namespace: default
-          labels:
-            # allows me to return name of service that Ray operator creates
-            odh-ray-cluster-service: deployment-name-head-svc
+          name: ray-dashboard-raytest
+          namespace: opendatahub
         spec:
-          port:
-            targetPort: client
-          tls:
-            termination: passthrough
-          to:
-            kind: Service
-            name: deployment-name-head-svc
+          rules:
+            - host: placeholder  # Replace with your desired hostname or domain
+              http:
+                paths:
+                  - path: /   # Replace with the path you want to route to the service
+                    pathType: Prefix
+                    backend:
+                      service:
+                        name: raytest-head-svc   # Replace with your service name
+                        port:
+                          number: 8265   # Replace with the service port
     - replicas: 1
       generictemplate:
         apiVersion: v1

src/codeflare_sdk/utils/generate_yaml.py

@@ -23,6 +23,7 @@
 import uuid
 from kubernetes import client, config
 from .kube_api_helpers import _kube_api_error_handling
+from ..cluster.auth import api_config_handler, config_check
 
 
 def read_template(template):
@@ -47,9 +48,22 @@ def update_dashboard_route(route_item, cluster_name, namespace):
     metadata = route_item.get("generictemplate", {}).get("metadata")
     metadata["name"] = f"ray-dashboard-{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"
+    print(spec["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"])
+    spec["rules"][0]["http"]["paths"][0]["backend"]["service"][
+        "name"
+    ] = f"{cluster_name}-head-svc"
+    print(spec["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"])
+    try:
+        config_check()
+        api_client = client.CustomObjectsApi(api_config_handler())
+        ingress = api_client.get_cluster_custom_object(
+            "config.openshift.io", "v1", "ingresses", "cluster"
+        )
+    except Exception as e:  # pragma: no cover
+        return _kube_api_error_handling(e)
+    domain = ingress["spec"]["domain"]
+    spec["rules"][0]["host"] = f"ray-dashboard-{cluster_name}-{namespace}.{domain}"
 
 
 # ToDo: refactor the update_x_route() functions

tests/test-case.yaml

@@ -178,18 +178,22 @@ spec:
                   name: init-myservice
       replicas: 1
     - generictemplate:
-        apiVersion: route.openshift.io/v1
-        kind: Route
+        apiVersion: networking.k8s.io/v1
+        kind: Ingress
         metadata:
-          labels:
-            odh-ray-cluster-service: unit-test-cluster-head-svc
           name: ray-dashboard-unit-test-cluster
           namespace: ns
         spec:
-          port:
-            targetPort: dashboard
-          to:
-            kind: Service
-            name: unit-test-cluster-head-svc
-      replica: 1
+          rules:
+          - host: ray-dashboard-unit-test-cluster-ns.
+            http:
+              paths:
+              - backend:
+                  service:
+                    name: unit-test-cluster-head-svc
+                    port:
+                      number: 8265
+                path: /
+                pathType: Prefix
+      replicas: 1
     Items: []