@specific.dev/spectest 0.120.1 → 0.121.0

package/dist/components/k3s-nodes.d.ts

@@ -0,0 +1,5 @@
+import type { SpectestContext } from "../index.js";
+/** /readyz only checks the API server. Check the expected identities, not just
+ * a count: an unregistered agent must not be hidden by an unrelated node.
+ * This runs alongside image imports and infrastructure rollouts. */
+export declare function waitForK3sNodes(server: string, names: readonly string[], exec: SpectestContext["exec"], timeoutMs: number): Promise<void>;

package/dist/components/k3s-nodes.js

@@ -0,0 +1,37 @@
+/** /readyz only checks the API server. Check the expected identities, not just
+ * a count: an unregistered agent must not be hidden by an unrelated node.
+ * This runs alongside image imports and infrastructure rollouts. */
+export async function waitForK3sNodes(server, names, exec, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    let detail = "no nodes registered";
+    for (;;) {
+        const result = await exec(server, ["kubectl", "get", "nodes", "-o", "json", "--request-timeout=5s"], { timeoutMs: 10_000 });
+        if (result.exitCode === 0) {
+            const nodes = JSON.parse(result.stdout).items;
+            const pending = names.flatMap(name => {
+                const node = nodes.find(node => node.metadata?.name === name);
+                const ready = node?.status?.conditions?.find(condition => condition.type === "Ready");
+                return ready?.status === "True" ? [] : [`${name}: ${node ? ready?.message || `Ready=${ready?.status ?? "Unknown"}` : "not registered"}`];
+            });
+            if (!pending.length)
+                return;
+            detail = pending.join("; ");
+        }
+        else
+            detail = result.stderr || result.stdout;
+        if (Date.now() >= deadline) {
+            // Agent startup errors otherwise look like a missing Kubernetes Node.
+            const diagnostics = await Promise.all(names.map(async (name) => {
+                try {
+                    const result = await exec(name, ["sh", "-c", "test -S /run/k3s/containerd/containerd.sock"], { timeoutMs: 5_000 });
+                    return `${name}: ${result.exitCode === 0 ? "containerd socket present" : result.stderr || "containerd socket missing"}`;
+                }
+                catch (error) {
+                    return `${name}: ${String(error)}`;
+                }
+            }));
+            throw new Error(`k3s(${server}): nodes did not become Ready within ${timeoutMs / 1000}s: ${detail}\n${diagnostics.join("\n")}`);
+        }
+        await new Promise(resolve => setTimeout(resolve, 250));
+    }
+}

package/dist/components/k3s.d.ts

@@ -1,5 +1,5 @@
 import { AppsV1Api, BatchV1Api, CoreV1Api, KubeConfig, PatchStrategy, type KubernetesListObject, type KubernetesObject, type V1DeleteOptions, type V1Job, type V1Status } from "@kubernetes/client-node";
-import type { ServiceHelpersContext, ServiceSetupContext } from "../index.js";
+import type { ServiceConfig } from "../index.js";
 import { type KubernetesImage } from "../harness/component-images.js";
 export type { KubernetesImage } from "../harness/component-images.js";
 import type { Wrapped } from "../inspect.js";
@@ -15,6 +15,9 @@ export interface K3sRegistryOptions {
 /** Kubernetes pods receive read-only environment CA mounts during admission.
  * Image bytes and digests stay unchanged; explicit pod trust settings win. */
 export interface K3sOptions {
+    /** Total schedulable nodes, including the server node. Defaults to 1.
+     * Additional nodes run k3s agents in separate containers inside the same VM. */
+    nodes?: number;
     /** Images available to kubelet before project setup. Use registry strings,
      * or Dockerfile builds with a full `reference` matching your manifests. Builds
      * support path/content, context, exclude, target and buildArgs, and run in
@@ -248,6 +251,8 @@ export interface LogsOptions {
 }
 /** Helpers a `k3s(...)` service exposes on `ctx.svc.<name>`. */
 export interface K3sHelpers {
+    /** Kubernetes node names, also their Spectest container/service names. */
+    nodes: readonly string[];
     /**
      * Fully-loaded `KubeConfig`. The cluster server URL is rewritten to
      * `https://<service-name>.internal:6443`, the auto-assigned DNS name
@@ -343,43 +348,4 @@ export interface K3sHelpers {
 }
 /** @internal Exported for regression tests; not part of the components API. */
 export declare function isTransientApplyError(err: unknown): boolean;
-export declare function k3s(opts?: K3sOptions): {
-    image: {
-        type: "registry";
-        reference: string;
-    };
-    imageBuilds: import("../index.js").ComponentImageBuild[];
-    tls: {
-        hostname: string;
-        port: number;
-    }[];
-    command: string;
-    privileged: true;
-    tmpfs: string[];
-    cgroupns: string;
-    ports: number[];
-    volumes: ({
-        source: string;
-        target: string;
-        readOnly?: undefined;
-    } | {
-        target: string;
-        source?: undefined;
-        readOnly?: undefined;
-    } | {
-        source: string;
-        target: string;
-        readOnly: boolean;
-    })[];
-    files: {
-        path: string;
-        content: string;
-    }[];
-    readyCheck: {
-        type: "exec";
-        command: string;
-        timeoutSecs: number;
-    };
-    setup: (ctx: ServiceSetupContext<K3sHelpers>) => Promise<void>;
-    helpers: ({ name, exec, poll }: ServiceHelpersContext) => Promise<K3sHelpers>;
-};
+export declare function k3s(opts?: K3sOptions): import("../index.js").ServiceGroup<Record<string, ServiceConfig>, K3sHelpers, "server">;