mirror of
https://github.com/NVIDIA/OpenShell.git
synced 2026-10-18 05:39:50 +08:00
* feat(workspace): implement workspace model (Phase 1 of RFC 0011) Implements workspace and membership model providing hard isolation boundaries for multi-player OpenShell deployments. Workspace CRUD with Kubernetes-style Terminating phase for graceful deletion. All resources scoped by workspace via ObjectMeta. Membership RPCs for workspace access control. Persistence migration shifts name uniqueness to (object_type, workspace, name). Provider profiles support platform and workspace scoping. Service routing uses workspace-prefixed DNS labels. Inference routes renamed and workspace-scoped with DeleteInferenceRoute RPC. Python SDK with WorkspaceClient, two-method list pattern (workspace-scoped and for_all_workspaces), and workspace parameter on all methods. CLI workspace flags, TUI workspace cycling. K8s driver filters unmanaged CRs and uses delete preconditions. Podman driver uses immutable container IDs. Label serialization fixed across all put_if call sites. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(cli): delegate sandbox upload command to existing upload function The standalone `sandbox upload` command reimplemented upload logic inline with two bugs: it used `Path::exists()` which follows symlinks (rejecting dangling symlinks), and it ran git-aware filtering on symlink sources. The `run::sandbox_upload()` function already handles both cases correctly via `sandbox_upload_plan()`. Replace the inline logic with a call to the existing function. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): shorten sandbox names and fix test compatibility Shorten the sandbox name in initial_sparse_policy_is_acknowledged_as_loaded from 'e2e-2159-sparse-enrich' (22 chars) to 'e2e-sparse-enrich' (17 chars) to comply with MAX_ROUTABLE_NAME_LEN (19 chars). Also capture stderr in create_keep_with_args so future sandbox creation failures include the actual CLI error instead of reporting empty output. Signed-off-by: Derek Carr <decarr@redhat.com> * test(workspace): add test coverage for workspace CRUD and persistence isolation Add unit tests for workspace create happy path, get round-trip, get not-found, get empty-name rejection, already-exists error, and resolve_workspace not-found. Add persistence test proving cross-workspace name uniqueness (same name in different workspaces produces separate records). Add workspace name max-length boundary tests. Fix e2e harness to include stderr in name-parse-failure error path. Align Python e2e test_workspace_crud with try/finally pattern. Document provider profile catalog workspace scoping gap in RFC 0011. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(examples): update examples for workspace model compatibility Shorten sandbox names in demo scripts to fit the 19-character MAX_ROUTABLE_NAME_LEN limit: policy-demo prefix to pd-, multi-agent notepad derives a short SANDBOX_TAG from the run ID, governance interceptor uses gs-PID-RANDOM. Update vscode-remote-sandbox.md SSH host aliases from openshell-{name} to openshell-{name}.{workspace} format. Signed-off-by: Derek Carr <decarr@redhat.com> * feat(sdk): add workspace-scoped client and workspace CRUD Add WorkspaceScopedClient modeled after kube::Api::namespaced — captures workspace once and injects it into every sandbox request. Add workspace CRUD methods (create, get, list, delete) and list_sandboxes_all_workspaces on OpenShellClient. Extend SandboxRef with workspace field and add WorkspaceRef type. Include mock tests for all new operations. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings in workspace test assertions Signed-off-by: Derek Carr <decarr@redhat.com> * fix(docs): convert indented code blocks to fenced in RFC 0011 Signed-off-by: Derek Carr <decarr@redhat.com> * fix(lint): resolve clippy warnings and apply cargo fmt across workspace Auto-format with cargo fmt and fix clippy warnings exposed by the reformat: unnecessary qualifications, map_unwrap_or, identical match arms, unused variable prefix, dead code annotations, and let-unit-value in e2e harness. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): address workspace scoping issues from review - Add workspace field to settings JSON output (CLI) - Skip Podman containers missing workspace label instead of defaulting to empty string, matching K8s driver behavior - Add resource_version to list_by_scope SELECT in both SQLite and Postgres backends, with regression test - Gate PolicyLocalContext proposal/lookup routes on workspace readiness, returning 503 when workspace is not yet discovered - Block sandbox and provider creation in TUI all-workspaces mode - Clear workspace vectors in TUI reset_sandbox_state Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog workspace-aware Thread workspace through snapshot_catalog so the EffectiveProviderProfileCatalog enforces workspace boundaries on both read and write paths. UserProviderProfileSource now loads platform-scoped profiles (workspace "") plus the target workspace's profiles, preventing cross-workspace duplicate profile ID collisions that previously caused global catalog failures. Update RFC 0011 to reflect catalog scoping is implemented in Phase 1 rather than deferred to future work. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(persistence): include workspace column in atomic policy revision INSERT put_policy_revision_atomic omitted the workspace column from the INSERT into the objects table in both SQLite and Postgres backends, causing atomically-written policy revisions to lose their workspace association. Add workspace field to AtomicPolicyRevisionWrite and thread it through both backend INSERT statements, matching the non-atomic put_policy_revision path which already included it. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(proxy): skip ancestor walk when socket owner is the entrypoint collect_ancestor_identities walked the entire process tree above the entrypoint when the connecting process was the entrypoint itself, SHA256-hashing every ancestor binary (IDE, shell, container runtime). On dev machines with large binaries in the ancestor chain this exceeded the 30-second test timeout. When start_pid == stop_pid there are no intermediate ancestors to verify, so return an empty list immediately. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): make provider profile catalog scope-aware Allow the same profile ID at platform and workspace scopes by introducing layered catalog entries where workspace profiles shadow platform profiles. Add source and scope fields to the ProviderProfile proto and CLI output. Migrate List/Get handlers to the catalog, fixing divergence with runtime profile resolution. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align podman e2e labels with centralized driver constants The podman driver moved its container labels to the centralized openshell.ai/ prefix, but the e2e test harness and cleanup script still referenced the old openshell.sandbox-* keys, causing the local_driver_token_restart test to fail on container lookup. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(e2e): align python profile isolation test with scope-aware catalog Platform profiles are now visible in workspace listings as fallbacks per the layered catalog design. Update the assertion to match. Signed-off-by: Derek Carr <decarr@redhat.com> * fix(workspace): honor profile_workspace in runtime profile resolution Runtime profile lookups now consult provider.profile_workspace via get_type_profile_for_scope. Providers created with --global-profile (profile_workspace="") resolve to the platform profile even when a workspace profile shadows the same ID. All 6 runtime call sites updated; type-only call sites remain scope-agnostic. Signed-off-by: Derek Carr <decarr@redhat.com> --------- Signed-off-by: Derek Carr <decarr@redhat.com>
297 lines
10 KiB
Protocol Buffer
297 lines
10 KiB
Protocol Buffer
// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
syntax = "proto3";
|
|
|
|
package openshell.compute.v1;
|
|
|
|
import "google/protobuf/struct.proto";
|
|
import "options.proto";
|
|
|
|
// Internal compute-driver contract used by the gateway.
|
|
//
|
|
// Conventions:
|
|
// - This file owns driver-native request, response, and observation types.
|
|
// - Compute drivers must not import or return the public `openshell.v1.Sandbox`
|
|
// resource model.
|
|
// - The gateway translates between these internal driver-native messages and
|
|
// the public OpenShell API resource model.
|
|
service ComputeDriver {
|
|
// Report driver capabilities and defaults.
|
|
rpc GetCapabilities(GetCapabilitiesRequest) returns (GetCapabilitiesResponse);
|
|
|
|
// Validate a sandbox before create-time provisioning.
|
|
rpc ValidateSandboxCreate(ValidateSandboxCreateRequest)
|
|
returns (ValidateSandboxCreateResponse);
|
|
|
|
// Fetch the platform-observed sandbox state for one sandbox.
|
|
rpc GetSandbox(GetSandboxRequest) returns (GetSandboxResponse);
|
|
|
|
// List platform-observed sandbox state for all sandboxes.
|
|
rpc ListSandboxes(ListSandboxesRequest) returns (ListSandboxesResponse);
|
|
|
|
// Provision platform resources for a sandbox.
|
|
rpc CreateSandbox(CreateSandboxRequest) returns (CreateSandboxResponse);
|
|
|
|
// Stop platform resources for a sandbox without deleting its record.
|
|
rpc StopSandbox(StopSandboxRequest) returns (StopSandboxResponse);
|
|
|
|
// Tear down platform resources for a sandbox.
|
|
rpc DeleteSandbox(DeleteSandboxRequest) returns (DeleteSandboxResponse);
|
|
|
|
// Stream sandbox observations from the platform.
|
|
rpc WatchSandboxes(WatchSandboxesRequest) returns (stream WatchSandboxesEvent);
|
|
}
|
|
|
|
message GetCapabilitiesRequest {}
|
|
|
|
message GetCapabilitiesResponse {
|
|
reserved 4, 5;
|
|
reserved "supports_gpu", "gpu_count";
|
|
|
|
// Human-readable driver name.
|
|
string driver_name = 1;
|
|
// Driver implementation version string.
|
|
string driver_version = 2;
|
|
// Default sandbox image recommended by the driver.
|
|
string default_image = 3;
|
|
}
|
|
|
|
// Driver-owned sandbox model used for create requests and platform observations.
|
|
//
|
|
// This intentionally omits gateway-owned lifecycle fields such as the public
|
|
// `openshell.v1.SandboxPhase` and persisted metadata. The gateway derives and
|
|
// stores those fields after translating driver observations.
|
|
message DriverSandbox {
|
|
// Stable sandbox ID assigned by the gateway.
|
|
string id = 1;
|
|
// Compute-runtime sandbox name.
|
|
string name = 2;
|
|
// Compute-platform namespace or equivalent tenancy boundary.
|
|
string namespace = 3;
|
|
// Provisioning input supplied by the gateway. Drivers may omit this in
|
|
// observed snapshots returned by Get/List/Watch.
|
|
DriverSandboxSpec spec = 4;
|
|
// Raw platform-observed status.
|
|
DriverSandboxStatus status = 5;
|
|
// Workspace the sandbox belongs to. Used by drivers to construct
|
|
// collision-safe resource names and labels in shared-namespace mode.
|
|
string workspace = 6;
|
|
}
|
|
|
|
// Driver-owned provisioning inputs required to create a sandbox.
|
|
message DriverSandboxSpec {
|
|
// Log level exposed to processes running inside the sandbox.
|
|
string log_level = 1;
|
|
// Environment variables injected into the sandbox runtime.
|
|
map<string, string> environment = 5;
|
|
// Runtime template consumed by the driver during provisioning.
|
|
DriverSandboxTemplate template = 6;
|
|
// Portable resource requirements used by the gateway for driver selection
|
|
// and by drivers for provisioning.
|
|
ResourceRequirements resource_requirements = 9;
|
|
reserved 10;
|
|
reserved "gpu_device";
|
|
// Gateway-minted JWT identifying this sandbox to the gateway. Set by
|
|
// the gateway on create; the driver materialises it via its native
|
|
// secret mechanism (Docker/Podman/VM bind-mount a per-sandbox file;
|
|
// the Kubernetes driver ignores this field and relies on its projected
|
|
// ServiceAccount token bootstrap instead). Never echoed to the public
|
|
// Sandbox proto.
|
|
string sandbox_token = 11 [(openshell.options.v1.secret) = true];
|
|
}
|
|
|
|
message ResourceRequirements {
|
|
// GPU requirements for the sandbox. Presence indicates a GPU request.
|
|
GpuResourceRequirements gpu = 1;
|
|
}
|
|
|
|
// Driver GPU resource requirements.
|
|
message GpuResourceRequirements {
|
|
// Optional number of GPUs requested. When omitted, the request is for one
|
|
// GPU using the selected driver's default assignment behavior.
|
|
optional uint32 count = 1;
|
|
}
|
|
|
|
// Driver-owned runtime template consumed by the compute platform.
|
|
//
|
|
// This message describes the sandbox workload in backend-neutral terms.
|
|
// Platform-specific knobs (Kubernetes runtimeClassName, annotations,
|
|
// volumeClaimTemplates, etc.) belong in `platform_config`.
|
|
message DriverSandboxTemplate {
|
|
// Fully-qualified OCI image reference used to boot the sandbox.
|
|
string image = 1;
|
|
// Socket path inside the sandbox where the agent service listens.
|
|
string agent_socket_path = 3;
|
|
// Metadata labels applied to compute-platform resources.
|
|
// Drivers map these to the platform's native tagging mechanism
|
|
// (Kubernetes labels, cloud instance tags, etc.).
|
|
map<string, string> labels = 4;
|
|
// Additional environment variables injected into the sandbox runtime.
|
|
map<string, string> environment = 6;
|
|
// Typed compute-resource requirements for the sandbox workload.
|
|
DriverResourceRequirements resources = 10;
|
|
// Opaque, platform-specific configuration passed through to the driver.
|
|
// The gateway does not inspect this; each driver defines its own schema.
|
|
// For the Kubernetes driver this carries fields such as runtimeClassName,
|
|
// annotations, and volumeClaimTemplates.
|
|
google.protobuf.Struct platform_config = 11;
|
|
// Caller-provided config for the selected driver only.
|
|
// This is the inner block selected from public SandboxTemplate.driver_config.
|
|
// The selected driver owns nested schema validation.
|
|
google.protobuf.Struct driver_config = 12;
|
|
}
|
|
|
|
// Typed compute-resource requirements.
|
|
//
|
|
// Values use Kubernetes-style quantity strings (e.g. "500m", "2", "4Gi")
|
|
// because they are a well-known, widely-adopted notation. Drivers for
|
|
// non-Kubernetes platforms must parse these strings into their native units.
|
|
message DriverResourceRequirements {
|
|
// Minimum CPU cores requested (e.g. "500m", "2").
|
|
string cpu_request = 1;
|
|
// Maximum CPU cores allowed (e.g. "500m", "4").
|
|
string cpu_limit = 2;
|
|
// Minimum memory requested (e.g. "256Mi", "4Gi").
|
|
string memory_request = 3;
|
|
// Maximum memory allowed (e.g. "512Mi", "8Gi").
|
|
string memory_limit = 4;
|
|
}
|
|
|
|
// Raw status observed directly from the compute platform.
|
|
//
|
|
// The gateway derives the public `openshell.v1.SandboxPhase` from these
|
|
// conditions plus `deleting`.
|
|
message DriverSandboxStatus {
|
|
// Compute-platform sandbox object name.
|
|
string sandbox_name = 1;
|
|
// Platform-assigned instance identifier for the compute unit running the
|
|
// sandbox agent (e.g. Kubernetes pod name, VM instance ID, hostname).
|
|
// The gateway uses this to correlate incoming connections back to a sandbox.
|
|
string instance_id = 2;
|
|
// File descriptor or address for reaching the agent service inside the
|
|
// sandbox, when available.
|
|
string agent_fd = 3;
|
|
// File descriptor or address for reaching the sandbox supervisor service,
|
|
// when available.
|
|
string sandbox_fd = 4;
|
|
// Raw readiness and lifecycle conditions reported by the platform.
|
|
repeated DriverCondition conditions = 5;
|
|
// True when the compute platform has begun deleting this sandbox.
|
|
bool deleting = 6;
|
|
}
|
|
|
|
// Raw compute-platform condition.
|
|
message DriverCondition {
|
|
// Condition class reported by the compute platform.
|
|
string type = 1;
|
|
// Condition status value such as `True`, `False`, or `Unknown`.
|
|
string status = 2;
|
|
// Short machine-readable reason associated with the condition.
|
|
string reason = 3;
|
|
// Human-readable condition message.
|
|
string message = 4;
|
|
// Timestamp reported by the platform for the last transition.
|
|
string last_transition_time = 5;
|
|
}
|
|
|
|
// Raw compute-platform event correlated to a sandbox.
|
|
message DriverPlatformEvent {
|
|
// Event timestamp in milliseconds since epoch.
|
|
int64 timestamp_ms = 1;
|
|
// Event source (for example `kubernetes`).
|
|
string source = 2;
|
|
// Event type or severity (for example `Normal` or `Warning`).
|
|
string type = 3;
|
|
// Short machine-readable reason code.
|
|
string reason = 4;
|
|
// Human-readable event message.
|
|
string message = 5;
|
|
// Optional platform-specific metadata attached to the event.
|
|
map<string, string> metadata = 6;
|
|
}
|
|
|
|
message ValidateSandboxCreateRequest {
|
|
// Proposed sandbox configuration to validate before provisioning.
|
|
DriverSandbox sandbox = 1;
|
|
}
|
|
|
|
message ValidateSandboxCreateResponse {}
|
|
|
|
message GetSandboxRequest {
|
|
// Stable sandbox ID stored by the gateway.
|
|
string sandbox_id = 1;
|
|
// Compute-runtime name used by the driver.
|
|
string sandbox_name = 2;
|
|
}
|
|
|
|
message GetSandboxResponse {
|
|
// Platform-observed sandbox snapshot returned by the driver.
|
|
DriverSandbox sandbox = 1;
|
|
}
|
|
|
|
message ListSandboxesRequest {}
|
|
|
|
message ListSandboxesResponse {
|
|
// Platform-observed sandbox snapshots returned by the driver.
|
|
repeated DriverSandbox sandboxes = 1;
|
|
}
|
|
|
|
message CreateSandboxRequest {
|
|
// Sandbox configuration to provision on the compute platform.
|
|
DriverSandbox sandbox = 1;
|
|
}
|
|
|
|
message CreateSandboxResponse {}
|
|
|
|
message StopSandboxRequest {
|
|
// Stable sandbox ID stored by the gateway.
|
|
string sandbox_id = 1;
|
|
// Compute-runtime name used by the driver.
|
|
string sandbox_name = 2;
|
|
}
|
|
|
|
message StopSandboxResponse {}
|
|
|
|
message DeleteSandboxRequest {
|
|
// Stable sandbox ID stored by the gateway.
|
|
string sandbox_id = 1;
|
|
// Compute-runtime name used by the driver.
|
|
string sandbox_name = 2;
|
|
}
|
|
|
|
message DeleteSandboxResponse {
|
|
// True when a platform resource was deleted by this request.
|
|
bool deleted = 1;
|
|
}
|
|
|
|
message WatchSandboxesRequest {}
|
|
|
|
message WatchSandboxesSandboxEvent {
|
|
// Updated driver-native snapshot for one sandbox.
|
|
DriverSandbox sandbox = 1;
|
|
}
|
|
|
|
message WatchSandboxesDeletedEvent {
|
|
// Sandbox ID removed from the compute platform.
|
|
string sandbox_id = 1;
|
|
}
|
|
|
|
message WatchSandboxesPlatformEvent {
|
|
// Sandbox ID correlated to the platform event.
|
|
string sandbox_id = 1;
|
|
// Raw platform event emitted for the sandbox.
|
|
DriverPlatformEvent event = 2;
|
|
}
|
|
|
|
message WatchSandboxesEvent {
|
|
oneof payload {
|
|
// Updated or newly observed sandbox snapshot.
|
|
WatchSandboxesSandboxEvent sandbox = 1;
|
|
// Sandbox deletion observation.
|
|
WatchSandboxesDeletedEvent deleted = 2;
|
|
// Raw platform event correlated to a sandbox.
|
|
WatchSandboxesPlatformEvent platform_event = 3;
|
|
}
|
|
}
|