Author SHA1 Message Date
Dreaded_X 5601b2ff99 feat: Added wrapper crate for including ipxe binaries
Audit / cargo audit (push) Failing after 3m4s
Committed / committed (pull_request) Failing after 20s
CI / cargo shear (pull_request) Successful in 4m30s
CI / prek (pull_request) Failing after 5m56s
2026-10-04 02:59:08 +02:00
Dreaded_X cf8dd0f24d feat: Serve never returns 2026-10-03 21:41:21 +02:00
Dreaded_X 50c1b35de1 feat!: Added command to serve config files over tftp
This is a breaking change as the return type of cluster.nodes has
changed, resulting in old templates potentially no longer working.
2026-10-03 21:41:14 +02:00
Dreaded_X ffeb39923e feat: Make tftp serve callback async 2026-10-01 03:20:09 +02:00
Dreaded_X d3c5120d85 refactor: Deduplicate paths 2026-10-01 03:03:27 +02:00
Dreaded_X 7bdb294699 feat: Retain context 2026-10-01 02:55:51 +02:00
Dreaded_X 1f268116de feat: Configs are captured in a string first 2026-10-01 02:21:39 +02:00
Dreaded_X f03c06fdf2 feat: Improve concurrency 2026-09-25 06:52:13 +02:00
Dreaded_X 27f6557197 feat: Make application async 2026-09-25 05:39:55 +02:00
21 changed files with 556 additions and 422 deletions
+3
View File
@@ -0,0 +1,3 @@
[submodule "ipxe/ipxe"]
path = ipxe/ipxe
url = https://github.com/rkubes/gnu-stack-fix
Generated
+192 -31
View File
@@ -61,6 +61,57 @@ dependencies = [
"windows-sys", "windows-sys",
] ]
[[package]]
name = "async-channel"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
dependencies = [
"concurrent-queue",
"event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-fs"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
dependencies = [
"async-lock",
"blocking",
"futures-lite",
]
[[package]]
name = "async-lock"
version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
dependencies = [
"event-listener",
"event-listener-strategy",
"pin-project-lite",
]
[[package]]
name = "async-task"
version = "4.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-walkdir"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37672978ae0febce7516ae0a85b53e6185159a9a28787391eb63fc44ec36037d"
dependencies = [
"async-fs",
"futures-lite",
"thiserror",
]
[[package]] [[package]]
name = "atomic-waker" name = "atomic-waker"
version = "1.1.2" version = "1.1.2"
@@ -94,6 +145,19 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "blocking"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a70e4329df6cb94385eed412ec92375c3cdd8a6e502493d1229b6414e4036dfa"
dependencies = [
"async-channel",
"async-task",
"futures-io",
"futures-lite",
"piper",
]
[[package]] [[package]]
name = "bstr" name = "bstr"
version = "1.13.1" version = "1.13.1"
@@ -105,6 +169,12 @@ dependencies = [
"serde_core", "serde_core",
] ]
[[package]]
name = "build-print"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8e6738dfb11354886f890621b4a34c0b177f75538023f7100b608ab9adbd66b"
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.20.3" version = "3.20.3"
@@ -196,6 +266,15 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
[[package]]
name = "concurrent-queue"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils",
]
[[package]] [[package]]
name = "core-foundation" name = "core-foundation"
version = "0.10.1" version = "0.10.1"
@@ -225,10 +304,13 @@ dependencies = [
name = "crete" name = "crete"
version = "0.1.3" version = "0.1.3"
dependencies = [ dependencies = [
"async-walkdir",
"byteorder", "byteorder",
"clap", "clap",
"clap_complete", "clap_complete",
"futures",
"gix-discover", "gix-discover",
"ipxe",
"minijinja", "minijinja",
"netascii", "netascii",
"num_enum", "num_enum",
@@ -242,9 +324,14 @@ dependencies = [
"serde_yaml", "serde_yaml",
"thiserror", "thiserror",
"tokio", "tokio",
"walkdir",
] ]
[[package]]
name = "crossbeam-utils"
version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
[[package]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.7" version = "0.1.7"
@@ -335,6 +422,26 @@ dependencies = [
"windows-sys", "windows-sys",
] ]
[[package]]
name = "event-listener"
version = "5.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2"
dependencies = [
"parking",
"pin-project-lite",
]
[[package]]
name = "event-listener-strategy"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
dependencies = [
"event-listener",
"pin-project-lite",
]
[[package]] [[package]]
name = "faster-hex" name = "faster-hex"
version = "0.10.0" version = "0.10.0"
@@ -381,6 +488,21 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "futures"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.34" version = "0.3.34"
@@ -397,12 +519,36 @@ version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
[[package]]
name = "futures-executor"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.34" version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
[[package]]
name = "futures-lite"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
dependencies = [
"fastrand",
"futures-core",
"futures-io",
"parking",
"pin-project-lite",
]
[[package]] [[package]]
name = "futures-macro" name = "futures-macro"
version = "0.3.34" version = "0.3.34"
@@ -432,6 +578,7 @@ version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
dependencies = [ dependencies = [
"futures-channel",
"futures-core", "futures-core",
"futures-io", "futures-io",
"futures-macro", "futures-macro",
@@ -905,6 +1052,25 @@ dependencies = [
"icu_properties", "icu_properties",
] ]
[[package]]
name = "include_dir"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
dependencies = [
"include_dir_macros",
]
[[package]]
name = "include_dir_macros"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
dependencies = [
"proc-macro2",
"quote",
]
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.14.0" version = "2.14.0"
@@ -921,6 +1087,14 @@ version = "2.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a756c3fac73139e83f14c2d742155dd2b78d3ee56597b419a0579b7bdd6dd78" checksum = "6a756c3fac73139e83f14c2d742155dd2b78d3ee56597b419a0579b7bdd6dd78"
[[package]]
name = "ipxe"
version = "0.1.0"
dependencies = [
"build-print",
"include_dir",
]
[[package]] [[package]]
name = "is_terminal_polyfill" name = "is_terminal_polyfill"
version = "1.70.2" version = "1.70.2"
@@ -1228,6 +1402,12 @@ dependencies = [
"syn 2.0.119", "syn 2.0.119",
] ]
[[package]]
name = "parking"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.12.5" version = "0.12.5"
@@ -1263,6 +1443,17 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
[[package]]
name = "piper"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
dependencies = [
"atomic-waker",
"fastrand",
"futures-io",
]
[[package]] [[package]]
name = "pkg-config" name = "pkg-config"
version = "0.3.34" version = "0.3.34"
@@ -1430,9 +1621,7 @@ checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
dependencies = [ dependencies = [
"base64", "base64",
"bytes", "bytes",
"futures-channel",
"futures-core", "futures-core",
"futures-util",
"http", "http",
"http-body", "http-body",
"http-body-util", "http-body-util",
@@ -1448,14 +1637,12 @@ dependencies = [
"sync_wrapper", "sync_wrapper",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
"tokio-util",
"tower", "tower",
"tower-http", "tower-http",
"tower-service", "tower-service",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
"wasm-bindgen-futures", "wasm-bindgen-futures",
"wasm-streams",
"web-sys", "web-sys",
] ]
@@ -1852,19 +2039,6 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "tokio-util"
version = "0.7.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "toml_datetime" name = "toml_datetime"
version = "1.1.1+spec-1.1.0" version = "1.1.1+spec-1.1.0"
@@ -2108,19 +2282,6 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "wasm-streams"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
dependencies = [
"futures-util",
"js-sys",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
]
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.104" version = "0.3.104"
+4 -4
View File
@@ -7,16 +7,18 @@ publish = ["infra"]
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
[workspace] [workspace]
members = ["xtask"] members = ["ipxe", "xtask"]
[workspace.dependencies] [workspace.dependencies]
schemars = { version = "1.2.1", features = ["semver1"] } schemars = { version = "1.2.1", features = ["semver1"] }
serde_json = "1.0.149" serde_json = "1.0.149"
[dependencies] [dependencies]
async-walkdir = "2.1.0"
byteorder = "1.5.0" byteorder = "1.5.0"
clap = { version = "4.6.0", features = ["derive"] } clap = { version = "4.6.0", features = ["derive"] }
clap_complete = "4.6.0" clap_complete = "4.6.0"
futures = "0.3.34"
gix-discover = { version = "0.55.0", features = ["sha1"] } gix-discover = { version = "0.55.0", features = ["sha1"] }
minijinja = { version = "2.18.0", features = ["json", "loader"] } minijinja = { version = "2.18.0", features = ["json", "loader"] }
netascii = "0.1.0" netascii = "0.1.0"
@@ -24,8 +26,6 @@ num_enum = "0.7.6"
optional_struct = "0.5.2" optional_struct = "0.5.2"
regex = "1.13.1" regex = "1.13.1"
reqwest = { version = "0.13.2", default-features = false, features = [ reqwest = { version = "0.13.2", default-features = false, features = [
"blocking",
"stream",
"native-tls", "native-tls",
] } ] }
schemars = { workspace = true } schemars = { workspace = true }
@@ -35,7 +35,7 @@ serde_json = { workspace = true }
serde_yaml = "0.9.34" serde_yaml = "0.9.34"
thiserror = "2.0.18" thiserror = "2.0.18"
tokio = { version = "1.52.1", features = ["full"] } tokio = { version = "1.52.1", features = ["full"] }
walkdir = "2.5.0" ipxe = { path = "./ipxe" }
[lib] [lib]
test = false test = false
BIN
View File
Binary file not shown.
-210
View File
@@ -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
+10
View File
@@ -0,0 +1,10 @@
[package]
name = "ipxe"
version = "0.1.0"
edition = "2024"
[build-dependencies]
build-print = "1.0.1"
[dependencies]
include_dir = "0.7.4"
+57
View File
@@ -0,0 +1,57 @@
use std::env;
use std::path::PathBuf;
use std::process::{Command, Stdio};
use build_print::error;
fn main() {
let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
.canonicalize()
.unwrap();
let src_dir = manifest_dir.join("ipxe").join("src");
let mut command = Command::new("make");
command
.stdout(Stdio::piped())
.current_dir(&src_dir)
.env_remove("DEBUG")
.env_remove("PROFILE")
.args([
"-j",
&std::thread::available_parallelism()
.unwrap()
.get()
.to_string(),
])
.arg(format!(
"EMBED={}",
manifest_dir
.join("src")
.join("embed.ipxe")
.to_string_lossy(),
));
let files = ["bin/ipxe.pxe", "bin-x86_64-efi/ipxe.efi"].map(PathBuf::from);
for file in &files {
command.arg(file);
}
let output = command.output().unwrap();
if !output.status.success() {
error!("{}", String::from_utf8_lossy(&output.stderr));
}
let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap())
.canonicalize()
.unwrap()
.join("ipxe");
std::fs::remove_dir_all(&out_dir).ok();
for file in &files {
let input = src_dir.join(file);
let output = out_dir.join(file.file_name().unwrap());
std::fs::create_dir_all(output.parent().unwrap()).unwrap();
std::fs::copy(input, output).unwrap();
}
}
Submodule
+1
Submodule ipxe/ipxe added at 8892af68a2
+5
View File
@@ -0,0 +1,5 @@
#!ipxe
dhcp
echo "Hello, World!"
+3
View File
@@ -0,0 +1,3 @@
use include_dir::{Dir, include_dir};
pub static IPXE_DIR: Dir<'_> = include_dir!("$OUT_DIR/ipxe");
+1 -1
View File
@@ -49,6 +49,6 @@ pub enum Commands {
Generate, Generate,
/// Generate completions for your current shell /// Generate completions for your current shell
ShellCompletions, ShellCompletions,
/// Test /// Serve config files over tftp
Serve, Serve,
} }
+79 -42
View File
@@ -1,19 +1,22 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command;
use std::str::FromStr; use std::str::FromStr;
use async_walkdir::WalkDir;
use futures::StreamExt;
use futures::stream::FuturesUnordered;
use minijinja::Environment; use minijinja::Environment;
use optional_struct::{Applicable, optional_struct}; use optional_struct::{Applicable, optional_struct};
use schemars::JsonSchema; use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use walkdir::WalkDir; use tokio::process::Command;
use crate::environment::PathEnvironment; use crate::environment::PathEnvironment;
use crate::node::{Node, OptionalNodeDeserialize}; use crate::node::{Node, OptionalNodeDeserialize};
use crate::patch::Patches; use crate::patch::Patches;
use crate::{get_configs_path, get_talos_path}; use crate::talosconfig::TalosConfig;
use crate::{get_configs_path, get_talos_path, run_command};
#[optional_struct] #[optional_struct]
#[derive(Debug, Deserialize, JsonSchema, Clone)] #[derive(Debug, Deserialize, JsonSchema, Clone)]
@@ -69,7 +72,7 @@ struct ClusterDeserialize {
base: Base, base: Base,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Cluster { pub struct Cluster {
pub(crate) name: String, pub(crate) name: String,
@@ -81,19 +84,23 @@ pub struct Cluster {
} }
impl Cluster { impl Cluster {
pub(crate) fn get(cluster_name: &str, env: &Environment) -> Self { pub(crate) async fn get(cluster_name: &str, env: &Environment<'static>) -> Self {
let path = get_talos_path().join("clusters").join("default.yaml"); let path = get_talos_path().join("clusters").join("default.yaml");
let default: OptionalClusterDeserialize = if path.exists() { let default: OptionalClusterDeserialize = if path.exists() {
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
serde_yaml::from_str(&content).unwrap()
// The deserialization makes a blocking web request
tokio::task::spawn_blocking(move || serde_yaml::from_str(&content).unwrap())
.await
.unwrap()
} else { } else {
Default::default() Default::default()
}; };
let mut path = get_talos_path().join("clusters").join(cluster_name); let mut path = get_talos_path().join("clusters").join(cluster_name);
path.add_extension("yaml"); path.add_extension("yaml");
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap(); let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
@@ -115,31 +122,32 @@ impl Cluster {
let cluster = Self { let cluster = Self {
name: cluster_name.into(), name: cluster_name.into(),
version: cluster.version, version: cluster.version,
nodes: HashMap::new(), nodes: Default::default(),
cluster_env: cluster.cluster_env, cluster_env: cluster.cluster_env,
control_plane_ip: cluster.control_plane_ip, control_plane_ip: cluster.control_plane_ip,
secrets_file, secrets_file,
}; };
let nodes = nodes let nodes = nodes.iter().map(|name| async {
.into_iter() let node = Node::get(name, env, &cluster, &default, &base).await;
.map(|name| { (node.hostname().to_owned(), node)
let node = Node::get(&name, env, &cluster, &default, &base); });
(node.hostname().into(), node)
}) let nodes = FuturesUnordered::from_iter(nodes).collect().await;
.collect();
Self { nodes, ..cluster } Self { nodes, ..cluster }
} }
pub fn get_all() -> HashMap<String, Cluster> { pub async fn get_all() -> HashMap<String, Cluster> {
let env = PathEnvironment::new_patches(); let env = PathEnvironment::new_patches();
WalkDir::new(get_talos_path().join("clusters")) let names: Vec<_> = WalkDir::new(get_talos_path().join("clusters"))
.into_iter() .filter_map(|e| async { e.ok() })
.filter_map(|e| e.ok()) .filter(|e| {
.filter(|e| e.metadata().unwrap().is_file()) let e = e.clone();
.filter_map(|e| { async move { e.metadata().await.unwrap().is_file() }
})
.filter_map(|e| async move {
let mut path = PathBuf::from_str(&e.file_name().to_string_lossy()).unwrap(); let mut path = PathBuf::from_str(&e.file_name().to_string_lossy()).unwrap();
path.set_extension(""); path.set_extension("");
@@ -149,24 +157,35 @@ impl Cluster {
return None; return None;
} }
let cluster = Cluster::get(&name, &env); Some(name)
Some((name, cluster))
}) })
.collect() .collect()
.await;
// Get the clusters concurrently
FuturesUnordered::from_iter(names.iter().map(|name| {
let env = env.clone();
let name = name.clone();
async move {
let cluster = Cluster::get(&name, &env).await;
(name, cluster)
}
}))
.collect()
.await
} }
pub fn nodes(&self) -> impl Iterator<Item = &Node> { pub fn nodes(&self) -> impl Iterator<Item = &Node> {
self.nodes.values() self.nodes.values()
} }
pub fn node(&self, name: &str) -> Option<&Node> { pub fn node(&self, node: &str) -> Option<&Node> {
self.nodes.get(name) self.nodes.get(node)
} }
pub fn talosctl_gen_config_command(&self) -> Command { pub async fn talosconfig(&self) -> String {
let path = get_configs_path().join(&self.name).join("talosconfig");
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"gen", "gen",
@@ -178,41 +197,59 @@ impl Cluster {
"--output-types", "--output-types",
"talosconfig", "talosconfig",
"-o", "-o",
path.to_str().expect("Path should be valid utf-8"), "-",
]); ]);
command run_command(command).await
} }
pub fn talosctl_add_endpoint_command(&self) -> Command { pub fn talosconfig_path(&self) -> PathBuf {
let path = get_configs_path().join(&self.name).join("talosconfig"); get_configs_path().join(&self.name).join("talosconfig")
}
async fn talosconfig_add_endpoint(&self) {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"config", "config",
"--talosconfig", "--talosconfig",
path.to_str().expect("Path should be valid utf-8"), self.talosconfig_path()
.to_str()
.expect("Path should be valid utf-8"),
"endpoint", "endpoint",
&self.control_plane_ip.to_string(), &self.control_plane_ip.to_string(),
]); ]);
command run_command(command).await;
} }
pub fn talosctl_merge_command(&self) -> Command { pub async fn talosconfig_write(&self) {
let cluster_path = get_configs_path().join(&self.name).join("talosconfig"); let config = self.talosconfig().await;
let path = get_configs_path().join("talosconfig");
let path = self.talosconfig_path();
tokio::fs::create_dir_all(path.parent().expect("talosconfig should have parent"))
.await
.unwrap();
tokio::fs::write(path, config).await.unwrap();
self.talosconfig_add_endpoint().await
}
pub async fn talosconfig_merge(&self) {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"config", "config",
"--talosconfig", "--talosconfig",
path.to_str().expect("Path should be valid utf-8"), TalosConfig::merged_path()
.to_str()
.expect("Path should be valid utf-8"),
"merge", "merge",
cluster_path.to_str().expect("Path should be valid utf-8"), self.talosconfig_path()
.to_str()
.expect("Path should be valid utf-8"),
]); ]);
command run_command(command).await;
} }
} }
+20 -23
View File
@@ -2,15 +2,17 @@ use std::net::Ipv4Addr;
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use async_walkdir::WalkDir;
use futures::{Stream, StreamExt};
use minijinja::value::ViaDeserialize; use minijinja::value::ViaDeserialize;
use minijinja::{AutoEscape, Environment, path_loader}; use minijinja::{AutoEscape, Environment, path_loader};
use walkdir::WalkDir;
use crate::{get_configs_path, get_talos_path}; use crate::{get_configs_path, get_talos_path};
/// Transparent wrapper around minijinja::Environment that loads templates from a path and /// Transparent wrapper around minijinja::Environment that loads templates from a path and
/// configures better defaults. It also implements IntoIter, making it possible to iterate over all /// configures better defaults. It also implements IntoIter, making it possible to iterate over all
/// the templates. /// the templates.
#[derive(Clone)]
pub struct PathEnvironment<'a> { pub struct PathEnvironment<'a> {
env: Environment<'a>, env: Environment<'a>,
path: PathBuf, path: PathBuf,
@@ -76,6 +78,23 @@ impl<'a> PathEnvironment<'a> {
pub(crate) fn new_patches() -> Self { pub(crate) fn new_patches() -> Self {
Self::new(&get_talos_path().join("patches")) Self::new(&get_talos_path().join("patches"))
} }
pub fn files(&self) -> impl Stream<Item = String> {
// Find all templates in path
WalkDir::new(&self.path)
.filter_map(|e| async { e.ok() })
.filter(|e| {
let e = e.clone();
async move { e.metadata().await.unwrap().is_file() }
})
.map(move |e| {
e.path()
.strip_prefix(&self.path)
.expect("All paths should have prefix")
.to_string_lossy()
.to_string()
})
}
} }
// Make PathEnvironment act like a normal Environment transparently // Make PathEnvironment act like a normal Environment transparently
@@ -86,25 +105,3 @@ impl<'a> Deref for PathEnvironment<'a> {
&self.env &self.env
} }
} }
// Iterate over all the files in the path
impl<'a, 'b> IntoIterator for &'b PathEnvironment<'a> {
type Item = String;
type IntoIter = impl Iterator<Item = Self::Item>;
fn into_iter(self) -> Self::IntoIter {
// Find all templates in path
WalkDir::new(&self.path)
.into_iter()
.filter_map(|e| e.ok())
.filter(|e| e.metadata().unwrap().is_file())
.map(|e| {
e.path()
.strip_prefix(&self.path)
.expect("All paths should have prefix")
.to_string_lossy()
.to_string()
})
}
}
+15 -1
View File
@@ -1,13 +1,16 @@
#![feature(impl_trait_in_assoc_type, path_absolute_method, never_type)] #![feature(path_absolute_method, never_type)]
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::OnceLock; use std::sync::OnceLock;
use tokio::process::Command;
pub mod cluster; pub mod cluster;
pub mod environment; pub mod environment;
pub mod node; pub mod node;
pub mod patch; pub mod patch;
pub mod schematic; pub mod schematic;
pub mod secret; pub mod secret;
pub mod talosconfig;
pub mod tftp; pub mod tftp;
pub(crate) static REPO_PATH: OnceLock<PathBuf> = OnceLock::new(); pub(crate) static REPO_PATH: OnceLock<PathBuf> = OnceLock::new();
@@ -29,3 +32,14 @@ pub fn get_talos_path() -> PathBuf {
pub fn get_configs_path() -> PathBuf { pub fn get_configs_path() -> PathBuf {
get_repo_path().join("configs") get_repo_path().join("configs")
} }
pub async fn run_command(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()
}
+60 -54
View File
@@ -1,13 +1,17 @@
mod cli; mod cli;
use std::process::Command; use std::pin::pin;
use clap::{CommandFactory, Parser}; use clap::{CommandFactory, Parser};
use clap_complete::{Shell, generate as generate_complete}; use clap_complete::{Shell, generate as generate_complete};
use crete::cluster::Cluster; use crete::cluster::Cluster;
use crete::environment::PathEnvironment; use crete::environment::PathEnvironment;
use crete::talosconfig::{get_current_context, set_context};
use crete::tftp::ServerError; use crete::tftp::ServerError;
use crete::{get_configs_path, get_repo_path, set_repo_path, tftp}; use crete::{get_configs_path, get_repo_path, set_repo_path, tftp};
use futures::StreamExt;
use futures::future::join_all;
use ipxe::IPXE_DIR;
use minijinja::context; use minijinja::context;
use regex::Regex; use regex::Regex;
use thiserror::Error; use thiserror::Error;
@@ -19,40 +23,26 @@ enum Error {
#[error("No clusters where found")] #[error("No clusters where found")]
NoClustersFound, NoClustersFound,
#[error("Server error: {0}")] #[error("Server error: {0}")]
Server(#[from] ServerError), ServerError(#[from] ServerError),
}
async fn run_command(mut command: Command) {
let output = tokio::task::spawn_blocking(move || command.output().unwrap())
.await
.unwrap();
if !output.stdout.is_empty() {
println!("{}", String::from_utf8_lossy(&output.stdout).trim_end());
}
if !output.stderr.is_empty() {
println!("{}", String::from_utf8_lossy(&output.stderr).trim_end());
}
} }
async fn generate(opts: &GlobalOpts) -> Result<(), Error> { async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
set_repo_path(&opts.repo); let clusters = Cluster::get_all().await;
let clusters = Cluster::get_all();
if clusters.is_empty() { if clusters.is_empty() {
return Err(Error::NoClustersFound); return Err(Error::NoClustersFound);
} }
let path = opts.repo.join("rendered"); let path = opts.repo.join("rendered");
if path.exists() { // We don't really care if this fails, as that likely mean that the directory did not exist
std::fs::remove_dir_all(&path).unwrap(); tokio::fs::remove_dir_all(&path).await.ok();
} tokio::fs::create_dir_all(&path).await.unwrap();
std::fs::create_dir(&path).unwrap();
// Render templates // Render templates
let template_env = PathEnvironment::new(&get_repo_path().join("templates")); let template_env = PathEnvironment::new(&get_repo_path().join("templates"));
for template_name in &template_env {
let mut stream = pin!(template_env.files());
while let Some(template_name) = stream.next().await {
let template = template_env.get_template(&template_name).unwrap(); let template = template_env.get_template(&template_name).unwrap();
let content = template let content = template
@@ -62,30 +52,42 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
}) })
.unwrap(); .unwrap();
std::fs::write(path.join(template_name), content).unwrap(); tokio::fs::write(path.join(template_name), content)
.await
.unwrap();
} }
let context = get_current_context().await;
// Remove existing config files and create output directory // Remove existing config files and create output directory
let path = get_configs_path(); let path = get_configs_path();
if path.exists() { tokio::fs::remove_dir_all(&path).await.ok();
std::fs::remove_dir_all(&path).unwrap(); tokio::fs::create_dir_all(&path).await.unwrap();
}
std::fs::create_dir(&path).unwrap();
// Generate config files // Generate config files
for cluster in clusters.values() { join_all(clusters.values().map(|cluster| async move {
for node in cluster.nodes() { join_all(cluster.nodes().map(|node| {
let config = node.talosctl_gen_config(cluster).await; let cluster = cluster.clone();
let path = node.config_path(cluster); async move {
std::fs::create_dir_all(path.parent().expect("Config should have parent directory")) node.config_write(&cluster).await;
.unwrap(); }
}))
.await;
std::fs::write(path, config).unwrap(); // Run these commands in parallel with the the node commands
} // NOTE: These do need to happen in the correct order
cluster.talosconfig_write().await;
}))
.await;
run_command(cluster.talosctl_gen_config_command()).await; // Merge all the cluster talosconfig files into a single file
run_command(cluster.talosctl_add_endpoint_command()).await; // Since this all modifies the same output file this has to happen sequentially
run_command(cluster.talosctl_merge_command()).await; for (_, cluster) in clusters {
cluster.talosconfig_merge().await;
}
if let Some(context) = context {
set_context(context).await;
} }
Ok(()) Ok(())
@@ -95,8 +97,10 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
async fn main() -> Result<(), Error> { async fn main() -> Result<(), Error> {
let cli = Cli::parse(); let cli = Cli::parse();
set_repo_path(&cli.global_opts.repo);
match cli.command { match cli.command {
Commands::Generate => generate(&cli.global_opts).await.unwrap(), Commands::Generate => generate(&cli.global_opts).await?,
Commands::ShellCompletions => generate_complete( Commands::ShellCompletions => generate_complete(
Shell::from_env().unwrap_or(Shell::Bash), Shell::from_env().unwrap_or(Shell::Bash),
&mut Cli::command(), &mut Cli::command(),
@@ -104,36 +108,38 @@ async fn main() -> Result<(), Error> {
&mut std::io::stdout(), &mut std::io::stdout(),
), ),
Commands::Serve => { Commands::Serve => {
set_repo_path(&cli.global_opts.repo); let re = Regex::new(r"talos/(?<cluster>.+)/(?<node>.+)\.ya?ml")
.expect("regex should be valid");
tftp::serve(|filename| { tftp::serve(move |filename| {
let filename = filename.to_owned(); let filename = filename.to_owned();
let re = re.clone();
println!("{filename}");
async move { async move {
let re = Regex::new(r"talos/(?<cluster>.+)/(?<node>.+)\.ya?ml") const IPXE_PATTERN: &str = "ipxe/";
.expect("Regex should be valid"); if let Some(filename) = filename.strip_prefix(IPXE_PATTERN) {
println!("Looking for iPXE binary: {filename}");
if let Some(caps) = re.captures(&filename) { Some(IPXE_DIR.get_file(filename)?.contents().to_owned())
} else if let Some(caps) = re.captures(&filename) {
let cluster = &caps["cluster"]; let cluster = &caps["cluster"];
let node = &caps["node"]; let node = &caps["node"];
let clusters = Cluster::get_all(); let clusters = Cluster::get_all().await;
let cluster = clusters.get(cluster)?; let cluster = clusters.get(cluster)?;
let node = cluster.node(node)?; let node = cluster.node(node)?;
let config = node.talosctl_gen_config(cluster).await; let config = node.config(cluster).await;
Some(config.into()) Some(config.into())
} else { } else {
match filename.as_str() { None
"ipxe.pxe" => Some(include_bytes!("../bin/ipxe.pxe").into()),
"test" => Some(vec![1, 2, 3, 4]),
_ => None,
}
} }
} }
}) })
.await?; .await?
} }
}; };
+20 -20
View File
@@ -11,18 +11,7 @@ use crate::cluster::{Base, Cluster};
use crate::patch::{OptionalPatches, OptionalPatchesString, Patches}; use crate::patch::{OptionalPatches, OptionalPatchesString, Patches};
use crate::schematic::Schematic; use crate::schematic::Schematic;
use crate::secret::Secret; use crate::secret::Secret;
use crate::{get_configs_path, get_talos_path}; use crate::{get_configs_path, get_talos_path, run_command};
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)] #[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, Copy, PartialEq, Eq)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@@ -102,7 +91,7 @@ pub(crate) struct NodeDeserialize {
sops: Secret, sops: Secret,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct Node { pub struct Node {
hostname: String, hostname: String,
@@ -118,9 +107,9 @@ pub struct Node {
} }
impl Node { impl Node {
pub(crate) fn get( pub(crate) async fn get(
node_name: &str, node_name: &str,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
default: &OptionalNodeDeserialize, default: &OptionalNodeDeserialize,
base: &Base, base: &Base,
@@ -133,7 +122,7 @@ impl Node {
.to_string(); .to_string();
path.add_extension("yaml"); path.add_extension("yaml");
let content = std::fs::read_to_string(path).unwrap(); let content = tokio::fs::read_to_string(path).await.unwrap();
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap(); let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
@@ -184,7 +173,7 @@ impl Node {
}; };
// Render patches // Render patches
let patches = patches.render(env, cluster, &node); let patches = patches.render(env, cluster, &node).await;
Node { patches, ..node } Node { patches, ..node }
} }
@@ -193,7 +182,7 @@ impl Node {
&self.hostname &self.hostname
} }
pub async fn talosctl_gen_config(&self, cluster: &Cluster) -> String { pub async fn config(&self, cluster: &Cluster) -> String {
let mut command = Command::new("talosctl"); let mut command = Command::new("talosctl");
command.args([ command.args([
"gen", "gen",
@@ -217,7 +206,7 @@ impl Node {
"--with-docs=false", "--with-docs=false",
"--with-examples=false", "--with-examples=false",
"-o", "-o",
"-", // path.to_str().expect("Path should be valid utf-8"), "-",
]); ]);
for patch in &self.patches.all { for patch in &self.patches.all {
@@ -231,7 +220,7 @@ impl Node {
]); ]);
} }
get_output(command).await run_command(command).await
} }
pub fn config_path(&self, cluster: &Cluster) -> PathBuf { pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
@@ -240,6 +229,17 @@ impl Node {
path path
} }
pub async fn config_write(&self, cluster: &Cluster) {
let config = self.config(cluster).await;
let path = self.config_path(cluster);
tokio::fs::create_dir_all(path.parent().expect("config should have parent"))
.await
.unwrap();
tokio::fs::write(path, config).await.unwrap();
}
} }
impl JsonSchema for Node { impl JsonSchema for Node {
+29 -20
View File
@@ -16,27 +16,36 @@ pub(crate) struct Patches<T> {
pub(crate) type OptionalPatchesString = OptionalPatches<String>; pub(crate) type OptionalPatchesString = OptionalPatches<String>;
fn render( async fn render(
patches: Vec<String>, patches: Vec<String>,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
node: &Node, node: &Node,
) -> Vec<serde_yaml::Value> { ) -> Vec<serde_yaml::Value> {
patches let env = env.clone();
.into_iter() let cluster = cluster.clone();
.map(|name| { let node = node.clone();
let content = env
.get_template(&name)
.unwrap()
.render(context! {
node,
cluster
})
.unwrap();
serde_yaml::from_str(&content).unwrap() // Minijinja will still have blocking I/O internally
}) tokio::task::spawn_blocking(move || {
.collect() patches
.into_iter()
.map(move |name| {
let content = env
.get_template(&name)
.unwrap()
.render(context! {
node,
cluster
})
.unwrap();
serde_yaml::from_str(&content).unwrap()
})
.collect()
})
.await
.unwrap()
} }
impl Patches<String> { impl Patches<String> {
@@ -50,15 +59,15 @@ impl Patches<String> {
} }
} }
pub(crate) fn render( pub(crate) async fn render(
self, self,
env: &Environment, env: &Environment<'static>,
cluster: &Cluster, cluster: &Cluster,
node: &Node, node: &Node,
) -> Patches<serde_yaml::Value> { ) -> Patches<serde_yaml::Value> {
Patches { Patches {
all: render(self.all.clone(), env, cluster, node), all: render(self.all.clone(), env, cluster, node).await,
control_plane: render(self.control_plane.clone(), env, cluster, node), control_plane: render(self.control_plane.clone(), env, cluster, node).await,
} }
} }
} }
+16 -14
View File
@@ -21,27 +21,29 @@ where
.build() .build()
.unwrap(); .unwrap();
let res = tokio::task::block_in_place(|| {
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)] #[derive(Debug, Deserialize)]
struct Response { struct Response {
id: String, id: String,
} }
let text = // We can't use async directly inside a custom deserializer, and using the blocking client also
tokio::task::block_in_place(|| Handle::current().block_on(async { res.text().await })) // does not work as it will try to start tokio inside of tokio.
// So we have do this to work around it.
// NOTE: This requires that the deserialization happens inside spawn_blocking
let response = Handle::current().block_on(async {
let res = client
.post("https://factory.talos.dev/schematics")
.body(content)
.send()
.await
.map_err(serde::de::Error::custom)?; .map_err(serde::de::Error::custom)?;
let response: Response = serde_json::from_str(&text).map_err(serde::de::Error::custom)?; let response: Response =
serde_json::from_str(&res.text().await.map_err(serde::de::Error::custom)?)
.map_err(serde::de::Error::custom)?;
Ok(response)
})?;
Ok(response.id) Ok(response.id)
} }
+40
View File
@@ -0,0 +1,40 @@
use std::path::PathBuf;
use serde::Deserialize;
use tokio::process::Command;
use crate::{get_configs_path, run_command};
#[derive(Debug, Deserialize)]
pub struct TalosConfig {
context: String,
}
impl TalosConfig {
pub fn merged_path() -> PathBuf {
get_configs_path().join("talosconfig")
}
}
pub async fn get_current_context() -> Option<String> {
tokio::fs::read(&TalosConfig::merged_path())
.await
.ok()
.and_then(|config| serde_yaml::from_slice(&config).ok())
.map(|config: TalosConfig| config.context)
}
pub async fn set_context(context: String) {
let mut command = Command::new("talosctl");
command.args([
"config",
"--talosconfig",
TalosConfig::merged_path()
.to_str()
.expect("Path should be valid utf-8"),
"context",
&context,
]);
run_command(command).await;
}
+1 -1
View File
@@ -147,7 +147,7 @@ where
pub async fn serve<F, Fut>(callback: F) -> Result<!, Error> pub async fn serve<F, Fut>(callback: F) -> Result<!, Error>
where where
F: (Fn(&str) -> Fut) + Clone + Send + 'static, F: Fn(&str) -> Fut + Clone + Send + 'static,
Fut: Future<Output = Option<Vec<u8>>> + Send + 'static, Fut: Future<Output = Option<Vec<u8>>> + Send + 'static,
{ {
let socket = UdpSocket::bind("127.0.0.1:69").await?; let socket = UdpSocket::bind("127.0.0.1:69").await?;
-1
View File
@@ -1 +0,0 @@