Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

docs: guest daemon and image comments no longer describe Fleet (CUA-1836) (#5485)

Francesco Bonacci76f32b08a358
diff --git a/libs/cua-spacesd/README.md b/libs/cua-spacesd/README.md
index 301041253b..298f0a328f 100644
--- a/libs/cua-spacesd/README.md
+++ b/libs/cua-spacesd/README.md
@@ -48,11 +48,13 @@ cua-spacesd --help
- A token is **required for any non-loopback bind**. Clients send it as
`authorization: Bearer <token>` or `x-cua-env-authorization: Bearer <token>`
- (the Fleet gateway strips `authorization`). Comparisons are constant time.
+ (a gateway in front of the daemon can strip `authorization`). Comparisons are
+ constant time.
- `SystemService.Init` can install a token later. `--insecure-bootstrap` allows
a tokenless non-loopback bind that answers only `GetCapabilities`, `Health`
and `Init` until then (opt-in, for an authenticated gateway only).
-- `--await-token-file` (Fleet): take the token only from `--token-file`, bind
+- `--await-token-file` (orchestrator-managed token): take the token only from
+ `--token-file`, bind
while it is empty, install or rotate it when the file changes, and revoke
every session when it is emptied. `cua-spacesd token-sync` is the
privileged helper that mirrors a root-only secret to a file the driver's user
diff --git a/libs/cua-spacesd/crates/cua-spacesd-desktop/src/grpc/linux_backend.rs b/libs/cua-spacesd/crates/cua-spacesd-desktop/src/grpc/linux_backend.rs
index 863f34282a..2b8725ae4c 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-desktop/src/grpc/linux_backend.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-desktop/src/grpc/linux_backend.rs
@@ -132,8 +132,8 @@ fn audio_desktop_limitation(audio: bool, gvisor: bool, no_audio: &str) -> String
}
/// Whether the driver runs under gVisor (runsc): current releases name
-/// themselves in the kernel version; older ones (still what Fleet's runsc
-/// reports) have the synthetic release exactly "4.4.0". Same rule as
+/// themselves in the kernel version; older runsc releases have the
+/// synthetic release exactly "4.4.0". Same rule as
/// `cua_spacesd_server::services::system::is_gvisor`.
fn under_gvisor() -> bool {
let release = std::fs::read_to_string("/proc/sys/kernel/osrelease").unwrap_or_default();
diff --git a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/auth.rs b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/auth.rs
index 6c1004d698..f7b0e05d58 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/auth.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-doctor/src/checks/auth.rs
@@ -9,7 +9,7 @@
//! | mode | detected by | contract |
//! |---|---|---|
//! | `local` | `/run/cua` is not a mount | `/run/cua/env-token` is `0640 root:<desktop user>` (written by `ensure-env-token.sh`) |
-//! | `pod-secret` | `/run/cua` is a mount (Fleet pod Secret, or a local claim-secrets share) | `/run/cua/env-token` is root-owned with no world bits; the unprivileged copy `/run/cua-env/env-token` is `0600 <desktop user>` in a root `0755` directory |
+//! | `pod-secret` | `/run/cua` is a mount (a pod Secret written by the orchestrator, or a local claim-secrets share) | `/run/cua/env-token` is root-owned with no world bits; the unprivileged copy `/run/cua-env/env-token` is `0600 <desktop user>` in a root `0755` directory |
//! | `kubevirt-bridge` | `/run/cua-claim/share` is a virtiofs mount (cloud #7888) | the share shows `0644` (expected), `/run/cua` is the bridge's tmpfs, `/run/cua/env-token` is `0600 root`, `cua-claim-secrets-sync` is active, and the copy is as above |
use std::path::Path;
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/Cargo.toml b/libs/cua-spacesd/crates/cua-spacesd-server/Cargo.toml
index f37e560e8c..59c11ca7b8 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/Cargo.toml
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/Cargo.toml
@@ -77,7 +77,7 @@ windows-sys = { version = "0.61", features = ["Win32_Storage_FileSystem", "Win32
[dev-dependencies]
async-trait = "0.1"
-# https for the conformance suite's raw requests against a Fleet gateway target.
+# https for the conformance suite's raw requests against a gateway target.
hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "ring", "webpki-roots"] }
cua-spacesd-client = { path = "../../../cua/crates/cua-spacesd-client" }
prost-types = "0.14"
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/README.md b/libs/cua-spacesd/crates/cua-spacesd-server/README.md
index b75147464a..f711d1414c 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/README.md
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/README.md
@@ -5,7 +5,7 @@ The gRPC, gRPC-Web and HTTP server core of `cua-spacesd`. One TCP port
| Surface | Auth | Notes |
|---|---|---|
-| `cua.env.v1.*` over native gRPC (h2c) and gRPC-Web (HTTP/1.1) | root token | `authorization: Bearer <token>` **or** `x-cua-env-authorization: Bearer <token>` (the Fleet gateway strips `authorization`) |
+| `cua.env.v1.*` over native gRPC (h2c) and gRPC-Web (HTTP/1.1) | root token | `authorization: Bearer <token>` **or** `x-cua-env-authorization: Bearer <token>` (a gateway in front of the daemon can strip `authorization`) |
| gRPC reflection (`grpc.reflection.v1`, `v1alpha`) | root token | from `cua_proto::FILE_DESCRIPTOR_SET` |
| `GET /health` | none | 204 while serving, 503 while shutting down |
| `GET/HEAD/PUT /files?path&method&exp&sig` | HMAC signed URL | from `FilesystemService.CreateSignedUrl`; mandatory expiry; `Range`; 507 on a full disk |
@@ -32,12 +32,12 @@ extension provider; until one is registered they answer
- Tickets and signed URLs are keyed by an HMAC key derived from the token,
so rotating the token (via `Init`) revokes them all.
-## Await-token-file mode (Fleet)
+## Await-token-file mode
`--await-token-file` (or `CUA_ENV_AWAIT_TOKEN_FILE=1`) takes the token only
-from `--token-file`, which the orchestrator writes (Fleet: the claim Secret at
-`/run/cua/env-token`, empty until a claim binds). Tokens are never accepted
-over the network in this mode.
+from `--token-file`, which the orchestrator writes (for example a Secret
+mounted at `/run/cua/env-token`, empty until a claim binds). Tokens are never
+accepted over the network in this mode.
- Binds `0.0.0.0:3211` with no token. While the file is empty or missing,
only `GetCapabilities` (`initialized=false`) and `Health` (component
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/src/auth.rs b/libs/cua-spacesd/crates/cua-spacesd-server/src/auth.rs
index 6d13c3e40d..dc4965a514 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/src/auth.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/src/auth.rs
@@ -440,8 +440,9 @@ impl Auth {
}
/// Checks the token in `authorization` **or** `x-cua-env-authorization`
- /// (the Fleet gateway consumes and strips `authorization`, so the SDK
- /// sends the env token in the alternate header through `/api/svc`).
+ /// (a gateway in front of the daemon may consume and strip
+ /// `authorization`, so the SDK sends the env token in the alternate header
+ /// when it goes through one).
/// Always true with no token.
pub fn check_headers(&self, headers: &http::HeaderMap) -> bool {
match self.authenticate_external(headers) {
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/src/services/system.rs b/libs/cua-spacesd/crates/cua-spacesd-server/src/services/system.rs
index d8d25d4d36..985c4812c3 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/src/services/system.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/src/services/system.rs
@@ -277,8 +277,8 @@ fn read_trimmed(path: &str) -> String {
.unwrap_or_default()
}
-/// Whether the kernel is gVisor's synthetic one: older releases (still
-/// what Fleet's runsc reports) say exactly "4.4.0", current ones name
+/// Whether the kernel is gVisor's synthetic one: older runsc releases say
+/// exactly "4.4.0", current ones name
/// themselves ("4.19.0-gvisor", and "gVisor" in /proc/version). A real
/// "4.4.0-<abi>-generic" kernel (Ubuntu 16.04) is not gVisor.
pub fn is_gvisor(kernel: &str, proc_version: &str) -> bool {
@@ -394,7 +394,7 @@ mod windows_bios {
pub fn detect_runtime(kernel: &str) -> (Runtime, String) {
if cfg!(target_os = "linux") {
// gVisor's synthetic kernel is only ever seen inside runsc, and a
- // Kubernetes pod under containerd (Fleet) has none of docker's or
+ // Kubernetes pod under containerd has none of docker's or
// podman's marker files, so the kernel decides on its own.
if is_gvisor(kernel, &read_trimmed("/proc/version")) {
return (Runtime::Gvisor, "runsc".into());
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/src/token_file.rs b/libs/cua-spacesd/crates/cua-spacesd-server/src/token_file.rs
index 8cb38463cc..a900991c82 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/src/token_file.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/src/token_file.rs
@@ -2,7 +2,7 @@
// Copyright (c) 2026 Cua AI, Inc.
//! Await-token-file mode: the root token comes only from a file that an
-//! orchestrator writes (a Fleet claim Secret mounted at `/run/cua`), never
+//! orchestrator writes (a token Secret mounted at `/run/cua`), never
//! from the network.
//!
//! The file is empty until a claim binds, updated in place on rotation and
@@ -274,9 +274,9 @@ impl TokenFileWatcher {
}
/// The privileged half of await-token-file mode: copies a root-only token
-/// file (the Fleet claim Secret, `root 0600`) to a file the unprivileged
-/// driver can read (`0600`, owned by `owner`), validating it the same way.
-/// An empty, missing, invalid or insecure source empties the target, so a
+/// file (the token Secret the orchestrator writes, `root 0600`) to a file the
+/// unprivileged driver can read (`0600`, owned by `owner`), validating it the
+/// same way. An empty, missing, invalid or insecure source empties the target, so a
/// revocation propagates. The target's directory should be root-owned so the
/// unprivileged user cannot swap the file.
#[derive(Debug, Clone)]
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/tests/common/mod.rs b/libs/cua-spacesd/crates/cua-spacesd-server/tests/common/mod.rs
index c1438c9f05..afdf70e3bd 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/tests/common/mod.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/tests/common/mod.rs
@@ -14,10 +14,10 @@
//! (a container, or through `cua-relay` with `/m/<machine-id>`). Tests that
//! need in-process fakes skip themselves in that mode.
//!
-//! Fleet gateway mode: also set `CUA_ENV_TEST_GATEWAY_BEARER` (a Fleet access
-//! token) and optionally `CUA_ENV_TEST_GATEWAY_CLAIM` with `CUA_ENV_TEST_TARGET`
-//! = the claim's gateway service URL (`https://<fleet>/api/svc/<ns>/<sbx>-env`).
-//! SDK clients then go through `ConnectOptions::fleet_gateway` (the Fleet
+//! Gateway mode: also set `CUA_ENV_TEST_GATEWAY_BEARER` (an access token for
+//! the gateway) and optionally `CUA_ENV_TEST_GATEWAY_CLAIM` with
+//! `CUA_ENV_TEST_TARGET` = the URL the gateway serves the driver at.
+//! SDK clients then go through `ConnectOptions::fleet_gateway` (the gateway
//! bearer in `authorization`, the env token in `x-cua-env-authorization`), and
//! raw HTTP/WebSocket requests get the same headers.
//! For runs longer than the bearer's lifetime set
@@ -125,7 +125,7 @@ pub fn remote() -> Option<(String, String)> {
Some((url, token))
}
-/// A file holding the current Fleet bearer, rewritten by the runner before
+/// A file holding the current gateway bearer, rewritten by the runner before
/// the bearer expires (`CUA_ENV_TEST_GATEWAY_BEARER_FILE`).
fn gateway_bearer_file() -> Option<PathBuf> {
std::env::var_os("CUA_ENV_TEST_GATEWAY_BEARER_FILE")
@@ -137,7 +137,7 @@ fn read_bearer_file(path: &std::path::Path) -> std::io::Result<String> {
Ok(std::fs::read_to_string(path)?.trim().to_owned())
}
-/// The current Fleet bearer: the bearer file when set (read fresh), else
+/// The current gateway bearer: the bearer file when set (read fresh), else
/// `CUA_ENV_TEST_GATEWAY_BEARER`.
fn gateway_bearer() -> Option<String> {
match gateway_bearer_file() {
@@ -147,7 +147,7 @@ fn gateway_bearer() -> Option<String> {
.filter(|s| !s.is_empty())
}
-/// Fleet gateway credentials (`CUA_ENV_TEST_GATEWAY_BEARER` or
+/// Gateway credentials (`CUA_ENV_TEST_GATEWAY_BEARER` or
/// `CUA_ENV_TEST_GATEWAY_BEARER_FILE`, optional `CUA_ENV_TEST_GATEWAY_CLAIM`)
/// when the remote target is a gateway URL.
pub fn gateway() -> Option<(String, Option<String>)> {
@@ -161,7 +161,7 @@ pub fn gateway() -> Option<(String, Option<String>)> {
/// Adds the gateway headers to a raw request: an env token already in
/// `authorization` moves to `x-cua-env-authorization` (the gateway strips
-/// `authorization`), which then carries the Fleet bearer.
+/// `authorization`), which then carries the gateway bearer.
pub fn apply_gateway(headers: &mut http::HeaderMap) {
let Some((bearer, claim)) = gateway() else {
return;
@@ -337,9 +337,9 @@ impl Target {
transport: TransportPreference,
token: Option<String>,
) -> SpacesdClient {
- // The Fleet gateway fronts the driver with nginx over HTTP/1.1:
- // native gRPC (h2c) is not proxied yet, so gateway mode speaks
- // gRPC-Web on both "transports", like the SDK's Fleet connector.
+ // A gateway in front of the driver can be an HTTP/1.1 proxy (nginx)
+ // that does not carry native gRPC (h2c), so gateway mode speaks
+ // gRPC-Web on both "transports", like the SDK's gateway connector.
let transport = if gateway().is_some() {
TransportPreference::GrpcWeb
} else {
@@ -438,7 +438,7 @@ pub fn pattern_sha(seed: u64, len: u64) -> String {
type HttpBody = http_body_util::combinators::BoxBody<bytes::Bytes, std::io::Error>;
/// Minimal HTTP/1.1 client for `/files`, `/health` and `/mcp` (http or
-/// https; adds the Fleet gateway headers in gateway mode).
+/// https; adds the gateway headers in gateway mode).
pub struct TestHttp(
hyper_util::client::legacy::Client<
hyper_rustls::HttpsConnector<hyper_util::client::legacy::connect::HttpConnector>,
diff --git a/libs/cua-spacesd/crates/cua-spacesd-server/tests/conformance.rs b/libs/cua-spacesd/crates/cua-spacesd-server/tests/conformance.rs
index 383af9a863..46abb0cb50 100644
--- a/libs/cua-spacesd/crates/cua-spacesd-server/tests/conformance.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd-server/tests/conformance.rs
@@ -75,8 +75,8 @@ async fn auth_is_required_and_either_header_works() {
Code::Unauthenticated
);
- // The Fleet gateway strips `authorization`; the env token rides in
- // x-cua-env-authorization instead.
+ // A gateway in front of the daemon can strip `authorization`; the env
+ // token rides in x-cua-env-authorization instead.
let mut request = tonic::Request::new(GetCapabilitiesRequest {});
request.metadata_mut().insert(
cua_proto::metadata::ENV_AUTHORIZATION,
diff --git a/libs/cua-spacesd/crates/cua-spacesd/src/legacy.rs b/libs/cua-spacesd/crates/cua-spacesd/src/legacy.rs
index f9b17356a2..d11313f48e 100644
--- a/libs/cua-spacesd/crates/cua-spacesd/src/legacy.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd/src/legacy.rs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: FSL-1.1-MIT
// Copyright (c) 2026 Cua AI, Inc.
-//! The pre-consolidation daemon modes (Unix-socket RCDP, the Fleet-facing
+//! The pre-consolidation daemon modes (Unix-socket RCDP, the gateway-facing
//! WebSocket, QUIC, Tailscale remote shares). Reachable as
//! `cua-spacesd legacy …` until the desktop provider serves the same
//! functionality through `cua-spacesd-server`.
@@ -240,11 +240,10 @@ async fn run(args: Vec<String>) -> Result<(), Box<dyn std::error::Error + Send +
return Err("Tailscale share options require --remote-listen".into());
}
- // Linux guests default to a Fleet-facing WebSocket. The daemon sits behind
- // the Fleet gateway (wss://run.cua.ai/api/svc/{ns}/{sandbox}-rcdp/ws), which
- // authenticates at the edge, so anonymous connections are accepted unless a
- // shared token is configured. Any explicit transport flag opts back out into
- // the shared CLI handling below.
+ // Linux guests default to a gateway-facing WebSocket. The daemon sits behind
+ // a gateway or proxy that authenticates at the edge, so anonymous
+ // connections are accepted unless a shared token is configured. Any
+ // explicit transport flag opts back out into the shared CLI handling below.
#[cfg(target_os = "linux")]
if socket.is_none() && listen.is_none() && quic_listen.is_none() {
return serve_linux_default(apps_path, application_id).await;
@@ -401,7 +400,7 @@ async fn run(args: Vec<String>) -> Result<(), Box<dyn std::error::Error + Send +
unreachable!("non-Unix platforms select the WebSocket transport")
}
-/// Serve the Fleet-facing WebSocket used on Linux guests.
+/// Serve the gateway-facing WebSocket used on Linux guests.
///
/// Binds `0.0.0.0:$CUA_ENV_PORT` (default `DEFAULT_PORT`, 3211). The `tokio-tungstenite` acceptor
/// upgrades any request path, so clients reach it at `/ws` (or root) through the
diff --git a/libs/cua-spacesd/crates/cua-spacesd/src/ws.rs b/libs/cua-spacesd/crates/cua-spacesd/src/ws.rs
index fa7023650a..21debac056 100644
--- a/libs/cua-spacesd/crates/cua-spacesd/src/ws.rs
+++ b/libs/cua-spacesd/crates/cua-spacesd/src/ws.rs
@@ -296,8 +296,8 @@ mod guard_tests {
assert!(ok(true, Some("http://localhost:8080")).is_ok());
let refused = ok(true, Some("https://evil.example")).unwrap_err();
assert_eq!(refused.status(), 403);
- // Token-protected or non-loopback listeners (the Fleet gateway) are
- // not guarded here.
+ // Token-protected or non-loopback listeners (for example behind a
+ // gateway) are not guarded here.
assert!(ok(false, Some("https://evil.example")).is_ok());
}
}
diff --git a/libs/cua-spacesd/packaging/linux/cua-spacesd.service b/libs/cua-spacesd/packaging/linux/cua-spacesd.service
index 8eb1dec8c7..7f970e14a4 100644
--- a/libs/cua-spacesd/packaging/linux/cua-spacesd.service
+++ b/libs/cua-spacesd/packaging/linux/cua-spacesd.service
@@ -1,7 +1,7 @@
# systemd unit for cua-spacesd inside a Linux guest.
#
# The token comes from /run/cua/env-token (written by cloud-init, the Lume
-# setup share or the Fleet template) or from CUA_ENV_TOKEN in
+# setup share or an orchestrator's token Secret) or from CUA_ENV_TOKEN in
# /etc/cua/spacesd.env. With a token the driver listens on 0.0.0.0:3211;
# without one it refuses any non-loopback bind.
#
diff --git a/libs/cua-spacesd/tests/spaces-e2e/src/bin/cua-test-fixtures.rs b/libs/cua-spacesd/tests/spaces-e2e/src/bin/cua-test-fixtures.rs
index f5da5a0a38..bc042bb9eb 100644
--- a/libs/cua-spacesd/tests/spaces-e2e/src/bin/cua-test-fixtures.rs
+++ b/libs/cua-spacesd/tests/spaces-e2e/src/bin/cua-test-fixtures.rs
@@ -17,8 +17,10 @@
//! ```
//!
//! The env URL is a `MockServer` (simulated processes, in-memory files, a
-//! scripted `/media` socket). The fake Fleet routes every claim's `env`
-//! service to a second `MockServer`, so cloud sandboxes have a spacesd.
+//! scripted `/media` socket). The fake cloud service
+//! (`cua_fleet::testing::FakeFleet`, a test double for the ended Cua Cloud)
+//! routes every claim's `env` service to a second `MockServer`, so cloud
+//! sandboxes have a spacesd.
//! `registry_mirror` (a `CUA_REGISTRY_MIRRORS` value) serves the manifests
//! of `fixtures::sample_registry()`. The Spaces URL is a real cua-spacesd server
//! core in this process (`cua_spaces_e2e`), reporting Linux like the docs'
diff --git a/libs/images/README.md b/libs/images/README.md
index 9355d71c29..47c3a30709 100644
--- a/libs/images/README.md
+++ b/libs/images/README.md
@@ -270,13 +270,13 @@ It gets its token through the `CUA_ENV_TOKEN` environment variable, never throug
1. `$CUA_ENV_TOKEN`
2. `$CUA_ENV_TOKEN_FILE`
3. `/run/cua/env-token`
-4. `/etc/cua/env-token`, for example from cloud-init `write_files` on Fleet
+4. `/etc/cua/env-token`, for example from cloud-init `write_files`
If none of them is set, a random token is generated into `/run/cua/env-token` (root:cua, 0640).
-#### Fleet claim token (await-token-file mode)
+#### Claim token (await-token-file mode)
-On Fleet the env token is per claim. The operator puts it in a Secret: `/run/cua/env-token`, root 0600, empty until a claim binds, rewritten on rotation, emptied on release. The driver never accepts a token over the network.
+With an orchestrator, the env token is per claim. The orchestrator writes it to a Secret: `/run/cua/env-token`, root 0600, empty until a claim binds, rewritten on rotation, emptied on release. The driver never accepts a token over the network.
- **Detection** (`files/env-token-mode.sh`): await mode is on when `/run/cua` is a mount point and neither `CUA_ENV_TOKEN` nor `/etc/cua/env-token` is set. `CUA_ENV_AWAIT_TOKEN_FILE=1|0` forces it. Local docker (the SDK passes `CUA_ENV_TOKEN`) and plain QEMU boots are unchanged.
- **Driver:** starts as `cua` with `--await-token-file` and binds `:3211` with no token. Until a token arrives it answers only `GetCapabilities` and `Health`. It then installs, rotates and revokes the token as the file changes (polled every 500 ms).
@@ -286,7 +286,7 @@ On Fleet the env token is per claim. The operator puts it in a Secret: `/run/cua
- **Local VM test:** `linux/smoke-claim-token-vm.sh` boots the disk with a 9p share (macOS QEMU has no virtiofsd) under the same tag, plus a `run-cua.mount` drop-in for `Type=9p`. Everything above the mount is the real path. virtiofs itself is only exercised on KubeVirt.
- `ensure-env-token.sh` leaves `/run/cua` alone in await mode.
-Requirements for the cloud pod spec (trycua/cloud#7885):
+Requirements for the pod spec (trycua/cloud#7885):
- Mount the Secret as a directory at `/run/cua`. Do not use `subPath`: a `subPath` file is not a mount point of `/run/cua` and never receives updates.
- Keep the container's user root (the image default). supervisord runs the root sync helper and drops the desktop, driver and other programs to `cua`.
@@ -296,7 +296,7 @@ Requirements for the cloud pod spec (trycua/cloud#7885):
```bash
libs/images/linux/smoke-test.sh --runtime runc # or runsc (gVisor)
-libs/images/linux/smoke-claim-token.sh --runtime runsc # Fleet claim token path (tmpfs /run/cua)
+libs/images/linux/smoke-claim-token.sh --runtime runsc # claim token path (tmpfs /run/cua)
libs/images/plain/smoke-test.sh ubuntu-xfce-vnc --runtime runsc
libs/images/plain/smoke-test.sh ubuntu-server --runtime runsc
libs/images/common/boot-qemu.sh ~/.cache/cua-images/linux/arm64/disk.img \
diff --git a/libs/images/bench/osworld/vm/customize.sh b/libs/images/bench/osworld/vm/customize.sh
index 5710660878..e1528ef5a8 100755
--- a/libs/images/bench/osworld/vm/customize.sh
+++ b/libs/images/bench/osworld/vm/customize.sh
@@ -11,11 +11,12 @@
# - /usr/local/bin/cua-spacesd (+ cua-env-driver and cua-guestd links), the shared token
# scripts from libs/images/linux/files, and
# cua-spacesd.service running as `user` in the GDM Xorg session on :0;
-# - Fleet claim secrets: run-cua.mount (virtiofs cua-claim-secrets),
-# cua-env-token-sync.service and its udev rule;
+# - claim secrets (a token Secret written by an orchestrator): run-cua.mount
+# (virtiofs cua-claim-secrets), cua-env-token-sync.service and its udev
+# rule;
# - cua-seed-token.service: the image has no cloud-init, so the spacesd
# token of a local SDK boot is read from its NoCloud seed (token and
-# spacesd.env only; ignored when a Fleet claim share is present);
+# spacesd.env only; ignored when a claim share is present);
# - netplan DHCP on any en*/eth* NIC (KubeVirt), cloud-init network off;
# - /dev/uinput for the `input` group, `user` in `input`;
# - /etc/X11/xorg.conf.d/10-cua-noblank.conf: no X screen saver or DPMS;
diff --git a/libs/images/bench/osworld/vm/files/99-cua-dhcp.yaml b/libs/images/bench/osworld/vm/files/99-cua-dhcp.yaml
index 257d422e80..1f6f356007 100644
--- a/libs/images/bench/osworld/vm/files/99-cua-dhcp.yaml
+++ b/libs/images/bench/osworld/vm/files/99-cua-dhcp.yaml
@@ -1,5 +1,6 @@
# DHCP on whatever NIC the hypervisor presents (enp1s0 under KubeVirt,
-# ens3/enp0s3 under plain QEMU). Without it the guest never gets a lease on Fleet.
+# ens3/enp0s3 under plain QEMU). Without it the guest never gets a lease on
+# KubeVirt.
network:
version: 2
ethernets:
diff --git a/libs/images/bench/osworld/vm/files/cua-seed-token.py b/libs/images/bench/osworld/vm/files/cua-seed-token.py
index d5dcb03562..ee6a1ca11a 100644
--- a/libs/images/bench/osworld/vm/files/cua-seed-token.py
+++ b/libs/images/bench/osworld/vm/files/cua-seed-token.py
@@ -6,7 +6,7 @@ The SDK boots local VMs with a `cidata` seed whose #cloud-config writes the
token to /etc/cua/env-token and extra variables to /etc/cua/spacesd.env. This
reads only those two write_files entries (nothing else in the seed runs) and
writes them root-only; ensure-env-token.sh then installs the token as usual
-(local mode). With a Fleet claim share (virtio-fs) present, the claim token is
+(local mode). With a claim share (virtio-fs) present, the claim token is
authoritative and the seed is ignored.
"""
import email
diff --git a/libs/images/bench/web/Dockerfile b/libs/images/bench/web/Dockerfile
index 96c3a4e0b5..dfb202806f 100644
--- a/libs/images/bench/web/Dockerfile
+++ b/libs/images/bench/web/Dockerfile
@@ -13,7 +13,7 @@
# Google-branded Chrome for Testing, which this public image must not ship;
# - bench-web-ctl on :7000: a small HTTP API over CDP (health, reset,
# navigate, eval) so adapters reach the browser the same way locally and
-# on Fleet (plain HTTP through the service gateway);
+# through a service gateway (plain HTTP);
# - MiniWoB++ (MIT) at /opt/miniwob, served on :7560;
# - bench-ui (libs/python/bench-ui) and pywebview (GTK + WebKit2) in the
# system Python, which cua-bench's remote session imports.
diff --git a/libs/images/bench/web/files/bench-web-ctl.py b/libs/images/bench/web/files/bench-web-ctl.py
index 18b65341e8..7d4b648c79 100644
--- a/libs/images/bench/web/files/bench-web-ctl.py
+++ b/libs/images/bench/web/files/bench-web-ctl.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python3
"""bench-web-ctl: a small HTTP API over the in-guest Chromium's DevTools.
-Adapters reach it the same way locally and on Fleet (plain HTTP through the
-sandbox's service gateway), so they never need a WebSocket to the guest.
+Adapters reach it the same way locally and through a sandbox service gateway
+(plain HTTP), so they never need a WebSocket to the guest.
GET /healthz {"ok": true, "browser": "...", "tabs": N} 503 until CDP answers
POST /reset {"url"} clear cookies, cache and storage; close every tab
diff --git a/libs/images/common/boot-qemu.sh b/libs/images/common/boot-qemu.sh
index e28c9bf377..5674dba539 100755
--- a/libs/images/common/boot-qemu.sh
+++ b/libs/images/common/boot-qemu.sh
@@ -16,12 +16,12 @@
# usable, else TCG (slow; an amd64 guest on Apple Silicon is TCG).
# Firmware: arm64 -> edk2-aarch64-code.fd (UEFI); amd64 -> SeaBIOS (QEMU's
# default, = KubeVirt `bios`), or --uefi for edk2-x86_64-code.fd.
-# The guest always gets a NoCloud seed (cidata ISO), like Fleet's cloud-init:
-# without a datasource cloud-init disables itself and never generates the SSH
+# The guest always gets a NoCloud seed (cidata ISO), like a KubeVirt VM's
+# cloud-init: without a datasource cloud-init disables itself and never generates the SSH
# host keys, so sshd stays down. --ssh adds a throwaway key to the `cua` user
# (then logs in and lists the cua-* units); --env-token writes
# /etc/cua/env-token and restarts cua-spacesd if it raced cloud-init.
-# --claim-secrets DIR simulates Fleet's per-claim Secret share on KubeVirt
+# --claim-secrets DIR simulates a per-claim Secret share on KubeVirt
# (virtiofs tag cua-claim-secrets -> /run/cua). QEMU on macOS has no
# virtiofsd, so DIR is shared over virtio-9p with the same tag, read-only,
# and the seed's bootcmd installs a run-cua.mount drop-in switching Type= to
diff --git a/libs/images/linux/claim-token-checks.sh b/libs/images/linux/claim-token-checks.sh
index 50074f03c6..84972c9470 100755
--- a/libs/images/linux/claim-token-checks.sh
+++ b/libs/images/linux/claim-token-checks.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Shared checks for the Fleet claim token smoke tests (sourced by
+# Shared checks for the claim token smoke tests (sourced by
# smoke-claim-token.sh and smoke-claim-token-vm.sh). The caller sets URL and
# WORK and defines set_token TOKEN / clear_token (the operator's side), plus
# ok/bad. Everything talks gRPC-Web over curl from the host.
diff --git a/libs/images/linux/files/ensure-env-token.sh b/libs/images/linux/files/ensure-env-token.sh
index 18f7226ca9..800c31cf29 100755
--- a/libs/images/linux/files/ensure-env-token.sh
+++ b/libs/images/linux/files/ensure-env-token.sh
@@ -5,8 +5,9 @@
# random one is generated so the driver never listens unauthenticated.
# Read it back with: cat /run/cua/env-token
#
-# Fleet (await-token-file mode): /run/cua is the claim Secret mount; it is
-# left alone and no token is generated. See env-token-mode.sh.
+# Await-token-file mode: /run/cua is the token Secret mount written by an
+# orchestrator; it is left alone and no token is generated. See
+# env-token-mode.sh.
set -euo pipefail
. /opt/cua/bin/env-token-mode.sh
if cua_await_token_file; then
diff --git a/libs/images/linux/files/env-token-mode.sh b/libs/images/linux/files/env-token-mode.sh
index 65734f7e30..c880b72d77 100755
--- a/libs/images/linux/files/env-token-mode.sh
+++ b/libs/images/linux/files/env-token-mode.sh
@@ -1,17 +1,17 @@
#!/usr/bin/env bash
-# Sourced by the spacesd scripts: decides whether this boot uses Fleet's
-# per-claim token file (await-token-file mode) or a local token.
+# Sourced by the spacesd scripts: decides whether this boot uses an
+# orchestrator's per-claim token file (await-token-file mode) or a local token.
#
-# Fleet delivers the claim's env token as a Secret mounted read-only at
-# /run/cua (gVisor/macOS pods: a Secret volume; KubeVirt: virtiofs tag
-# cua-claim-secrets, mounted by run-cua.mount). The file /run/cua/env-token is
-# root-owned 0600, empty until a claim binds, rewritten on rotation and
-# emptied on release.
+# The orchestrator delivers the claim's env token as a Secret mounted
+# read-only at /run/cua (gVisor/macOS pods: a Secret volume; KubeVirt: virtiofs
+# tag cua-claim-secrets, mounted by run-cua.mount). The file
+# /run/cua/env-token is root-owned 0600, empty until a claim binds, rewritten
+# on rotation and emptied on release.
#
# Await mode when, in order:
# CUA_ENV_AWAIT_TOKEN_FILE=1 forced on (=0 forces it off)
# CUA_ENV_TOKEN or /etc/cua/env-token is set -> off (local docker / QEMU)
-# /run/cua is a mount point -> on (Fleet claim secrets)
+# /run/cua is a mount point -> on (claim secrets)
# CUA_SPACESD_* is the new spelling of every CUA_ENV_* variable. The old
# names keep working, as does the interim CUA_GUESTD_* spelling; precedence
@@ -37,10 +37,10 @@ cua_is_mountpoint() {
awk -v p="$1" '$5 == p { found = 1 } END { exit !found }' /proc/self/mountinfo 2>/dev/null
}
-# KubeVirt: a virtio-fs device (virtio id 0x001a) means Fleet shares claim
-# secrets. The udev rule pulls in run-cua.mount asynchronously, so a unit
-# that checks the mount point during boot can run before it lands and fall
-# back to a local token for good. Start the mount (idempotent, waits for it)
+# KubeVirt: a virtio-fs device (virtio id 0x001a) means the orchestrator
+# shares claim secrets. The udev rule pulls in run-cua.mount asynchronously,
+# so a unit that checks the mount point during boot can run before it lands
+# and fall back to a local token for good. Start the mount (idempotent, waits for it)
# before deciding. No-op without the device, without systemd, or in pods.
cua_wait_claim_mount() {
cua_is_mountpoint "$CUA_CLAIM_SECRETS_DIR" && return 0
diff --git a/libs/images/linux/files/start-spacesd.sh b/libs/images/linux/files/start-spacesd.sh
index 8dd1896b88..c0003e95fc 100755
--- a/libs/images/linux/files/start-spacesd.sh
+++ b/libs/images/linux/files/start-spacesd.sh
@@ -6,7 +6,7 @@
# 1. $CUA_ENV_TOKEN
# 2. the file named by $CUA_ENV_TOKEN_FILE
# 3. /run/cua/env-token (written by the container entrypoint hook, a
-# Fleet/K8s secret mount, or cloud-init)
+# K8s secret mount, or cloud-init)
# 4. /etc/cua/env-token (persistent, e.g. baked by cloud-init write_files)
# The container entrypoint hook generates /run/cua/env-token when none of the
# above exist, so the driver never starts unauthenticated.
@@ -14,7 +14,7 @@
# The token reaches the driver through the CUA_ENV_TOKEN environment variable,
# never argv (argv is world-readable in /proc).
#
-# Fleet (await-token-file mode, see env-token-mode.sh): no token is resolved
+# Await-token-file mode (see env-token-mode.sh): no token is resolved
# here. The driver binds with no token, serves only GetCapabilities/Health,
# and follows the claim's token file: /run/cua/env-token directly when this
# user can read it (pod fsGroup + defaultMode 0440), else the copy that the
diff --git a/libs/images/linux/files/supervisor/supervisord.conf b/libs/images/linux/files/supervisor/supervisord.conf
index 6c43049ee7..ff24eb84c1 100644
--- a/libs/images/linux/files/supervisor/supervisord.conf
+++ b/libs/images/linux/files/supervisor/supervisord.conf
@@ -53,7 +53,7 @@ priority=15
stdout_logfile=/var/log/supervisor/audio.log
redirect_stderr=true
-; Fleet await-token-file mode: root helper mirroring the root-only claim token
+; Await-token-file mode: root helper mirroring the root-only claim token
; (/run/cua/env-token) to /run/cua-env/env-token for the unprivileged driver.
; Idles when there is no claim secrets mount or a local token is set.
[program:cua-env-token-sync]
diff --git a/libs/images/linux/files/systemd/cua-spacesd.service b/libs/images/linux/files/systemd/cua-spacesd.service
index b1dfa34e00..3c65d2b32e 100644
--- a/libs/images/linux/files/systemd/cua-spacesd.service
+++ b/libs/images/linux/files/systemd/cua-spacesd.service
@@ -2,8 +2,8 @@
Description=cua-spacesd (gRPC + gRPC-Web on :3211)
# cloud-init.service: write_files (e.g. /etc/cua/env-token) lands before the token is resolved.
# run-cua.mount (pulled in by udev when the claim share exists) and
-# cua-env-token-sync.service: Fleet claim token (await-token-file mode, see
-# /opt/cua/bin/env-token-mode.sh); both optional.
+# cua-env-token-sync.service: the orchestrator's claim token (await-token-file
+# mode, see /opt/cua/bin/env-token-mode.sh); both optional.
After=cua-desktop.service network-online.target cloud-init.service run-cua.mount cua-env-token-sync.service
Wants=network-online.target cua-desktop.service cua-env-token-sync.service
@@ -12,8 +12,9 @@ Type=simple
User=cua
Environment=HOME=/home/cua XDG_RUNTIME_DIR=/run/cua-desktop
# Token: CUA_ENV_TOKEN here, or /run/cua/env-token, or /etc/cua/env-token
-# (e.g. written by cloud-init write_files). On Fleet the claim token file
-# /run/cua/env-token (run-cua.mount) is followed instead. See start-spacesd.sh.
+# (e.g. written by cloud-init write_files). In await-token-file mode the claim
+# token file /run/cua/env-token (run-cua.mount) is followed instead. See
+# start-spacesd.sh.
# The older env files are still read (later files win: spacesd.env last).
EnvironmentFile=-/etc/cua/env-driver.env
EnvironmentFile=-/etc/cua/guestd.env
diff --git a/libs/images/linux/files/systemd/run-cua.mount b/libs/images/linux/files/systemd/run-cua.mount
index ef8a9acd25..1e63fe5b6a 100644
--- a/libs/images/linux/files/systemd/run-cua.mount
+++ b/libs/images/linux/files/systemd/run-cua.mount
@@ -1,13 +1,13 @@
-# Fleet per-claim secrets on KubeVirt: the claim Secret is shared into the VM
-# over virtiofs tag `cua-claim-secrets` and mounted read-only at /run/cua, so
-# /run/cua/env-token is the claim's env token (root 0600; empty until a claim
-# binds, rewritten on rotation, emptied on release). The token-sync helper and
-# the driver (await-token-file mode) follow it.
+# Per-claim secrets on KubeVirt: a token Secret written by the orchestrator is
+# shared into the VM over virtiofs tag `cua-claim-secrets` and mounted
+# read-only at /run/cua, so /run/cua/env-token is the claim's env token (root
+# 0600; empty until a claim binds, rewritten on rotation, emptied on release).
+# The token-sync helper and the driver (await-token-file mode) follow it.
#
# Optional ("nofail"): pulled in only by the udev rule
# 70-cua-claim-secrets.rules when a virtio-fs device exists, never required
-# and not part of local-fs.target. A VM without the share (local QEMU,
-# non-Fleet KubeVirt) never tries it and the driver keeps its local token.
+# and not part of local-fs.target. A VM without the share (for example local
+# QEMU) never tries it and the driver keeps its local token.
# Local simulation without virtiofs (macOS QEMU has no virtiofsd): boot-qemu.sh
# --claim-secrets DIR shares DIR over 9p with the same tag and installs a
# drop-in switching Type= to 9p (see common/boot-qemu.sh).
diff --git a/libs/images/linux/files/udev/70-cua-claim-secrets.rules b/libs/images/linux/files/udev/70-cua-claim-secrets.rules
index c789f265e9..9ee56dbd32 100644
--- a/libs/images/linux/files/udev/70-cua-claim-secrets.rules
+++ b/libs/images/linux/files/udev/70-cua-claim-secrets.rules
@@ -1,5 +1,5 @@
-# Fleet claim secrets on KubeVirt: when a virtio-fs device (virtio id 26)
+# Claim secrets on KubeVirt: when a virtio-fs device (virtio id 26)
# appears, pull in run-cua.mount (tag cua-claim-secrets -> /run/cua). Without
-# such a device the mount is never attempted, so VMs without the share (local
-# QEMU, non-Fleet KubeVirt) boot clean instead of "degraded".
+# such a device the mount is never attempted, so VMs without the share (for
+# example local QEMU) boot clean instead of "degraded".
SUBSYSTEM=="virtio", ATTR{device}=="0x001a", TAG+="systemd", ENV{SYSTEMD_WANTS}+="run-cua.mount"
diff --git a/libs/images/linux/smoke-claim-token-vm.sh b/libs/images/linux/smoke-claim-token-vm.sh
index 5e428f7a37..78f0ebe074 100755
--- a/libs/images/linux/smoke-claim-token-vm.sh
+++ b/libs/images/linux/smoke-claim-token-vm.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Smoke test for the Fleet per-claim token path on the VM (containerDisk)
+# Smoke test for the per-claim token path on the VM (containerDisk)
# variant under local QEMU: boots disk.img with a claim-secrets share
# (common/boot-qemu.sh --claim-secrets; 9p stands in for KubeVirt's virtiofs
# since macOS QEMU has no virtiofsd) and, from the host, writes, rotates and
diff --git a/libs/images/linux/smoke-claim-token.sh b/libs/images/linux/smoke-claim-token.sh
index fea7259fb5..e3558153db 100755
--- a/libs/images/linux/smoke-claim-token.sh
+++ b/libs/images/linux/smoke-claim-token.sh
@@ -1,12 +1,12 @@
#!/usr/bin/env bash
-# Smoke test for the Fleet per-claim token path (await-token-file mode) of
+# Smoke test for the per-claim token path (await-token-file mode) of
# linux, container rootfs variant, under runc or runsc (gVisor).
#
-# Simulates the pod: no CUA_ENV_TOKEN, a tmpfs mounted at /run/cua (Fleet
-# mounts the claim Secret there read-only; here it is writable so the test can
-# play the operator). While the driver runs, the test writes, rotates and
-# empties /run/cua/env-token as root (0600, atomic rename, like a Secret
-# update) and checks from the host over gRPC-Web (curl):
+# Simulates the pod: no CUA_ENV_TOKEN, a tmpfs mounted at /run/cua (an
+# orchestrator mounts the token Secret there read-only; here it is writable so
+# the test can play the orchestrator). While the driver runs, the test writes,
+# rotates and empties /run/cua/env-token as root (0600, atomic rename, like a
+# Secret update) and checks from the host over gRPC-Web (curl):
# awaiting GetCapabilities/Health answer; Stat is FAILED_PRECONDITION with
# and without a token
# install the token works, no token is UNAUTHENTICATED; the root
diff --git a/libs/images/omarchy/Dockerfile b/libs/images/omarchy/Dockerfile
index 822b3de114..5e702188bc 100644
--- a/libs/images/omarchy/Dockerfile
+++ b/libs/images/omarchy/Dockerfile
@@ -135,7 +135,7 @@ RUN --mount=type=bind,source=linux/dist,target=/dist \
if [ -x "$bin" ]; then ldd "$bin" | grep 'not found' && exit 1 || true; fi; \
mkdir -p /etc/cua-image; echo "$CUA_SPACESD_SOURCE" >/etc/cua-image/spacesd-source
-# Token handling, Fleet claim token sync and the in-guest fixtures are shared
+# Token handling, claim token sync and the in-guest fixtures are shared
# with libs/images/linux; the session glue and units are Omarchy's own.
COPY linux/files/ensure-env-token.sh linux/files/env-token-mode.sh \
linux/files/start-spacesd.sh linux/files/start-token-sync.sh \
diff --git a/libs/images/omarchy/files/systemd/cua-spacesd.service b/libs/images/omarchy/files/systemd/cua-spacesd.service
index b70d486168..7d2a3dd3e6 100644
--- a/libs/images/omarchy/files/systemd/cua-spacesd.service
+++ b/libs/images/omarchy/files/systemd/cua-spacesd.service
@@ -3,8 +3,8 @@ Description=cua-spacesd (gRPC + gRPC-Web on :3211) in the Omarchy session
# The Hyprland session (sddm autologin -> uwsm) publishes its environment to
# /run/cua-desktop/desktop.env; cua-desktop-env.path restarts this unit when a
# new session writes it. Token handling is libs/images/linux's (see
-# start-spacesd.sh); the Fleet claim token arrives through run-cua.mount and
-# cua-env-token-sync.service.
+# start-spacesd.sh); the orchestrator's claim token arrives through
+# run-cua.mount and cua-env-token-sync.service.
# cloud-init-network.service is the unit name of newer cloud-init (Arch); cloud-init.service the older one.
After=sddm.service network-online.target cloud-init.service cloud-init-network.service run-cua.mount cua-env-token-sync.service
Wants=network-online.target cua-env-token-sync.service