Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions server/src/services/k8s/kubernetes_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,9 @@ def list_sandboxes(self, request: ListSandboxesRequest) -> ListSandboxesResponse
ListSandboxesResponse: Paginated list of sandboxes
"""
try:
# Build label selector
label_selector = SANDBOX_ID_LABEL
# Do not require opensandbox.io/id when listing.
# This allows manually created CRs (e.g. BatchSandbox) to appear.
label_selector = ""

# List all workloads
workloads = self.workload_provider.list_workloads(
Expand Down Expand Up @@ -695,13 +696,15 @@ def _build_sandbox_from_workload(self, workload: Any) -> Sandbox:
spec = workload.get("spec", {})
labels = metadata.get("labels", {})
creation_timestamp = metadata.get("creationTimestamp")
resource_name = metadata.get("name", "")
else:
metadata = workload.metadata
spec = workload.spec
labels = metadata.labels or {}
creation_timestamp = metadata.creation_timestamp
resource_name = getattr(metadata, "name", "")

sandbox_id = labels.get(SANDBOX_ID_LABEL, "")
sandbox_id = labels.get(SANDBOX_ID_LABEL) or resource_name

# Get expiration from provider
expires_at = self.workload_provider.get_expiration(workload)
Expand Down
55 changes: 55 additions & 0 deletions server/tests/k8s/test_kubernetes_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,61 @@ def test_list_all_sandboxes_succeeds(self, k8s_service, mock_workload):
assert len(response.items) == 1
assert response.items[0].id == "test-sandbox-123"
assert response.pagination.total_items == 1

def test_list_sandboxes_includes_manual_workload_without_id_label(self, k8s_service, mock_workload):
"""
Test case: Workloads without opensandbox.io/id label are still listed.

Purpose: Ensure manually created BatchSandbox resources are visible in list API
and sandbox id falls back to metadata.name.
"""
manual_workload = {
"metadata": {
"name": "manual-batchsandbox",
"uid": "manual-uid",
"labels": {
"team": "manual",
},
"annotations": mock_workload["metadata"]["annotations"].copy(),
"creationTimestamp": datetime.now(timezone.utc).isoformat(),
},
"spec": {
"template": {
"spec": {
"containers": [
{
"name": "sandbox",
"image": "python:3.11",
"command": ["/bin/sh", "-c", "sleep 3600"],
}
]
}
}
},
"status": {},
}
k8s_service.workload_provider.list_workloads.return_value = [manual_workload]
k8s_service.workload_provider.get_status.return_value = {
"state": "Running",
"reason": "",
"message": "Running",
"last_transition_at": datetime.now(timezone.utc),
}
k8s_service.workload_provider.get_expiration.return_value = (
datetime.now(timezone.utc) + timedelta(hours=1)
)

from src.api.schema import PaginationRequest
request = ListSandboxesRequest(pagination=PaginationRequest(page=1, page_size=20))
response = k8s_service.list_sandboxes(request)

assert len(response.items) == 1
assert response.items[0].id == "manual-batchsandbox"
assert response.items[0].metadata == {"team": "manual"}
k8s_service.workload_provider.list_workloads.assert_called_once_with(
namespace=k8s_service.namespace,
label_selector="",
)

def test_list_sandboxes_with_pagination(self, k8s_service, mock_workload):
"""
Expand Down