fix(k8s): 前移共享 PVC 只读一致性校验

Author: Gujiassh

server/opensandbox_server/services/k8s/kubernetes_service.py

@@ -60,6 +60,7 @@
 from opensandbox_server.services.k8s.k8s_diagnostics import K8sDiagnosticsMixin
 from opensandbox_server.services.k8s.endpoint_resolver import _attach_egress_auth_headers, _attach_secure_access_headers
 from opensandbox_server.services.k8s.list_helpers import _build_list_sandboxes_response
+from opensandbox_server.services.k8s.volume_helper import ensure_shared_pvc_read_only_policy
 from opensandbox_server.services.k8s.status_helpers import (
     _is_unschedulable_status,
     _normalize_create_status,
@@ -803,6 +804,11 @@ async def create_sandbox(self, request: CreateSandboxRequest) -> CreateSandboxRe
             if has_pool_ref and pool_ref != POOL_AUTO_ASSIGN_REF:
                 await asyncio.to_thread(self._ensure_pool_ref_exists, pool_ref)
 
+            # Kubernetes applies PVC readOnly at the source volume level, so
+            # shared PVC mounts must agree before any auto-provisioning side effect.
+            if request.volumes:
+                ensure_shared_pvc_read_only_policy(request.volumes)
+
             # Auto-create PVCs that don't exist yet
             if request.volumes:
                 managed_pvcs_may_exist = True

server/opensandbox_server/services/k8s/volume_helper.py

@@ -24,6 +24,30 @@
 logger = logging.getLogger(__name__)
 
 
+def _raise_mixed_pvc_read_only_policy(pvc_claim_name: str) -> None:
+    raise ValueError(
+        f"PVC claim '{pvc_claim_name}' is mounted with mixed read_only values. "
+        "All mounts sharing the same PVC must use the same read_only policy."
+    )
+
+
+def ensure_shared_pvc_read_only_policy(volumes: List[Volume]) -> None:
+    """Ensure every mount that references the same PVC uses the same read_only policy."""
+    pvc_to_read_only: Dict[str, bool] = {}
+
+    for vol in volumes:
+        if vol.pvc is None:
+            continue
+
+        pvc_claim_name = vol.pvc.claim_name
+        if pvc_claim_name in pvc_to_read_only:
+            if pvc_to_read_only[pvc_claim_name] != vol.read_only:
+                _raise_mixed_pvc_read_only_policy(pvc_claim_name)
+            continue
+
+        pvc_to_read_only[pvc_claim_name] = vol.read_only
+
+
 def apply_volumes_to_pod_spec(
     pod_spec: Dict[str, Any],
     volumes: List[Volume],
@@ -38,9 +62,10 @@ def apply_volumes_to_pod_spec(
     mounts = main_container.get("volumeMounts", [])
     pod_volumes = pod_spec.get("volumes", [])
 
+    ensure_shared_pvc_read_only_policy(volumes)
+
     existing_volume_names = {v.get("name") for v in pod_volumes if isinstance(v, dict)}
     pvc_to_volume_name: Dict[str, str] = {}
-    pvc_to_read_only: Dict[str, bool] = {}
 
     for vol in volumes:
         vol_name = vol.name
@@ -63,13 +88,7 @@ def apply_volumes_to_pod_spec(
                     },
                 })
                 pvc_to_volume_name[pvc_claim_name] = vol_name
-                pvc_to_read_only[pvc_claim_name] = vol.read_only
                 existing_volume_names.add(vol_name)
-            elif pvc_to_read_only[pvc_claim_name] != vol.read_only:
-                raise ValueError(
-                    f"PVC claim '{pvc_claim_name}' is mounted with mixed read_only values. "
-                    "All mounts sharing the same PVC must use the same read_only policy."
-                )
 
             mount = {
                 "name": pvc_to_volume_name[pvc_claim_name],

server/tests/k8s/test_batchsandbox_provider.py

@@ -140,9 +140,9 @@ def test_create_workload_builds_correct_manifest(self, mock_k8s_client):
             expires_at=expires_at,
             execd_image="execd:latest",
         )
-
+        
         assert result == {"name": "test-id", "uid": "test-uid", "apiVersion": "sandbox.opensandbox.io/v1alpha1", "kind": "BatchSandbox"}
-
+        
         # Verify API call
         call_args = mock_k8s_client.create_custom_object.call_args
         body = call_args.kwargs["body"]
@@ -870,7 +870,7 @@ def test_create_workload_updates_informer_cache(self, mock_k8s_client):
         )
 
         assert result == {"name": "test-id", "uid": "test-uid", "apiVersion": "sandbox.opensandbox.io/v1alpha1", "kind": "BatchSandbox"}
-
+    
     # ===== Workload List Tests =====
 
     def test_list_workloads_returns_items(self, mock_k8s_client, mock_batchsandbox_list_response):
@@ -1325,7 +1325,7 @@ def test_create_workload_poolref_ignores_image_spec(self, mock_k8s_client):
 
         # Should succeed and return workload info
         assert result == {"name": "sandbox-test-id", "uid": "test-uid", "apiVersion": "sandbox.opensandbox.io/v1alpha1", "kind": "BatchSandbox"}
-
+        
         # Verify poolRef is used
         body = mock_k8s_client.create_custom_object.call_args.kwargs["body"]
         assert body["spec"]["poolRef"] == "my-pool"
@@ -1357,7 +1357,7 @@ def test_create_workload_poolref_ignores_resource_limits(self, mock_k8s_client):
 
         # Should succeed and return workload info
         assert result == {"name": "sandbox-test-id", "uid": "test-uid", "apiVersion": "sandbox.opensandbox.io/v1alpha1", "kind": "BatchSandbox"}
-
+        
         # Verify poolRef is used
         body = mock_k8s_client.create_custom_object.call_args.kwargs["body"]
         assert body["spec"]["poolRef"] == "my-pool"
@@ -1385,9 +1385,9 @@ def test_create_workload_poolref_allows_entrypoint_and_env(self, mock_k8s_client
             execd_image="execd:latest",
             extensions={"poolRef": "my-pool"},
         )
-
+        
         assert result == {"name": "sandbox-test-id", "uid": "test-uid", "apiVersion": "sandbox.opensandbox.io/v1alpha1", "kind": "BatchSandbox"}
-
+        
         # Verify the call
         body = mock_k8s_client.create_custom_object.call_args.kwargs["body"]
         assert body["spec"]["poolRef"] == "my-pool"

server/tests/k8s/test_kubernetes_service.py

@@ -1541,6 +1541,56 @@ async def test_pool_ref_with_volumes_rejected_before_pvc_creation(
         k8s_service.k8s_client.create_pvc.assert_not_called()
         k8s_service.workload_provider.create_workload.assert_not_called()
 
+    @pytest.mark.asyncio
+    async def test_shared_pvc_mixed_read_only_rejected_before_pvc_creation(
+        self, k8s_service
+    ):
+        from opensandbox_server.api.schema import (
+            CreateSandboxRequest,
+            ImageSpec,
+            PVC,
+            ResourceLimits,
+            Volume,
+        )
+
+        request = CreateSandboxRequest(
+            image=ImageSpec(uri="python:3.11"),
+            entrypoint=["/bin/bash", "-c", "sleep 3600"],
+            timeout=3600,
+            resourceLimits=ResourceLimits(root={"cpu": "1", "memory": "1Gi"}),
+            volumes=[
+                Volume(
+                    name="shared-rw",
+                    mountPath="/data/rw",
+                    readOnly=False,
+                    pvc=PVC(
+                        claimName="auto-data",
+                        createIfNotExists=True,
+                        deleteOnSandboxTermination=True,
+                    ),
+                ),
+                Volume(
+                    name="shared-ro",
+                    mountPath="/data/ro",
+                    readOnly=True,
+                    pvc=PVC(
+                        claimName="auto-data",
+                        createIfNotExists=True,
+                        deleteOnSandboxTermination=True,
+                    ),
+                ),
+            ],
+        )
+
+        with pytest.raises(HTTPException) as exc_info:
+            await k8s_service.create_sandbox(request)
+
+        assert exc_info.value.status_code == 400
+        assert exc_info.value.detail["code"] == SandboxErrorCodes.INVALID_PARAMETER
+        assert "mixed read_only values" in exc_info.value.detail["message"]
+        k8s_service.k8s_client.create_pvc.assert_not_called()
+        k8s_service.workload_provider.create_workload.assert_not_called()
+
     @pytest.mark.asyncio
     async def test_pvc_cleanup_runs_when_wait_for_ready_rollback_reports_not_found(
         self, k8s_service, mock_workload