Skip to content

Commit 4d76f96

Browse files
committed
change: make namespace required for functions
1 parent 71b70c0 commit 4d76f96

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

src/codeflare_sdk/cli/commands/define.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def cli():
1313

1414
@cli.command()
1515
@click.option("--name", type=str, required=True)
16-
@click.option("--namespace", "-n", type=str)
16+
@click.option("--namespace", "-n", type=str, required=True)
1717
@click.option("--head_info", cls=PythonLiteralOption, type=list)
1818
@click.option("--machine_types", cls=PythonLiteralOption, type=list)
1919
@click.option("--min_cpus", type=int)

src/codeflare_sdk/cli/commands/delete.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def cli():
1313

1414
@cli.command()
1515
@click.argument("name", type=str)
16-
@click.option("--namespace", type=str, default="default")
16+
@click.option("--namespace", type=str, required=True)
1717
def raycluster(name, namespace):
1818
"""
1919
Delete a specified RayCluster from the Kubernetes cluster

src/codeflare_sdk/cli/commands/details.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def cli():
1111

1212
@cli.command()
1313
@click.argument("name", type=str)
14-
@click.option("--namespace", type=str)
14+
@click.option("--namespace", type=str, required=True)
1515
@click.pass_context
1616
def raycluster(ctx, name, namespace):
1717
"""Get the details of a specified RayCluster"""

src/codeflare_sdk/cli/commands/list.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def cli():
1616

1717

1818
@cli.command()
19-
@click.option("--namespace")
19+
@click.option("--namespace", type=str)
2020
@click.option("--all", is_flag=True)
2121
@click.pass_context
2222
def rayclusters(ctx, namespace, all):
2323
"""List all rayclusters in a specified namespace"""
2424
if all and namespace:
2525
click.echo("--all and --namespace are mutually exclusive")
2626
return
27-
namespace = namespace or "default"
27+
if not all and not namespace:
28+
click.echo("You must specify either --namespace or --all")
29+
return
2830
if not all:
2931
list_all_clusters(namespace)
3032
return

src/codeflare_sdk/cli/commands/status.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def cli():
1111

1212
@cli.command()
1313
@click.argument("name", type=str)
14-
@click.option("--namespace", type=str)
14+
@click.option("--namespace", type=str, required=True)
1515
@click.pass_context
1616
def raycluster(ctx, name, namespace):
1717
"""Get the status of a specified RayCluster"""

tests/unit_test.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,14 @@ def test_cluster_deletion_cli(mocker):
201201
runner = CliRunner()
202202
delete_cluster_command = """
203203
delete raycluster
204-
quicktest
204+
quicktest --namespace=default
205205
"""
206206
result = runner.invoke(cli, delete_cluster_command)
207207

208208
assert result.exit_code == 0
209209
assert "Cluster deleted successfully" in result.output
210+
211+
210212
def test_list_clusters_all_namespaces(mocker, capsys):
211213
mocker.patch(
212214
"kubernetes.client.CustomObjectsApi.list_cluster_custom_object",
@@ -252,7 +254,7 @@ def test_raycluster_details_cli(mocker):
252254
)
253255
mocker.patch.object(client, "ApiClient")
254256
raycluster_details_command = """
255-
details raycluster quicktest
257+
details raycluster quicktest --namespace=default
256258
"""
257259
result = runner.invoke(cli, raycluster_details_command)
258260
quicktest_details = (
@@ -312,7 +314,7 @@ def test_raycluster_status_cli(mocker):
312314
return_value=test_raycluster,
313315
)
314316
raycluster_status_command = """
315-
status raycluster quicktest
317+
status raycluster quicktest --namespace=default
316318
"""
317319
result = runner.invoke(cli, raycluster_status_command)
318320
assert "Active" in result.output

0 commit comments

Comments
 (0)