Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace api version #8

Merged
merged 1 commit into from
Sep 8, 2023
Merged

replace api version #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions torchx/schedulers/kubernetes_mcad_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def app_to_resource(
enable_retry(job_spec, appwrapper_retries, total_pods)

resource: Dict[str, object] = {
"apiVersion": "mcad.ibm.com/v1beta1",
"apiVersion": "workload.codeflare.dev/v1beta1",
"kind": "AppWrapper",
"metadata": {"name": unique_app_id, "namespace": namespace},
"spec": job_spec,
Expand Down Expand Up @@ -947,7 +947,7 @@ def schedule(self, dryrun_info: AppDryRunInfo[KubernetesMCADJob]) -> str:

try:
resp = self._custom_objects_api().create_namespaced_custom_object(
group="mcad.ibm.com",
group="workload.codeflare.dev",
version="v1beta1",
namespace=namespace,
plural="appwrappers",
Expand Down Expand Up @@ -1035,7 +1035,7 @@ def _validate(self, app: AppDef, scheduler: str) -> None:
def _cancel_existing(self, app_id: str) -> None:
namespace, name = app_id.split(":")
self._custom_objects_api().delete_namespaced_custom_object(
group="mcad.ibm.com",
group="workload.codeflare.dev",
version="v1beta1",
namespace=namespace,
plural="appwrappers",
Expand Down Expand Up @@ -1096,7 +1096,7 @@ def describe(self, app_id: str) -> Optional[DescribeAppResponse]:

# Production section
api_instance = self._custom_objects_api
group = "mcad.ibm.com"
group = "workload.codeflare.dev"
version = "v1beta1"
plural = "appwrappers"
try:
Expand Down Expand Up @@ -1214,7 +1214,7 @@ def list(self) -> List[ListAppResponse]:
namespace = active_context["context"]["namespace"]

resp = self._custom_objects_api().list_namespaced_custom_object(
group="mcad.ibm.com",
group="workload.codeflare.dev",
version="v1beta1",
namespace=namespace,
plural="appwrappers",
Expand Down
18 changes: 9 additions & 9 deletions torchx/schedulers/test/kubernetes_mcad_scheduler_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def test_submit_dryrun(self) -> None:

self.assertEqual(
resource,
f"""apiVersion: mcad.ibm.com/v1beta1
f"""apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
name: app-name
Expand Down Expand Up @@ -1607,7 +1607,7 @@ def test_submit(self, create_namespaced_custom_object: MagicMock) -> None:
self.assertEqual(id, "testnamespace:testid")
call = create_namespaced_custom_object.call_args
args, kwargs = call
self.assertEqual(kwargs["group"], "mcad.ibm.com")
self.assertEqual(kwargs["group"], "workload.codeflare.dev")
self.assertEqual(kwargs["version"], "v1beta1")
self.assertEqual(kwargs["namespace"], "testnamespace")
self.assertEqual(kwargs["plural"], "appwrappers")
Expand Down Expand Up @@ -1665,7 +1665,7 @@ def test_describe(self, get_namespaced_custom_object: MagicMock) -> None:
call = get_namespaced_custom_object.call_args
args, kwargs = call

assert "mcad.ibm.com" in args
assert "workload.codeflare.dev" in args
assert "v1beta1" in args
assert "appwrappers" in args
assert "foo" in args
Expand Down Expand Up @@ -1767,7 +1767,7 @@ def test_describe_unknown(self, get_namespaced_custom_object: MagicMock) -> None
call = get_namespaced_custom_object.call_args
args, kwargs = call

assert "mcad.ibm.com" in args
assert "workload.codeflare.dev" in args
assert "v1beta1" in args
assert "appwrappers" in args
assert "foo" in args
Expand Down Expand Up @@ -1844,7 +1844,7 @@ def test_cancel_existing(self, delete_namespaced_custom_object: MagicMock) -> No
self.assertEqual(
kwargs,
{
"group": "mcad.ibm.com",
"group": "workload.codeflare.dev",
"version": "v1beta1",
"namespace": "testnamespace",
"plural": "appwrappers",
Expand All @@ -1866,7 +1866,7 @@ def test_list(self, list_namespaced_custom_object: MagicMock) -> None:
self.assertEqual(
kwargs,
{
"group": "mcad.ibm.com",
"group": "workload.codeflare.dev",
"version": "v1beta1",
"namespace": "default",
"plural": "appwrappers",
Expand All @@ -1877,12 +1877,12 @@ def test_list(self, list_namespaced_custom_object: MagicMock) -> None:
@patch("kubernetes.client.CustomObjectsApi.list_namespaced_custom_object")
def test_list_values(self, list_namespaced_custom_object: MagicMock) -> None:
list_namespaced_custom_object.return_value = {
"apiVersion": "mcad.ibm.com/v1beta1",
"apiVersion": "workload.codeflare.dev/v1beta1",
"name": "test-training",
"namespace": "default",
"items": [
{
"apiVersion": "mcad.ibm.com/v1beta1",
"apiVersion": "workload.codeflare.dev/v1beta1",
"kind": "AppWrapper",
"metadata": {
"name": "test-training",
Expand Down Expand Up @@ -1935,7 +1935,7 @@ def test_list_values(self, list_namespaced_custom_object: MagicMock) -> None:
},
},
{
"apiVersion": "mcad.ibm.com/v1beta1",
"apiVersion": "workload.codeflare.dev/v1beta1",
"kind": "AppWrapper",
"metadata": {
"name": "test-training",
Expand Down
Loading