WIP - Remove ingress/routes logic from SDK

Author: ChristianZaccaria

src/codeflare_sdk/cluster/cluster.py

@@ -188,7 +188,7 @@ def create_app_wrapper(self):
         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
+        # ingress_options = self.config.ingress_options
         write_to_file = self.config.write_to_file
         verify_tls = self.config.verify_tls
         return generate_appwrapper(
@@ -214,7 +214,7 @@ def create_app_wrapper(self):
             dispatch_priority=dispatch_priority,
             priority_val=priority_val,
             ingress_domain=ingress_domain,
-            ingress_options=ingress_options,
+            # ingress_options=ingress_options,
             write_to_file=write_to_file,
             verify_tls=verify_tls,
         )
@@ -739,24 +739,24 @@ 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"] == "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 +776,22 @@ 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"] == "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/templates/base-template.yaml

@@ -338,91 +338,91 @@ 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: 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