From 64fcd83f5f3cd92bbd05cf4d0c5e4bb4c4a91736 Mon Sep 17 00:00:00 2001 From: Jasper Mayone Date: Thu, 22 Oct 2026 00:14:51 -0400 Subject: [PATCH 1/2] feat(weft): add the weft host key, give it ad-join, and size it for krater --- README.md | 4 ++-- hosts/weft/configuration.nix | 3 +-- secrets/ad-join.age | 30 ++++++++++++++++-------------- secrets/secrets.nix | 4 ++-- terraform/proxmox/README.md | 2 +- terraform/proxmox/variables.tf | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 55c9ce9..3d1f773 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ The lab hosts below are NixOS VMs on pve01, VLAN 90 (`patchwork.internal`). alas | `seam` | 357 | 10.100.90.57 | 2 GB | `patchwork_central_restricted`, prod. Tailnet only. | | `hem` | 358 | 10.100.90.58 | 2 GB | Both staging clusters: central on 5432, restricted on 5433. Quilt staging uses the restricted one. | | `batting` | 360 | 10.100.90.60 | 4 GB | Quilt prod + staging. nginx on `tailscale0:80` for alastor. | -| `weft` | 361 | 10.100.90.61 | 2 GB | Krater prod + staging. nginx on `tailscale0:80` for alastor. | +| `weft` | 361 | 10.100.90.61 | 4 GB | Krater prod + staging. nginx on `tailscale0:80` for alastor. | The Windows hosts are managed by Ansible (`ansible/`): @@ -52,7 +52,7 @@ The Windows hosts are managed by Ansible (`ansible/`): | `bobbin` | 312 | 10.100.90.12 | Issuing CA | | `shuttle` | 314 | 10.100.90.14 | NPS / RADIUS | -VMIDs 358, 360 and 361 and their addresses are proposed. Confirm that they are free before you create the VMs. On 2026-10-21 pve01 had about 25 GiB available. hem, batting and weft need 8 GiB together, with no ballooning. +hem, batting and weft are built (2026-10-21 and 2026-10-22). weft has 4 GB and a 40 GB disk, because Krater builds its image on the host and runs SeaweedFS. ```mermaid flowchart LR diff --git a/hosts/weft/configuration.nix b/hosts/weft/configuration.nix index b402674..9d19dc3 100644 --- a/hosts/weft/configuration.nix +++ b/hosts/weft/configuration.nix @@ -1,5 +1,4 @@ -# weft — Krater host (pve01 VMID 361, 10.100.90.61, 2 GB; -# VMID and address to be confirmed free before create) +# weft — Krater host (pve01 VMID 361, 10.100.90.61, 4 GB, 40 GB disk) # # One app per VM. Sudo and the docker group are root here, so only the # break-glass admins (modules/common) and lnx-weft-admins get them. Only this diff --git a/secrets/ad-join.age b/secrets/ad-join.age index 301d144..d6ea09b 100644 --- a/secrets/ad-join.age +++ b/secrets/ad-join.age @@ -1,15 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 1uIO/w qIlQc/KI35FRJ0AcHkeZNdy2vQSAwf5RQ3mmg3vLniM -e32rCO4cWFejvcH8SR7PNyqkjiO4TcIsCUDFjm6PLpg --> ssh-ed25519 5jO4Pg TERXEdFE15I5cRFw5Lgd0wJL+xsPOv3I29WidgfzLUI -4yRR7CONcDFV7HsAU6NTTqXj62N8MI2qaxGzaewFXF8 --> ssh-ed25519 zU9L3Q miGA06ehPEhiDFKg12WDJ+vlvuq8JW+O0rf5CrVSjQM -qezkusC003wVylsupofu6HeRT6wg845cUDJqk+aLtg4 --> ssh-ed25519 gW6fbQ C4jY5uNjW4r7oeV1dODhpSFsG4O7DnPMQqFH2WaJ0AI -QyD4j1G7SdwKqnvDqZ3yVhQENEgLCgq4mq4Tyv0KdUk --> ssh-ed25519 YGz6dA A8Mqc7GycliRhwx/4z1/LT5f744VOch7B41BSBNZCRo -5MfkL5sBB37Bs4Vr0xySwZq/yf960wlgYwR6Z5CLh2c --> ssh-ed25519 OeXtHA RHV7KMw7ErgBfyva8EiKeQpcUBmZKiWOarJw9zkYCk0 -tIbivZ5gTQjko57aEQ257tsH4CKaFDpVI6WedDiPbdQ ---- ba7YPHoV2pKn2aEVu/Rx0fJY689Y2RbnPv6ymf65OBg -¶»a2ÉÐRSvÌ| iáôÀü¹… ÆÏxBe0Bãƒ/]�’ºLI OÀ–¸€ð>BÊÄÚ ssh-ed25519 1uIO/w R94s+RqHxBUeOu6uRKQiaxDvnqYYRsS3ofBv7ezzDQY +qCq64bh7aeGNwWiVgQbMWkOMMKTWdfX4sBhI9wshLww +-> ssh-ed25519 5jO4Pg lAtiMYBuxmp5+kDu61e1RjLnNXLFrc1AwGWwz4G9+hE +GuppA/26f5recxS6SecdT2/tBxPnnlGva/Za0mpj2Bg +-> ssh-ed25519 zU9L3Q EkuHYeaYB0D8aimrEjZqUEjED3RF7StlmAl9Gw8LmiE +WXCwLz2MjjZJww23iNw7CIwcUjNNr1pTWkKnZMrQCcU +-> ssh-ed25519 gW6fbQ FXR3OXskZQbI3HkdIiwldfJt7jn6Z/NvPtBRqmwKugU +RQe+wdABFfxHgOS1XoF0TEBHf1q0hfvn7bv4EfqvyC0 +-> ssh-ed25519 YGz6dA dy1Rh4UGyCMwtgzaZQkivlzItNl8y/sF7xXL6F3tnTg +G3WsCoNtY2QJrZg3KTn1kTLtPGCjSsfL4sy9UjQMEVc +-> ssh-ed25519 OeXtHA m8wSATmKirAzGikFF6LKEDIfLlRaBSCEZdD2gnQ8IjE +PxhKIFHPFf1XRMAKPhOhZh+srxx9cNMtMZOa63GH0XY +-> ssh-ed25519 fqr1AA QK8ztGzPnbmGIzD225scDqYxTrfa4Na28YYZjZNYFDw +xzA48czCatDszXGR3anYGT4eog7LuLBJFKx4IYvDMro +--- 8tHDTQsO5xlfsYf7KS4L/GPw4XC/nc9eWwlmXFXi630 +æjM”]uqi4”J /m¥ik÷.¤D?&vÚK°€ÔЧ»¥�ˆ@GÊl®2'ØOqu¯>2ÓÕ·Ûj{HÊ€½2Ø2G. \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5072b42..22331be 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -16,8 +16,7 @@ let warp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJoRstg6i9nq60YNVyKvlhsURUHnNGPXcR5eV6P6hmXH"; hem = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFHZ/2Q8x+Z9toPli2yQZpQ4e8dBMOqDAFyAFaxgsIE"; batting = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEN68vw2ir+q4fMQV8WBJvH7WDG4D2uFjChwkkA93LJC"; - # weft: add its key after its install, then add the host to the - # files it needs and run `agenix -r`. + weft = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAbzni2Be82ORFcHSPVr7OPpfs80Py04JtwyCKc4L28X"; # # Central DB passwords, one file per app and environment, password only: # central-prod-.age recipients: jsp, skein @@ -150,5 +149,6 @@ in warp hem batting + weft ]; } diff --git a/terraform/proxmox/README.md b/terraform/proxmox/README.md index 4bd487e..87a34a8 100644 --- a/terraform/proxmox/README.md +++ b/terraform/proxmox/README.md @@ -11,7 +11,7 @@ This root manages the Patchwork NixOS VMs on the Proxmox node `pve01`. It uses t | `seam` | 357 | 10.100.90.57 | 2 GB | | `hem` | 358 | 10.100.90.58 | 2 GB | | `batting` | 360 | 10.100.90.60 | 4 GB | -| `weft` | 361 | 10.100.90.61 | 2 GB | +| `weft` | 361 | 10.100.90.61 | 4 GB | hem and batting are in the state (created with `qm create` and `tofu import`). weft is not in the state yet, so a plain apply creates it. To create one VM, target it: `tofu apply -target='proxmox_virtual_environment_vm.nixos["weft"]'`. diff --git a/terraform/proxmox/variables.tf b/terraform/proxmox/variables.tf index 43876ad..f161cfe 100644 --- a/terraform/proxmox/variables.tf +++ b/terraform/proxmox/variables.tf @@ -88,9 +88,9 @@ variable "vms" { } weft = { vmid = 361 - memory_mb = 2048 + memory_mb = 4096 cores = 2 - disk_gb = 20 + disk_gb = 40 ip = "10.100.90.61" } } From dfa556f9f39470b5cfc4e4f5252923d8c7151e57 Mon Sep 17 00:00:00 2001 From: Jasper Mayone Date: Thu, 22 Oct 2026 00:17:02 -0400 Subject: [PATCH 2/2] docs(weft): say that weft is built and in the state --- hosts/weft/configuration.nix | 8 +++----- terraform/proxmox/README.md | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hosts/weft/configuration.nix b/hosts/weft/configuration.nix index 9d19dc3..8ea665d 100644 --- a/hosts/weft/configuration.nix +++ b/hosts/weft/configuration.nix @@ -8,12 +8,10 @@ # # Tailnet tags: tag:patchwork (ssh from admins, port 80 from alastor) and # tag:patchwork-krater. The policy in jaspermayone/infra lets tag:patchwork-krater -# reach skein:5432 (prod) only. hem (staging) gets a grant when it joins the tailnet. +# reach skein:5432 (prod) and hem:5432 (staging). # -# Bring-up: create the VM (terraform/proxmox), install with nixos-anywhere, -# tag the node with both tags, then add the host key to secrets/secrets.nix -# as a recipient of ad-join.age (AD logon) and run `agenix -r`. -# Krater itself comes in a later change, with its secrets and its edge route. +# Built on 2026-10-22 with `qm create`, `tofu import` and nixos-anywhere. Its +# host key is a recipient of ad-join.age (AD logon). Krater comes in #32. { ... }: { imports = [ diff --git a/terraform/proxmox/README.md b/terraform/proxmox/README.md index 87a34a8..8d1b601 100644 --- a/terraform/proxmox/README.md +++ b/terraform/proxmox/README.md @@ -13,7 +13,7 @@ This root manages the Patchwork NixOS VMs on the Proxmox node `pve01`. It uses t | `batting` | 360 | 10.100.90.60 | 4 GB | | `weft` | 361 | 10.100.90.61 | 4 GB | -hem and batting are in the state (created with `qm create` and `tofu import`). weft is not in the state yet, so a plain apply creates it. To create one VM, target it: `tofu apply -target='proxmox_virtual_environment_vm.nixos["weft"]'`. +hem, batting and weft are in the state (created with `qm create` and `tofu import`). To change one VM, target it, for example `tofu apply -target='proxmox_virtual_environment_vm.nixos["weft"]'`. A plan for an imported VM shows `agent.timeout` 15m to 2m. That value is only in the state. Each VM matches `hosts/proxmox-vm.nix`: