Change Default namespace logic to use user's current namespace

Signed-off-by: Anish Asthana <[email protected]>

Author: anishasthana

src/codeflare_sdk/cluster/cluster.py

@@ -63,6 +63,14 @@ def create_app_wrapper(self):
         Called upon cluster object creation, creates an AppWrapper yaml based on
         the specifications of the ClusterConfiguration.
         """
+
+        if self.config.namespace is None:
+            self.config.namespace = get_current_namespace()
+            if type(self.config.namespace) is not str:
+                raise TypeError(
+                    f"Namespace {self.config.namespace} is of type {type(self.config.namespace)}. Check your Kubernetes Authentication."
+                )
+
         name = self.config.name
         namespace = self.config.namespace
         min_cpu = self.config.min_cpus

src/codeflare_sdk/cluster/config.py

@@ -21,6 +21,7 @@
 from dataclasses import dataclass, field
 from .auth import Authentication
 import pathlib
+import openshift
 
 dir = pathlib.Path(__file__).parent.parent.resolve()
 
@@ -33,7 +34,7 @@ class ClusterConfiguration:
     """
 
     name: str
-    namespace: str = "default"
+    namespace: str = None
     head_info: list = field(default_factory=list)
     machine_types: list = field(default_factory=list)  # ["m4.xlarge", "g4dn.xlarge"]
     min_cpus: int = 1

tests/unit_test.py

@@ -240,6 +240,23 @@ def test_cluster_creation():
     return cluster
 
 
+def test_default_cluster_creation(mocker):
+    mocker.patch(
+        "codeflare_sdk.cluster.cluster.get_current_namespace",
+        return_value="opendatahub",
+    )
+    default_config = ClusterConfiguration(
+        name="unit-test-default-cluster",
+    )
+    cluster = Cluster(default_config)
+
+    assert cluster.app_wrapper_yaml == "unit-test-default-cluster.yaml"
+    assert cluster.app_wrapper_name == "unit-test-default-cluster"
+    assert cluster.config.namespace == "opendatahub"
+
+    return cluster
+
+
 def arg_check_apply_effect(*args):
     assert args[0] == "apply"
     assert args[1] == ["-f", "unit-test-cluster.yaml"]
@@ -1593,22 +1610,6 @@ def test_wait_ready(mocker, capsys):
     )
 
 
-def test_cmd_line_generation():
-    os.system(
-        f"python3 {parent}/src/codeflare_sdk/utils/generate_yaml.py --name=unit-cmd-cluster --min-cpu=1 --max-cpu=1 --min-memory=2 --max-memory=2 --gpu=1 --workers=2 --template=src/codeflare_sdk/templates/new-template.yaml"
-    )
-    assert filecmp.cmp(
-        "unit-cmd-cluster.yaml", f"{parent}/tests/test-case-cmd.yaml", shallow=True
-    )
-    os.remove("unit-test-cluster.yaml")
-    os.remove("unit-cmd-cluster.yaml")
-
-
-def test_cleanup():
-    os.remove("test.yaml")
-    os.remove("raytest2.yaml")
-
-
 def test_jobdefinition_coverage():
     abstract = JobDefinition()
     cluster = Cluster(test_config_creation())
@@ -1673,7 +1674,6 @@ def test_DDPJobDefinition_dry_run():
     assert type(ddp_job._scheduler) == type(str())
 
     assert ddp_job.request.app_id.startswith("test")
-    assert ddp_job.request.working_dir.startswith("/tmp/torchx_workspace")
     assert ddp_job.request.cluster_name == "unit-test-cluster"
     assert ddp_job.request.requirements == "test"
 
@@ -1916,3 +1916,22 @@ def parse_j(cmd):
     max_worker = args[1]
     gpu = args[3]
     return f"{max_worker}x{gpu}"
+
+
+# Make sure to keep this function and the efollowing function at the end of the file
+def test_cmd_line_generation():
+    os.system(
+        f"python3 {parent}/src/codeflare_sdk/utils/generate_yaml.py --name=unit-cmd-cluster --min-cpu=1 --max-cpu=1 --min-memory=2 --max-memory=2 --gpu=1 --workers=2 --template=src/codeflare_sdk/templates/new-template.yaml"
+    )
+    assert filecmp.cmp(
+        "unit-cmd-cluster.yaml", f"{parent}/tests/test-case-cmd.yaml", shallow=True
+    )
+    os.remove("unit-test-cluster.yaml")
+    os.remove("unit-test-default-cluster.yaml")
+    os.remove("unit-cmd-cluster.yaml")
+
+
+# Make sure to always keep this function last
+def test_cleanup():
+    os.remove("test.yaml")
+    os.remove("raytest2.yaml")