Skip to content

Commit 8bb845a

Browse files
committed
feat(sdk/python)!: align portable resource requirements
Update reusable workload template construction and tests for the shared ResourceRequirements protobuf shape while preserving the high-level builder arguments. BREAKING CHANGE: Raw reusable-template protobuf callers must use resources.cpu.limit and resources.memory.limit instead of string fields. Part of #2838 Signed-off-by: Evan Lezar <[email protected]>
1 parent 803fa81 commit 8bb845a

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎python/openshell/sandbox.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,9 +1736,9 @@ def _sandbox_workload_template(
17361736
if environment:
17371737
template.spec.workload.environment.update(dict(environment))
17381738
if cpu is not None:
1739-
template.spec.workload.resources.cpu = cpu
1739+
template.spec.workload.resources.cpu.quantity = cpu
17401740
if memory is not None:
1741-
template.spec.workload.resources.memory = memory
1741+
template.spec.workload.resources.memory.quantity = memory
17421742
if gpu or gpu_count is not None:
17431743
template.spec.workload.resources.gpu.SetInParent()
17441744
if gpu_count is not None:

‎python/openshell/sandbox_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,8 +1960,8 @@ def _make_workload_template_proto(
19601960
template.metadata.name = name
19611961
template.metadata.workspace = workspace
19621962
template.spec.workload.image = f"ghcr.io/test/{name}:latest"
1963-
template.spec.workload.resources.cpu = "1"
1964-
template.spec.workload.resources.memory = "512Mi"
1963+
template.spec.workload.resources.cpu.quantity = "1"
1964+
template.spec.workload.resources.memory.quantity = "512Mi"
19651965
return template
19661966

19671967

@@ -2256,8 +2256,8 @@ def test_sandbox_template_create_builds_template_from_public_fields() -> None:
22562256
assert dict(template.metadata.annotations) == {"owner": "platform"}
22572257
assert template.spec.workload.image == "ghcr.io/test/gpu-kata:latest"
22582258
assert dict(template.spec.workload.environment) == {"FEATURE_FLAG": "on"}
2259-
assert template.spec.workload.resources.cpu == "1"
2260-
assert template.spec.workload.resources.memory == "512Mi"
2259+
assert template.spec.workload.resources.cpu.quantity == "1"
2260+
assert template.spec.workload.resources.memory.quantity == "512Mi"
22612261
assert template.spec.workload.resources.gpu.count == 2
22622262
assert template.spec.driver_config["kubernetes"]["runtime_class_name"] == "kata"
22632263

0 commit comments

Comments
 (0)