--wip-- [skip ci]

.gitea/workflows/audit.yaml

@@ -7,7 +7,6 @@ on:
       - "**/Cargo.lock"
   schedule:
     - cron: "0 0 * * *"
-  workflow_dispatch:
 
 jobs:
   audit:
@@ -23,6 +22,6 @@ jobs:
       - name: Setup rust cache
         uses: Swatinem/rust-cache@v2
       - name: Audit check
-        uses: https://git.huizinga.dev/infra/rust-audit-check@v3.0.0
+        uses: rustsec/audit-check@v2.0.0
         with:
           token: ${{ secrets.GITEA_TOKEN }}

Cargo.toml

@@ -17,12 +17,11 @@ serde_json = "1.0.149"
 byteorder = "1.5.0"
 clap = { version = "4.6.0", features = ["derive"] }
 clap_complete = "4.6.0"
-gix-discover = { version = "0.55.0", features = ["sha1"] }
+gix-discover = { version = "0.49.0", features = ["sha1"] }
 minijinja = { version = "2.18.0", features = ["json", "loader"] }
 netascii = "0.1.0"
 num_enum = "0.7.6"
 optional_struct = "0.5.2"
-regex = "1.13.1"
 reqwest = { version = "0.13.2", default-features = false, features = [
   "blocking",
   "stream",

helios.yaml

@@ -1,210 +0,0 @@
-version: v1alpha1
-debug: false
-persist: true
-machine:
-    type: controlplane
-    token: 6yf327.db3x2zfs5ptbxrst
-    ca:
-        crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJQekNCOHFBREFnRUNBaEVBM0ZXN0JrK21pK3h5TFk4V29pNFNqVEFGQmdNclpYQXdFREVPTUF3R0ExVUUKQ2hNRmRHRnNiM013SGhjTk1qVXhNVEE1TURJek9USXdXaGNOTXpVeE1UQTNNREl6T1RJd1dqQVFNUTR3REFZRApWUVFLRXdWMFlXeHZjekFxTUFVR0F5dGxjQU1oQUJvSDVycnRxT3BaakRuaU5scXppOVRlT2c0OW4zMzBtcVp4CjVySXRYVEJJbzJFd1h6QU9CZ05WSFE4QkFmOEVCQU1DQW9Rd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSEF3RUcKQ0NzR0FRVUZCd01DTUE4R0ExVWRFd0VCL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkkwcDJYT0pmTVE5SUV0eQpqZzlRYlk0VnJPbGZNQVVHQXl0bGNBTkJBQXkvYlFLYmxZSEtYb0QrZE1NWU1zZmY0QjkzWFJIR29ZWmpGM2lKCnp5R3lXdkh0SnYzdEY3aVJrOG9ibnpWZUR5dnlUOEM0QVAzZUkvZmlZQmFDaXcwPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-        key: LS0tLS1CRUdJTiBFRDI1NTE5IFBSSVZBVEUgS0VZLS0tLS0KTUM0Q0FRQXdCUVlESzJWd0JDSUVJTDg3ckFBbTgvUzlNSU1GQm9pZ2ZpUDg4Mmg3QlNUSGppUTFrSng2QmNEVAotLS0tLUVORCBFRDI1NTE5IFBSSVZBVEUgS0VZLS0tLS0K
-    certSANs: []
-    kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.35.3
-        extraArgs:
-            rotate-server-certificates: "true"
-        extraMounts:
-            - destination: /var/lib/longhorn
-              type: bind
-              source: /var/lib/longhorn
-              options:
-                - bind
-                - rshared
-                - rw
-        defaultRuntimeSeccompProfileEnabled: true
-        disableManifestsDirectory: true
-    network: {}
-    install:
-        disk: /dev/sda
-        image: factory.talos.dev/metal-installer/53edcacbd9153fcbce2ba04cc41e1c6867ef92b462b37344de8c420ceeb21816:v1.12.6
-        wipe: false
-        grubUseUKICmdline: true
-    files:
-        - content: |-
-            [plugins."io.containerd.cri.v1.images"]
-              discard_unpacked_layers = false
-          permissions: 0o0
-          path: /etc/cri/conf.d/20-customization.part
-          op: create
-    features:
-        diskQuotaSupport: true
-        kubePrism:
-            enabled: true
-            port: 7445
-        hostDNS:
-            enabled: true
-            forwardKubeDNSToHost: false
-    nodeLabels:
-        node.kubernetes.io/exclude-from-external-load-balancers: ""
-cluster:
-    id: CZ7M2eK-gs9qR50_MYzIL8653An9nHRGCR2R1rfIfSo=
-    secret: hnYuExJx1JeFfG6Ss3yYI1wuJRqokD9laXboLmI0A4Q=
-    controlPlane:
-        endpoint: https://10.0.2.1:6443
-    clusterName: titan
-    network:
-        cni:
-            name: none
-        dnsDomain: cluster.local
-        podSubnets:
-            - 10.244.0.0/16
-        serviceSubnets:
-            - 10.96.0.0/12
-    token: 5607yr.7fbnk2hyaukxnkwx
-    secretboxEncryptionSecret: NSHASj2WMMmiZqluiHGKdiJuaxejaz6bmytD07ccp/A=
-    ca:
-        crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJpakNDQVRDZ0F3SUJBZ0lSQU4xVTVpY2FlY1B6QXRTeDFobjdCaU13Q2dZSUtvWkl6ajBFQXdJd0ZURVQKTUJFR0ExVUVDaE1LYTNWaVpYSnVaWFJsY3pBZUZ3MHlOVEV4TURrd01qTTVNakJhRncwek5URXhNRGN3TWpNNQpNakJhTUJVeEV6QVJCZ05WQkFvVENtdDFZbVZ5Ym1WMFpYTXdXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CCkJ3TkNBQVJPYmVEM3UzbWVoYk1NWE9xeHJKYzNFaGovZ1NrNENENm42cXhQcTBIVHdDbk1iY2l1cmNZUTk5VkkKM0ZPUU92ZCtGMGtKSFV1ZitkSDFlRU1GWno4eG8yRXdYekFPQmdOVkhROEJBZjhFQkFNQ0FvUXdIUVlEVlIwbApCQll3RkFZSUt3WUJCUVVIQXdFR0NDc0dBUVVGQndNQ01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0hRWURWUjBPCkJCWUVGUExUWTYveUthQUFOUk1Ud0pmUDh2a2FEcXh5TUFvR0NDcUdTTTQ5QkFNQ0EwZ0FNRVVDSVFESjM4TloKcEZDMjJLK3pMRWlrQWp1YlNoMWNXcW5JZmU4c2VHbkZHckFWOXdJZ1cyLy9WS3BFSTNSaGtTaTkxWGVLNVduOAowRXdaVmlKRkZSWENVcEt6L0pFPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-        key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSURsQ3BaWThKYmx1Znl3cStWcmJGb25XRmlZYjJINDRXdG0xLzFSRWpubFNvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFVG0zZzk3dDVub1d6REZ6cXNheVhOeElZLzRFcE9BZytwK3FzVDZ0QjA4QXB6RzNJcnEzRwpFUGZWU054VGtEcjNmaGRKQ1IxTG4vblI5WGhEQldjL01RPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
-    aggregatorCA:
-        crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJYekNDQVFXZ0F3SUJBZ0lRVHBwakprbXRucktUM09yOEVsU2VPakFLQmdncWhrak9QUVFEQWpBQU1CNFgKRFRJMU1URXdPVEF5TXpreU1Gb1hEVE0xTVRFd056QXlNemt5TUZvd0FEQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxRwpTTTQ5QXdFSEEwSUFCS2cwOW4xcXExSkhBNTJmZXNkT1RVYTFHOUpHWUQ2WWF1aDdOSjdjbDl2dzQ4QUJORmJkCnA3YUdSQnNtNzdDZVNIemRiOWU4MmdoZHVkTUVRbVFnUCtXallUQmZNQTRHQTFVZER3RUIvd1FFQXdJQ2hEQWQKQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSUt3WUJCUVVIQXdJd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZApCZ05WSFE0RUZnUVVuNjhCcWJmUkZpaXpzTis0VUFKYkk0RUFaTXd3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloCkFOb3lXbFpXQkR5K0tONHRYdldmTDlYcXZGaGNabGxEYkhLNnlGQkE2Z0h1QWlBdUVFV1JCaXhrMU1VdVVrTXAKTkhOWHpSMXQ4TWVBNVBmY1BnakVramhjcmc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-        key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUgwZGkzc3hMZmxQZVZFNnplY1ppbk42QWM5SURaSjJvdHF1bWdJUTNnRnNvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFcURUMmZXcXJVa2NEblo5NngwNU5SclViMGtaZ1BwaHE2SHMwbnR5WDIvRGp3QUUwVnQybgp0b1pFR3lidnNKNUlmTjF2MTd6YUNGMjUwd1JDWkNBLzVRPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
-    serviceAccount:
-        key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlKSndJQkFBS0NBZ0VBcXlINkplaGQ0Qm9zQjJYK1dhRDV3N0tQa1RVc0dLQlQzclhjSVhYdGhvRkFyZFpGCmtyU1l5QVpwYTFrcFN1UndCaVRXbDExd2dkNzJvU2h6S1pHY1F3UC9VQ1F0eVhyMmNvVW1XMXJDRUJHRmduSnoKZWNsb3VKWENSUDJPOU11ZndqVHFoWjd5OXhoL0g0VkdCNitLcFBSeG9KQnR4KzFJWEE3a2hySzVFY0l0dmpOUAo2MTFyRXN5OFhEWmxGdHhCMVVzY0hoOXpTZUhNOVNPN2pXV2FvVUV5S3QraU9yRFBBNUk5TS9vZytISStKNE9wCk16SnVqejUxam9UaGRscVRBakRac0VxOGhqYnpGR3JoSmszQTROR1hoaGxLTzZHY1RwVVlRNmUxR0UyNTN3RFAKL0FlSnhmTzBQcFloS2pubXJPUk83SzdsdVE2THBpcGRVY3ZZbjd4NjNVQi9HUkVqenJIc21GS2tFMVV2T2FQZApLT1dhRGFlNGlaNmFCK1o0S0JFZUgyenRkeTR2S3BNOVFDZHdmRGRYT09qd0pnQmw0RDIrS1hyRmZMMGhCMnhmCmpoOFl4anFQeHB1aW0zdHNvbWx1eDRSZlVDaGJvbkgyaEFpd3FIUE12eWExZzk0dWdwM0VsSzVEQ2hoMkNCOFoKT0ovVE4wVnBLM0l0Nk5NVkt3NUZMQWJVa2M5NkhydVI2V0lER2JtaW1GQjJ0TGYwVGdWMmhWaTRENVNzTmF5SwpLZlNhYzllY29CZ1RlN2l4M1FJVEtTZ2F3cERBaWJDT0lPSi9RVTRHQUVmK2N2dVFiYklYU0RkY3VjYUNDZEYrCjV3MUo3YXNydUVINmttRUQvRTdFY3hLY21rTFBUQjBZL0MybXlMQzExWkhYQ0ZrdDM5Qjk1ZGJLSHBzQ0F3RUEKQVFLQ0FnQXZjVGx3ZGVWRWdlenYxaUkzeGMxSUtBSHVEeEFjK2FHV3JkTUxnYTVxS2YzODAxaXhUWmpIWnlPbAppMi9MbjkzQWpramhhSm1PbjNtKy9zQkNaMmdyR2ZvWFJSaGVjVlRPTmNTRzhmZTN6YXUyR0xXVHJ6YjFhU3NVCnhqaHgrOXRiMHlDckQ0QXE2V01nb1dsakt4S2tIVkk4NFoxVm5oMy95MjhtT25qZEIvaDNjTEU0dmtxM1NRUDEKQ20xbTg0UGF0anBpelhSQUtMV1J4aWl5RDlkWTJnS202UjJINk1sVEk2RU0va3hTcEJWQURodURvbmtOQkJOQwpBZXVoVElYUnh5b3FXZVcrelpBQStvcFZmSnU2bDlCS2NFdG9rYXFNRElCUURUZkN0NVdPVWFMWEsxM1IvM2hhCkczT3hTYUQrRUVNakVXK0ZLSmVsWnJ3OU4yWmptaFhVNFRWdXJENVNYTXFOS2l4NVFqdnljRFRNVmtlUjZIdFkKT01zU2dWYXhHK25oNTRpWlphYzhESzhCakFpRUI1dFhNT1VuUldWTUNRdWYwc0JwNUI1MGYyV25pS2N3eGRlMgpKbzJrNktuSlRUK2xUYmRXV1pRalR4bXhGSUh6YkFKVnMyMlVqOXlxRmtyckt3VEtZR1VRZmFjbTBxUGJxVkFVCjFMUFBmcll4dlRlWXExUyt6UzF4alpuOXFRMk8rMGFSOUJweElIaWJlbFNUc2Z2a2x6bFM2TnlpZGdOVlpnL20KNHVyRFJkVkkzN0J1dWZjUVJlanN2L1JoR3cwZ3RvSmJKcEc2M245WEZybHBxMUgxTDFiUjV0UlUxQk5INS9tbAo4bHBsRzBJNDJGUEhodGF2dzR5T1RnMnFWdU50OTdSMC9XUE9CQ3dEU3c5TktjUkg5UUtDQVFFQTJJZ2NuOXRyClJJQjlJMlRKaUJWRStkUmJLbkhnaXJGd1hRaWZyVmh0eHZiRDlEOU94VGI2b3doNVk5SjNIMmZFcUIrQzI0QngKWThueUtTZ25mZkNtTjdEbVBpNnNPZi9mMzRJMEtEYW5RWG9qeVAyb1NlUDhDbE9XdXpzcFpsczIrdGY0RzhlUAp3U25CejNXUGFINEdLcUxxY2xVK3Rxb3AvKzZWQ3BYRktRTmRZdTl1SkZwUTYrSmJMOC9WYXFPMWdnMlFiMGJECmRhZjVEOEpTY1p3ak9EcXVFMTZDWS9Tdkc5YjRObGJnSGg1SWFlNnhrRUsrdDd4NlJEdUMwZmdIdFlRV1VFRkcKR29sSkZHeUNTMlY3WjRFc09ycGcxY2UyV2x4dWYxaCswV2ZUaFlNd0l5ejE1RnFiRm1QQ0Y4VjllQzk3b0pqVgo5VHg3dlFIMVFGOGVGd0tDQVFFQXlsTncwNDZ4YXdqTmVQV2RRT2hVYzVaZ2lHaG9XSmxoeERadVoxQ2VQUnMrCmVCQWtDdmNLMHZYcVptNlg3UkpES0ZiR3JzczZFeGY1b1REbmpsRlM3bWZ4QlpTYmpUdmhUY2U0S3J1TS93K2cKZW0xTHROeDYvSlRJRGtabTNtWitXRFRtVEdIVFVhWlhkNTR1T2hpcC9PVWxabnp3c1F6V3ViRkJoVVE2aWliOQpKNmY1ZGFiMEFadmFsVDJETno5OWtXU2tNZm5CUFlvVlcyRCt3TzRiaUtyS2RobGVLTS9TZ2h3Nk9mWVF3M09pCmdIZGxuWVp4VzZwakh4Qk03U3BQUjEvYStnZkRaeGduNTdLV2RJalJWZ1ZPeEhBcm5EN3hMVzlwWVFLempDQUQKM0p6L29aZFRkWUtYK3FkdzV6SHRmMFF1TWE1T3kveEd0QzBHR0hHNkhRS0NBUUJZK0JSSzJxMUlpRUxpdUJiVwpnMmJFQUMwMVUzVWZoNmpUa1NlSzRqcTQ5Y3V1SUJVTmszbUlZNEw5TVEwaEtsSHpnbjhTRWNTRmJBVEVSR3QxCm85dW9KbGQwVlZrT3U4UVE0ajdzQndqU0xvMWxtRlA5aUYrWEhxRmdiUDZsdi9UblBMWUZOQW90SkNzdVF1K1oKejY1WTluZStZcWhTQmJrY0g3dTlqYXhsSGF6UmFlK25vRFIvdDVJZ0l4VmRxOFo0bVhvdlByUXhNOE55WmpYWgoySDNnTEx3NTJTdGFScjlzZ1BlYjNEWmFLYmMzVDR4RjZpYlM5KzZFK3E3VjkwT3pvWUpKbDRobWZ1STRNaDJYClBTdG5hL3Z3WllSRVVycnFoZkFoQXd1WW4wQ2FLejBzTnQwUjV1aXlXbXIxdVgvRVVqNUp6b0tiTVM3bWlsZHIKQzZvaEFvSUJBQnBqcjcrb1NQUFEvaHZjelZuOTg2WHY0ejluZnRTdmpOVHUxSStkTUVhQUd6SEZ5UzIwOHpCNAo2czNaZHU5eEJsbG9tQm1NWUZMRk9jWVFmdU5OTUNmd1hydC9tcHBkU1JIQUR3RmozUXdYbWJMZU5wV3NmRTRkCmljcHkzRS85eGxUeThXYmRDNWNHdnpuVzQraW45dVFKYjB0aTJISC9Yckp4c0Q0Vm5CMFE0TXdmV0taRDFHZXgKVUYxTzNLS0VJWGlwUzlGSTVpK0VweXg0QmtKYnpET1RNejBjS2UvZ3kzQTFCbE14Q1JhMUttamZLZDNWLzBzWgplancvQUFtZkR5QWNISStvRzVDQzBoR2lkWVZWb3hnNU1RRG1NSW44bTdCMWE2VS9tUE9aNldjSkF6NnNZakpkCmlqMGpRZEtsN0hoQkNGVnFpdFNJWHlCNUR1WjVUdkVDZ2dFQU9CVHpHelJHdGVzM1YvenFEaXNiSE04ZXdMMFMKaElqNnJ3ajlIRktmS04wY0E3QUR1UXBLbHFPcU8xZFJvSmZlYm1SWHpUeWxjQ1U2Y3RKQW1PWFF5V1U0dEhOaQpiNWpJRnlFaWRybVY5Z0d5VitIeFJicmQ2bGoyczl2MlEzNkJJbkJCYUxzR2cxeHN0OWU1ZzlyTndTY1RCZ25rCmthV1ZqMGdQcnY1VnNCUVF1Y2ZhMUVhVVhjZUpvY3BEcXcvS0hJbkxkYkNVN3dBKzZMRWZYZXZMbVpEdGluSkMKRWdZdUQrRWpOYUNrWDI4VTErVnk3NS81bXpBT1lCcFV4UVRQQ1NSb1NlLzBXWWJlelBDRjYycXBxZGhvdEZwVAo0U0RIQVZkemVBSXlOSFhUQXozeGMxcnRiUU03VGVWUXE1N3Y2cnkyWkIvZ1pqNUdwUHRvN1NmRzJRPT0KLS0tLS1FTkQgUlNBIFBSSVZBVEUgS0VZLS0tLS0K
-    apiServer:
-        image: registry.k8s.io/kube-apiserver:v1.35.3
-        admissionControl:
-            - name: PodSecurity
-              configuration:
-                apiVersion: pod-security.admission.config.k8s.io/v1alpha1
-                defaults:
-                    audit: restricted
-                    audit-version: latest
-                    enforce: baseline
-                    enforce-version: latest
-                    warn: restricted
-                    warn-version: latest
-                exemptions:
-                    namespaces:
-                        - kube-system
-                    runtimeClasses: []
-                    usernames: []
-                kind: PodSecurityConfiguration
-        auditPolicy:
-            apiVersion: audit.k8s.io/v1
-            kind: Policy
-            rules:
-                - level: Metadata
-    controllerManager:
-        image: registry.k8s.io/kube-controller-manager:v1.35.3
-    proxy:
-        disabled: true
-        image: registry.k8s.io/kube-proxy:v1.35.3
-    scheduler:
-        image: registry.k8s.io/kube-scheduler:v1.35.3
-    discovery:
-        enabled: true
-        registries:
-            kubernetes:
-                disabled: true
-            service: {}
-    etcd:
-        ca:
-            crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJmakNDQVNTZ0F3SUJBZ0lSQU02WFZ6VTd6YlU5QjlqcTJZOU5IRzh3Q2dZSUtvWkl6ajBFQXdJd0R6RU4KTUFzR0ExVUVDaE1FWlhSalpEQWVGdzB5TlRFeE1Ea3dNak01TWpCYUZ3MHpOVEV4TURjd01qTTVNakJhTUE4eApEVEFMQmdOVkJBb1RCR1YwWTJRd1dUQVRCZ2NxaGtqT1BRSUJCZ2dxaGtqT1BRTUJCd05DQUFRcUhzRllaNFA4CmNybTVzaFZEaWNvWWFweXJneGFsaWppcUJubWVMazVlOVM4RnVYMGFac2dwQXdpMkIwWUNNVndQM25SK3d3YVkKVVRtWGpOSDBhcXp2bzJFd1h6QU9CZ05WSFE4QkFmOEVCQU1DQW9Rd0hRWURWUjBsQkJZd0ZBWUlLd1lCQlFVSApBd0VHQ0NzR0FRVUZCd01DTUE4R0ExVWRFd0VCL3dRRk1BTUJBZjh3SFFZRFZSME9CQllFRkxYMkJXSVdKU3diCk9zRW1JR21MTGI4aGp0VXhNQW9HQ0NxR1NNNDlCQU1DQTBnQU1FVUNJRnBCbGdXUHB6Tkg0UkkrYTBrMEczcWIKSE42Z1pFSU5PZkhnWXV2MHNIYy9BaUVBc3p0eTd4ckdLVVYrOXF6bEpNRXBsWi9jVTJ4NFpQbVUzMmdraUQyagpDc1U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-            key: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUg1L2VmL0d0T1lKN2FuVWUzZnBQRW9ta21oRlJpOWM4eGtLN3ZTTGJPZy9vQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFS2g3QldHZUQvSEs1dWJJVlE0bktHR3FjcTRNV3BZbzRxZ1o1bmk1T1h2VXZCYmw5R21iSQpLUU1JdGdkR0FqRmNEOTUwZnNNR21GRTVsNHpSOUdxczd3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
-    extraManifests:
-        - https://raw.githubusercontent.com/alex1989hu/kubelet-serving-cert-approver/main/deploy/standalone-install.yaml
-        - https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
-        - https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.1/standard-install.yaml
-    inlineManifests:
-        - name: sops-key
-          contents: |-
-            apiVersion: v1
-            kind: Namespace
-            metadata:
-              name: flux-system
-            ---
-            apiVersion: v1
-            kind: Secret
-            metadata:
-              name: sops-gpg
-              namespace: flux-system
-            stringData:
-              age.agekey: |
-                # created: 2025-12-01T02:18:04+01:00
-                # public key: age1hktythzvsnth6u5en2lvag0tftnj9r03w7rpnzfgzgf5w95qxycq2azufj
-                AGE-SECRET-KEY-1ES2W2EQY2MXKF04QSNMWHERKFX0Y27CDMCWFX47Z3PV6H37R735SV8UDSZ
-        - name: cluster-variables
-          contents: |-
-            ---
-            apiVersion: v1
-            kind: Namespace
-            metadata:
-              name: flux-system
-            ---
-            apiVersion: v1
-            kind: ConfigMap
-            metadata:
-              name: cluster-variables
-              namespace: flux-system
-            data:
-              cluster_env: production
-    allowSchedulingOnControlPlanes: true
----
-apiVersion: v1alpha1
-kind: HostnameConfig
-auto: "off"
-hostname: helios
----
-apiVersion: v1alpha1
-kind: LinkConfig
-name: enp2s0
-up: true
-mtu: 9000
-addresses:
-    - address: 10.0.0.202/22
-routes:
-    - gateway: 10.0.0.1
----
-apiVersion: v1alpha1
-kind: TimeSyncConfig
-ntp:
-    servers:
-        - nl.pool.ntp.org
----
-apiVersion: v1alpha1
-kind: ResolverConfig
-nameservers:
-    - address: 1.1.1.1
-    - address: 8.8.8.8
----
-apiVersion: v1alpha1
-kind: Layer2VIPConfig
-name: 10.0.2.1
-link: enp2s0
----
-apiVersion: v1alpha1
-kind: ExtensionServiceConfig
-name: tailscale
-environment:
-    - TS_AUTHKEY=hskey-auth-dn_t5EiIfKGe-GHafxPQRMudp4G_ygs4Rmc5a6TSzdxV4HzKklwOEy-gOiIovOxHfoFlrTt0cpiWp
-    - TS_EXTRA_ARGS=--login-server https://headscale.huizinga.dev
-    - TS_ROUTES=
----
-apiVersion: v1alpha1
-kind: UserVolumeConfig
-name: longhorn
-provisioning:
-    diskSelector:
-        match: system_disk
-    grow: true
-    maxSize: 2000GB
----
-apiVersion: v1alpha1
-kind: UserVolumeConfig
-name: local-path-provisioner
-volumeType: directory
----
-apiVersion: v1alpha1
-kind: VolumeConfig
-name: EPHEMERAL
-provisioning:
-    maxSize: 30GB

src/cluster.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use std::net::Ipv4Addr;
 use std::path::PathBuf;
 use std::process::Command;
@@ -74,7 +73,7 @@ struct ClusterDeserialize {
 pub struct Cluster {
     pub(crate) name: String,
     pub(crate) version: Version,
-    nodes: HashMap<String, Node>,
+    nodes: Vec<Node>,
     cluster_env: ClusterEnv,
     pub(crate) control_plane_ip: Ipv4Addr,
     pub(crate) secrets_file: PathBuf,
@@ -115,24 +114,21 @@ impl Cluster {
         let cluster = Self {
             name: cluster_name.into(),
             version: cluster.version,
-            nodes: HashMap::new(),
+            nodes: vec![],
             cluster_env: cluster.cluster_env,
             control_plane_ip: cluster.control_plane_ip,
             secrets_file,
         };
 
         let nodes = nodes
-            .into_iter()
+            .iter()
-            .map(|name| {
+            .map(|name| Node::get(name, env, &cluster, &default, &base))
-                let node = Node::get(&name, env, &cluster, &default, &base);
-                (node.hostname().into(), node)
-            })
             .collect();
 
         Self { nodes, ..cluster }
     }
 
-    pub fn get_all() -> HashMap<String, Cluster> {
+    pub fn get_all() -> Vec<Cluster> {
         let env = PathEnvironment::new_patches();
 
         WalkDir::new(get_talos_path().join("clusters"))
@@ -149,19 +145,13 @@ impl Cluster {
                     return None;
                 }
 
-                let cluster = Cluster::get(&name, &env);
+                Some(Cluster::get(&name, &env))
-
-                Some((name, cluster))
             })
             .collect()
     }
 
-    pub fn nodes(&self) -> impl Iterator<Item = &Node> {
+    pub fn nodes(&self) -> &[Node] {
-        self.nodes.values()
+        &self.nodes
-    }
-
-    pub fn node(&self, name: &str) -> Option<&Node> {
-        self.nodes.get(name)
     }
 
     pub fn talosctl_gen_config_command(&self) -> Command {

src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(impl_trait_in_assoc_type, path_absolute_method, never_type)]
+#![feature(impl_trait_in_assoc_type, path_absolute_method)]
 use std::path::{Path, PathBuf};
 use std::sync::OnceLock;
 

src/main.rs

@@ -9,7 +9,6 @@ use crete::environment::PathEnvironment;
 use crete::tftp::ServerError;
 use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
 use minijinja::context;
-use regex::Regex;
 use thiserror::Error;
 
 use crate::cli::{Cli, Commands, GlobalOpts};
@@ -22,11 +21,8 @@ enum Error {
     Server(#[from] ServerError),
 }
 
-async fn run_command(mut command: Command) {
+fn run_command(mut command: Command) {
-    let output = tokio::task::spawn_blocking(move || command.output().unwrap())
+    let output = command.output().unwrap();
-        .await
-        .unwrap();
-
     if !output.stdout.is_empty() {
         println!("{}", String::from_utf8_lossy(&output.stdout).trim_end());
     }
@@ -35,7 +31,7 @@ async fn run_command(mut command: Command) {
     }
 }
 
-async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
+fn generate(opts: &GlobalOpts) -> Result<(), Error> {
     set_repo_path(&opts.repo);
 
     let clusters = Cluster::get_all();
@@ -57,7 +53,7 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
 
         let content = template
             .render(context! {
-                clusters => clusters.values().collect::<Vec<_>>(),
+                clusters,
                 root => opts.repo
             })
             .unwrap();
@@ -73,19 +69,14 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
     std::fs::create_dir(&path).unwrap();
 
     // Generate config files
-    for cluster in clusters.values() {
+    for cluster in clusters {
         for node in cluster.nodes() {
-            let config = node.talosctl_gen_config(cluster).await;
+            run_command(node.talosctl_gen_config_command(&cluster));
-            let path = node.config_path(cluster);
-            std::fs::create_dir_all(path.parent().expect("Config should have parent directory"))
-                .unwrap();
-
-            std::fs::write(path, config).unwrap();
         }
 
-        run_command(cluster.talosctl_gen_config_command()).await;
+        run_command(cluster.talosctl_gen_config_command());
-        run_command(cluster.talosctl_add_endpoint_command()).await;
+        run_command(cluster.talosctl_add_endpoint_command());
-        run_command(cluster.talosctl_merge_command()).await;
+        run_command(cluster.talosctl_merge_command());
     }
 
     Ok(())
@@ -96,7 +87,7 @@ async fn main() -> Result<(), Error> {
     let cli = Cli::parse();
 
     match cli.command {
-        Commands::Generate => generate(&cli.global_opts).await.unwrap(),
+        Commands::Generate => generate(&cli.global_opts)?,
         Commands::ShellCompletions => generate_complete(
             Shell::from_env().unwrap_or(Shell::Bash),
             &mut Cli::command(),
@@ -104,36 +95,12 @@ async fn main() -> Result<(), Error> {
             &mut std::io::stdout(),
         ),
         Commands::Serve => {
-            set_repo_path(&cli.global_opts.repo);
+            tftp::serve(|filename| match filename {
-
-            tftp::serve(|filename| {
-                let filename = filename.to_owned();
-
-                async move {
-                    let re = Regex::new(r"talos/(?<cluster>.+)/(?<node>.+)\.ya?ml")
-                        .expect("Regex should be valid");
-
-                    if let Some(caps) = re.captures(&filename) {
-                        let cluster = &caps["cluster"];
-                        let node = &caps["node"];
-
-                        let clusters = Cluster::get_all();
-                        let cluster = clusters.get(cluster)?;
-                        let node = cluster.node(node)?;
-
-                        let config = node.talosctl_gen_config(cluster).await;
-
-                        Some(config.into())
-                    } else {
-                        match filename.as_str() {
                 "ipxe.pxe" => Some(include_bytes!("../bin/ipxe.pxe").into()),
                 "test" => Some(vec![1, 2, 3, 4]),
                 _ => None,
-                        }
-                    }
-                }
             })
-            .await?;
+            .await?
         }
     };
 

src/node.rs

@@ -1,11 +1,10 @@
 use std::net::Ipv4Addr;
-use std::path::PathBuf;
+use std::process::Command;
 
 use minijinja::Environment;
 use optional_struct::{Applicable, optional_struct};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use tokio::process::Command;
 
 use crate::cluster::{Base, Cluster};
 use crate::patch::{OptionalPatches, OptionalPatchesString, Patches};
@@ -13,17 +12,6 @@ use crate::schematic::Schematic;
 use crate::secret::Secret;
 use crate::{get_configs_path, get_talos_path};
 
-async fn get_output(mut command: Command) -> String {
-    let output = command.output().await.unwrap();
-    if !output.stderr.is_empty() {
-        println!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
-    }
-
-    String::from_utf8_lossy(&output.stdout)
-        .trim_end()
-        .to_owned()
-}
-
 #[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 enum NodeType {
@@ -189,11 +177,10 @@ impl Node {
         Node { patches, ..node }
     }
 
-    pub fn hostname(&self) -> &str {
+    pub fn talosctl_gen_config_command(&self, cluster: &Cluster) -> Command {
-        &self.hostname
+        let mut path = get_configs_path().join(&cluster.name).join(&self.hostname);
-    }
+        path.add_extension("yaml");
 
-    pub async fn talosctl_gen_config(&self, cluster: &Cluster) -> String {
         let mut command = Command::new("talosctl");
         command.args([
             "gen",
@@ -217,7 +204,7 @@ impl Node {
             "--with-docs=false",
             "--with-examples=false",
             "-o",
-            "-", // path.to_str().expect("Path should be valid utf-8"),
+            path.to_str().expect("Path should be valid utf-8"),
         ]);
 
         for patch in &self.patches.all {
@@ -231,14 +218,7 @@ impl Node {
             ]);
         }
 
-        get_output(command).await
+        command
-    }
-
-    pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
-        let mut path = get_configs_path().join(&cluster.name).join(&self.hostname);
-        path.add_extension("yaml");
-
-        path
     }
 }
 

src/schematic.rs

@@ -1,6 +1,5 @@
 use schemars::JsonSchema;
 use serde::{Deserialize, Deserializer, Serialize};
-use tokio::runtime::Handle;
 
 use crate::get_talos_path;
 
@@ -12,7 +11,7 @@ where
     let path = get_talos_path().join("schematics").join(name);
     let content = std::fs::read_to_string(path).unwrap().trim().to_owned();
 
-    let client = reqwest::ClientBuilder::new()
+    let client = reqwest::blocking::ClientBuilder::new()
         .user_agent(format!(
             "{}/{}",
             std::env!("CARGO_PKG_NAME"),
@@ -21,15 +20,10 @@ where
         .build()
         .unwrap();
 
-    let res = tokio::task::block_in_place(|| {
+    let res = client
-        Handle::current().block_on(async {
-            client
         .post("https://factory.talos.dev/schematics")
         .body(content)
         .send()
-                .await
-        })
-    })
         .map_err(serde::de::Error::custom)?;
 
     #[derive(Debug, Deserialize)]
@@ -37,12 +31,9 @@ where
         id: String,
     }
 
-    let text =
+    let response: Response = serde_json::from_str(&res.text().map_err(serde::de::Error::custom)?)
-        tokio::task::block_in_place(|| Handle::current().block_on(async { res.text().await }))
         .map_err(serde::de::Error::custom)?;
 
-    let response: Response = serde_json::from_str(&text).map_err(serde::de::Error::custom)?;
-
     Ok(response.id)
 }
 

src/tftp/server.rs

@@ -28,15 +28,11 @@ pub enum Error {
     Timeout,
 }
 
-pub async fn handle_connection<F, Fut>(
+pub async fn handle_connection(
     src: SocketAddr,
     packet: Packet,
-    callback: F,
+    callback: impl (Fn(&str) -> Option<Vec<u8>>) + Send + Clone + 'static,
-) -> Result<(), Error>
+) -> Result<(), Error> {
-where
-    F: Fn(&str) -> Fut,
-    Fut: Future<Output = Option<Vec<u8>>>,
-{
     let socket = UdpSocket::bind("127.0.0.1:0").await?;
     println!(
         "{src}: Connecting from {}",
@@ -54,7 +50,7 @@ where
     let filename = request.filename();
     println!("{src}: {filename} [{:?}]", request.mode());
 
-    let Some(data) = callback(filename).await else {
+    let Some(data) = callback(filename) else {
         Packet::error(ErrorCode::FileNotFound, "Unknown file")
             .send_to(&socket, &src)
             .await?;
@@ -145,11 +141,9 @@ where
     Ok(())
 }
 
-pub async fn serve<F, Fut>(callback: F) -> Result<!, Error>
+pub async fn serve(
-where
+    callback: impl (Fn(&str) -> Option<Vec<u8>>) + Send + Clone + 'static,
-    F: (Fn(&str) -> Fut) + Clone + Send + 'static,
+) -> Result<(), Error> {
-    Fut: Future<Output = Option<Vec<u8>>> + Send + 'static,
-{
     let socket = UdpSocket::bind("127.0.0.1:69").await?;
 
     println!("Server started");