@rallycry/conveyor-k3 0.1.7 → 0.1.10

package/dist/cli.js

@@ -127,6 +127,21 @@ var init_exec = __esm({
   }
 });
 
+// src/vm/memory-budget.ts
+function vmHostMemoryGiB(guestGiB) {
+  return guestGiB + Math.max(1, guestGiB / 4);
+}
+function maximumGuestMemoryGiB(hostBytes) {
+  if (!Number.isFinite(hostBytes) || hostBytes <= 0) return 0;
+  const budget = hostBytes / 1024 ** 3 * 0.75;
+  return Math.max(0, Math.floor(Math.min(budget - 1, budget / 1.25)));
+}
+var init_memory_budget = __esm({
+  "src/vm/memory-budget.ts"() {
+    "use strict";
+  }
+});
+
 // src/vm/config.ts
 import { cpus, freemem, totalmem } from "os";
 import { stringify as stringify2 } from "yaml";
@@ -139,8 +154,10 @@ function validateResources(resources, host = { cpus: cpus().length, memory: tota
   if (!Number.isInteger(count) || count < 1 || count > Math.max(1, host.cpus - 1)) {
     throw new Error("CPU allocation must leave at least one host CPU available.");
   }
-  if (!Number.isInteger(memoryGiB) || memoryGiB < 2 || memoryGiB * GIB > host.memory * 0.75) {
-    throw new Error("VM memory must be at least 2 GiB and leave 25% of host memory available.");
+  if (!Number.isInteger(memoryGiB) || memoryGiB < 2 || vmHostMemoryGiB(memoryGiB) * GIB > host.memory * 0.75) {
+    throw new Error(
+      "VM memory must be at least 2 GiB and leave 25% of host memory available, including QEMU and relay overhead."
+    );
   }
   if (!Number.isInteger(diskGiB) || diskGiB < 20 || diskGiB > 512) {
     throw new Error("VM disk must be between 20 and 512 GiB.");
@@ -193,10 +210,18 @@ function parseInstallUrl(value) {
     throw new Error("Install URL is missing its enrollment token.");
   return url;
 }
+function validateStartupMemory(memoryGiB, hostBytes = totalmem()) {
+  if (memoryGiB > maximumGuestMemoryGiB(hostBytes)) {
+    throw new Error(
+      "VM memory plus host overhead must leave 25% of host RAM available. Reduce the memory allocation before starting."
+    );
+  }
+}
 var VM_NAME, GIB, IMAGES;
 var init_config = __esm({
   "src/vm/config.ts"() {
     "use strict";
+    init_memory_budget();
     VM_NAME = "conveyor";
     GIB = 1024 ** 3;
     IMAGES = {
@@ -1198,6 +1223,7 @@ async function createVm(ports, resources, installUrl) {
 async function startVm(ports, state) {
   ports.log("Checking VM configuration and current state\u2026");
   await assertTemplateUnchanged(ports.paths, state);
+  validateStartupMemory(state.resources.memoryGiB, ports.hostMemory?.());
   const status = await vmStatus(ports, state);
   const stopped = status.status === "Stopped";
   if (!stopped && status.status !== "Running") {
@@ -9274,6 +9300,7 @@ Documentation=https://conveyor.rallycryapp.com/docs/guides/managed-personal-comp
 
 [Service]
 Type=oneshot
+User=root
 EnvironmentFile=${ENV_FILE}
 ExecStart=${options.cliBin} update
 StandardOutput=journal

package/dist/index.d.ts

@@ -774,4 +774,7 @@ interface QemuPolicyContext {
 /** Rewrites only a complete, known Lima QEMU profile; every unknown input fails closed. */
 declare function rewriteQemuArgs(args: string[], network: QemuNetworkPolicy, ncPath?: string, context?: QemuPolicyContext): string[];
 
-export { ClusterConnection, type ClusterConnectionConfig, ClusterDaemon, CommandError, type CrictlImage, type DaemonPorts, type Executor, type FileSystemPort$1 as FileSystemPort, type GuestDnsProvision, type GuestSrvRecord, HELP, type ImageInventory, K3S_DISABLED_COMPONENTS, K3S_INSTALL_EXEC, type K3sUpgradeDecision, type MachineState, type NetworkEndpoint, type NetworkPolicy, type QemuNetworkPolicy, type ReconcileContext, type ReconcileResult, type RegistriesFile, type ResolvedNetwork, type ResolvedNetworkHost, type SRVLookup, type UninstallResult, type UnitRenderOptions, VERBS, type Verb, cloudflaredSrvRecords, collectHeartbeat, configuredAuthHosts, countRunningConveyorPods, createMemoryFileSystem, decideK3sUpgrade, isGloballyRoutableIPv4, isVerb, meetsK3sMinimum, missingAuthHosts, nodeFileSystem, ownerConfiguredKeys, ownerConfiguredKubeletFlags, parseArgs, parseK3sVersion, parseRegistries, pruneStrandedImages, readImageInventory, readState, reconcile, registryAdd, registryList, renderAllUnits, renderGuestDnsProvision, renderK3sDropIn, renderKubeletDropIn, renderRegistryAuthSummary, resolveCloudflaredSrvRecords, resolveNetwork, rewriteQemuArgs, runOrThrow, runUpdate, selectStrandedImages, serializeRegistries, spawnExecutor, uninstall, upsertRegistryAuth, warmImages, writeState };
+/** Reserve 25% of physical host RAM after accounting for VM overhead. */
+declare function maximumGuestMemoryGiB(hostBytes: number): number;
+
+export { ClusterConnection, type ClusterConnectionConfig, ClusterDaemon, CommandError, type CrictlImage, type DaemonPorts, type Executor, type FileSystemPort$1 as FileSystemPort, type GuestDnsProvision, type GuestSrvRecord, HELP, type ImageInventory, K3S_DISABLED_COMPONENTS, K3S_INSTALL_EXEC, type K3sUpgradeDecision, type MachineState, type NetworkEndpoint, type NetworkPolicy, type QemuNetworkPolicy, type ReconcileContext, type ReconcileResult, type RegistriesFile, type ResolvedNetwork, type ResolvedNetworkHost, type SRVLookup, type UninstallResult, type UnitRenderOptions, VERBS, type Verb, cloudflaredSrvRecords, collectHeartbeat, configuredAuthHosts, countRunningConveyorPods, createMemoryFileSystem, decideK3sUpgrade, isGloballyRoutableIPv4, isVerb, maximumGuestMemoryGiB, meetsK3sMinimum, missingAuthHosts, nodeFileSystem, ownerConfiguredKeys, ownerConfiguredKubeletFlags, parseArgs, parseK3sVersion, parseRegistries, pruneStrandedImages, readImageInventory, readState, reconcile, registryAdd, registryList, renderAllUnits, renderGuestDnsProvision, renderK3sDropIn, renderKubeletDropIn, renderRegistryAuthSummary, resolveCloudflaredSrvRecords, resolveNetwork, rewriteQemuArgs, runOrThrow, runUpdate, selectStrandedImages, serializeRegistries, spawnExecutor, uninstall, upsertRegistryAuth, warmImages, writeState };

package/dist/index.js

@@ -7723,6 +7723,7 @@ Documentation=https://conveyor.rallycryapp.com/docs/guides/managed-personal-comp
 
 [Service]
 Type=oneshot
+User=root
 EnvironmentFile=${ENV_FILE}
 ExecStart=${options.cliBin} update
 StandardOutput=journal
@@ -8850,6 +8851,13 @@ function rewriteQemuArgs(args, network, ncPath = "/usr/bin/nc", context = {}) {
   assertCompleteProfile(state);
   return output;
 }
+
+// src/vm/memory-budget.ts
+function maximumGuestMemoryGiB(hostBytes) {
+  if (!Number.isFinite(hostBytes) || hostBytes <= 0) return 0;
+  const budget = hostBytes / 1024 ** 3 * 0.75;
+  return Math.max(0, Math.floor(Math.min(budget - 1, budget / 1.25)));
+}
 export {
   ClusterConnection,
   ClusterDaemon,
@@ -8866,6 +8874,7 @@ export {
   decideK3sUpgrade,
   isGloballyRoutableIPv4,
   isVerb,
+  maximumGuestMemoryGiB,
   meetsK3sMinimum,
   missingAuthHosts,
   nodeFileSystem,

package/dist/vm-qemu.js

@@ -683,6 +683,17 @@ function runRelayNow(root, invocation, io) {
       input: process.stdin,
       output: process.stdout
     };
+    const signals = ["SIGINT", "SIGTERM", "SIGHUP"];
+    const cleanup = () => {
+      try {
+        unregisterRelay(root, record);
+      } catch {
+      }
+    };
+    const terminated = (signal) => {
+      finish(new Error("VM relay terminated"));
+      process.kill(process.pid, signal);
+    };
     const finish = (error) => {
       if (finished) return;
       finished = true;
@@ -690,13 +701,14 @@ function runRelayNow(root, invocation, io) {
       if (connectTimer) clearTimeout(connectTimer);
       socket.destroy();
       input.destroy();
-      try {
-        unregisterRelay(root, record);
-      } catch {
-      }
+      for (const signal of signals) process.removeListener(signal, terminated);
+      process.removeListener("exit", cleanup);
+      cleanup();
       if (error) process.exitCode = 1;
       resolve();
     };
+    process.once("exit", cleanup);
+    for (const signal of signals) process.once(signal, terminated);
     const exceedsLimit = (total) => total > MAX_RELAY_BYTES;
     socket.setTimeout(RELAY_IDLE_MS, () => finish(new Error("VM relay idle timeout")));
     socket.once("connect", () => {
@@ -732,6 +744,11 @@ function runRelayNow(root, invocation, io) {
   });
 }
 
+// src/vm/memory-budget.ts
+function vmHostMemoryGiB(guestGiB) {
+  return guestGiB + Math.max(1, guestGiB / 4);
+}
+
 // src/vm/resource-guard.ts
 var GIB = 1024 ** 3;
 var GUARD_INTERVAL_MS = 2e3;
@@ -741,7 +758,9 @@ function guardLimits(resources) {
   }
   return {
     minFreeBytes: 10 * GIB,
-    maxRssKiB: (resources.memoryGiB + 1) * 1024 ** 2,
+    // A 24 GiB Mac guest exceeded 27 GiB during image unpacking. Allow 25%
+    // overhead (at least 1 GiB); admission reserves host RAM using this same cap.
+    maxRssKiB: vmHostMemoryGiB(resources.memoryGiB) * 1024 ** 2,
     maxProcesses: 64,
     maxOutputBytes: 1024 * 1024,
     maxDiskBytes: (resources.diskGiB + 1) * GIB,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-k3",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "Managed personal compute for Conveyor. Installs and maintains a k3s cluster that runs your own card builds, kept converged on Conveyor's desired state.",
   "keywords": [
     "cloudflared",