Add enableIngress and set to false by default

project-codeflare · Apr 16, 2024 · 6557465 · 6557465
1 parent 979ff43
commit 6557465
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/src/codeflare_sdk/cluster/cluster.py b/src/codeflare_sdk/cluster/cluster.py
@@ -547,6 +547,20 @@ def _component_resources_up(
         if self.config.write_to_file:
             with open(self.app_wrapper_yaml) as f:
                 yamls = yaml.load_all(f, Loader=yaml.FullLoader)
+                for resource in yamls:
+                    enable_ingress = (
+                        resource.get("spec", {})
+                        .get("headGroupSpec", {})
+                        .get("enableIngress")
+                    )
+                    if resource["kind"] == "RayCluster" and enable_ingress is not False:
+                        name = resource["metadata"]["name"]
+                        print(
+                            f"Forbidden: RayCluster '{name}' has 'enableIngress' set to 'True' or is unset."
+                        )
+                        return
+                f.seek(0)  # Reset file pointer to the beginning
+                yamls = yaml.load_all(f, Loader=yaml.FullLoader)  # Reload the YAMLs
                 _create_resources(yamls, namespace, api_instance)
         else:
             yamls = yaml.load_all(self.app_wrapper_yaml, Loader=yaml.FullLoader)

diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
@@ -87,6 +87,7 @@ spec:
           headGroupSpec:
             # Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
             serviceType: ClusterIP
+            enableIngress: false
             # logical group name, for this called head-group, also can be functional
             # pod type head or worker
             # rayNodeType: head # Not needed since it is under the headgroup

diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -23,6 +23,7 @@ spec:
     upscalingMode: Default
   enableInTreeAutoscaling: false
   headGroupSpec:
+    enableIngress: false
     rayStartParams:
       block: 'true'
       dashboard-host: 0.0.0.0

diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
@@ -53,6 +53,7 @@ spec:
             upscalingMode: Default
           enableInTreeAutoscaling: false
           headGroupSpec:
+            enableIngress: false
             rayStartParams:
               block: 'true'
               dashboard-host: 0.0.0.0

diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -52,6 +52,7 @@ spec:
             upscalingMode: Default
           enableInTreeAutoscaling: false
           headGroupSpec:
+            enableIngress: false
             rayStartParams:
               block: 'true'
               dashboard-host: 0.0.0.0

diff --git a/tests/test-default-appwrapper.yaml b/tests/test-default-appwrapper.yaml
@@ -50,6 +50,7 @@ spec:
             upscalingMode: Default
           enableInTreeAutoscaling: false
           headGroupSpec:
+            enableIngress: false
             rayStartParams:
               block: 'true'
               dashboard-host: 0.0.0.0