Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
10c6f891d7
|
||
|
|
344f345854
|
@@ -11,9 +11,9 @@ jobs:
|
|||||||
name: committed
|
name: committed
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: crate-ci/committed@v1.1.11
|
- uses: crate-ci/committed@master
|
||||||
with:
|
with:
|
||||||
commits: "origin/${{ gitea.base_ref }}..HEAD"
|
commits: "origin/${{ gitea.base_ref }}..HEAD"
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
[submodule "ipxe/ipxe"]
|
|
||||||
path = ipxe/ipxe
|
|
||||||
url = git@github.com:rkubes/ipxe
|
|
||||||
@@ -76,6 +76,6 @@ repos:
|
|||||||
glob: .gitea/workflows/*.yaml
|
glob: .gitea/workflows/*.yaml
|
||||||
|
|
||||||
- repo: https://github.com/crate-ci/committed
|
- repo: https://github.com/crate-ci/committed
|
||||||
rev: v1.1.11
|
rev: v1.1.8
|
||||||
hooks:
|
hooks:
|
||||||
- id: committed
|
- id: committed
|
||||||
|
|||||||
Generated
+258
-479
File diff suppressed because it is too large
Load Diff
+14
-17
@@ -7,38 +7,35 @@ publish = ["infra"]
|
|||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = ["ipxe", "xtask"]
|
members = ["xtask"]
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
schemars = { version = "1.2.2", features = ["semver1"] }
|
schemars = { version = "1.2.1", features = ["semver1"] }
|
||||||
serde_json = "1.0.151"
|
serde_json = "1.0.149"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
async-walkdir = "2.2.0"
|
|
||||||
byteorder = "1.5.0"
|
byteorder = "1.5.0"
|
||||||
clap = { version = "4.6.7", features = ["derive"] }
|
clap = { version = "4.6.0", features = ["derive"] }
|
||||||
clap_complete = "4.6.11"
|
clap_complete = "4.6.0"
|
||||||
futures = "0.3.34"
|
gix-discover = { version = "0.55.0", features = ["sha1"] }
|
||||||
gix-discover = { version = "0.56.0", features = ["sha1"] }
|
minijinja = { version = "2.18.0", features = ["json", "loader"] }
|
||||||
minijinja = { version = "2.24.0", features = ["json", "loader"] }
|
|
||||||
netascii = "0.1.0"
|
netascii = "0.1.0"
|
||||||
num_enum = "0.7.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.5", 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 }
|
||||||
semver = { version = "1.0.28", features = ["serde"] }
|
semver = { version = "1.0.27", features = ["serde"] }
|
||||||
serde = { version = "1.0.229", features = ["derive"] }
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde_yaml = "0.9.34"
|
serde_yaml = "0.9.34"
|
||||||
thiserror = "2.0.21"
|
thiserror = "2.0.18"
|
||||||
tokio = { version = "1.52.1", features = ["full"] }
|
tokio = { version = "1.52.1", features = ["full"] }
|
||||||
ipxe = { path = "./ipxe" }
|
walkdir = "2.5.0"
|
||||||
axum = { version = "0.8.9", features = ["macros"] }
|
|
||||||
socket2 = "0.6.5"
|
|
||||||
socket-pktinfo = "0.4.1"
|
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
test = false
|
test = false
|
||||||
|
|||||||
Binary file not shown.
+210
@@ -0,0 +1,210 @@
|
|||||||
|
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
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "ipxe"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2024"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
build-print = "1.0.1"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
include_dir = "0.7.4"
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
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("DOWNLOAD_PROTO_HTTP=1")
|
|
||||||
.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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-1
Submodule ipxe/ipxe deleted from 8892af68a2
@@ -1,4 +0,0 @@
|
|||||||
#!ipxe
|
|
||||||
|
|
||||||
dhcp
|
|
||||||
chain boot.ipxe
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
use include_dir::{Dir, include_dir};
|
|
||||||
|
|
||||||
pub static IPXE_DIR: Dir<'_> = include_dir!("$OUT_DIR/ipxe");
|
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "nightly-2026-10-01"
|
channel = "nightly-2026-03-12"
|
||||||
profile = "default"
|
profile = "default"
|
||||||
components = ["rust-analyzer"]
|
components = ["rust-analyzer"]
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
#!ipxe
|
|
||||||
echo Starting ${serial}
|
|
||||||
|
|
||||||
:start
|
|
||||||
goto node_${serial} || exit
|
|
||||||
# Default behavior (non install mode) is to exit iPXE script
|
|
||||||
|
|
||||||
{% for cluster in clusters%}
|
|
||||||
{% for _, node in cluster.nodes|items %}
|
|
||||||
{%- if node.install.serial -%}
|
|
||||||
# {{ cluster.name }}/{{ node.hostname }}
|
|
||||||
:node_{{ node.install.serial }}
|
|
||||||
imgfree
|
|
||||||
kernel https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/kernel-{{ node.arch }} {{ node.kernelArgs|join(" ") }} {% if node.install.auto %}talos.config={{httpUrl}}/talos/{{cluster.name}}/{{node.hostname}}.yaml{% endif +%}
|
|
||||||
initrd https://pxe.factory.talos.dev/image/{{ node.schematic }}/v{{ cluster.version.talos }}/initramfs-{{ node.arch }}.xz
|
|
||||||
boot
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
{% endfor %}
|
|
||||||
+2
-8
@@ -1,4 +1,3 @@
|
|||||||
use std::net::IpAddr;
|
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
use clap::{Args, Parser, Subcommand};
|
use clap::{Args, Parser, Subcommand};
|
||||||
@@ -50,11 +49,6 @@ pub enum Commands {
|
|||||||
Generate,
|
Generate,
|
||||||
/// Generate completions for your current shell
|
/// Generate completions for your current shell
|
||||||
ShellCompletions,
|
ShellCompletions,
|
||||||
/// Serve config files over tftp
|
/// Test
|
||||||
Serve {
|
Serve,
|
||||||
#[arg(short, long, default_value = "3000")]
|
|
||||||
port: u16,
|
|
||||||
#[arg(long, default_value = "0.0.0.0")]
|
|
||||||
ip: IpAddr,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
+42
-79
@@ -1,22 +1,19 @@
|
|||||||
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 tokio::process::Command;
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
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::talosconfig::TalosConfig;
|
use crate::{get_configs_path, get_talos_path};
|
||||||
use crate::{get_configs_path, get_talos_path, run_command};
|
|
||||||
|
|
||||||
#[optional_struct]
|
#[optional_struct]
|
||||||
#[derive(Debug, Deserialize, JsonSchema, Clone)]
|
#[derive(Debug, Deserialize, JsonSchema, Clone)]
|
||||||
@@ -72,7 +69,7 @@ struct ClusterDeserialize {
|
|||||||
base: Base,
|
base: Base,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Clone)]
|
#[derive(Debug, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Cluster {
|
pub struct Cluster {
|
||||||
pub(crate) name: String,
|
pub(crate) name: String,
|
||||||
@@ -84,23 +81,19 @@ pub struct Cluster {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Cluster {
|
impl Cluster {
|
||||||
pub(crate) async fn get(cluster_name: &str, env: &Environment<'static>) -> Self {
|
pub(crate) fn get(cluster_name: &str, env: &Environment) -> 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 = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).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 = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).unwrap();
|
||||||
|
|
||||||
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
|
let mut cluster: OptionalClusterDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||||
|
|
||||||
@@ -122,32 +115,31 @@ impl Cluster {
|
|||||||
let cluster = Self {
|
let cluster = Self {
|
||||||
name: cluster_name.into(),
|
name: cluster_name.into(),
|
||||||
version: cluster.version,
|
version: cluster.version,
|
||||||
nodes: Default::default(),
|
nodes: HashMap::new(),
|
||||||
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.iter().map(|name| async {
|
let nodes = nodes
|
||||||
let node = Node::get(name, env, &cluster, &default, &base).await;
|
.into_iter()
|
||||||
(node.hostname().to_owned(), node)
|
.map(|name| {
|
||||||
});
|
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 async fn get_all() -> HashMap<String, Cluster> {
|
pub fn get_all() -> HashMap<String, Cluster> {
|
||||||
let env = PathEnvironment::new_patches();
|
let env = PathEnvironment::new_patches();
|
||||||
|
|
||||||
let names: Vec<_> = WalkDir::new(get_talos_path().join("clusters"))
|
WalkDir::new(get_talos_path().join("clusters"))
|
||||||
.filter_map(|e| async { e.ok() })
|
.into_iter()
|
||||||
.filter(|e| {
|
.filter_map(|e| e.ok())
|
||||||
let e = e.clone();
|
.filter(|e| e.metadata().unwrap().is_file())
|
||||||
async move { e.metadata().await.unwrap().is_file() }
|
.filter_map(|e| {
|
||||||
})
|
|
||||||
.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("");
|
||||||
|
|
||||||
@@ -157,35 +149,24 @@ impl Cluster {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(name)
|
let cluster = Cluster::get(&name, &env);
|
||||||
|
|
||||||
|
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, node: &str) -> Option<&Node> {
|
pub fn node(&self, name: &str) -> Option<&Node> {
|
||||||
self.nodes.get(node)
|
self.nodes.get(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn talosconfig(&self) -> String {
|
pub fn talosctl_gen_config_command(&self) -> Command {
|
||||||
|
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",
|
||||||
@@ -197,59 +178,41 @@ impl Cluster {
|
|||||||
"--output-types",
|
"--output-types",
|
||||||
"talosconfig",
|
"talosconfig",
|
||||||
"-o",
|
"-o",
|
||||||
"-",
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await
|
command
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn talosconfig_path(&self) -> PathBuf {
|
pub fn talosctl_add_endpoint_command(&self) -> Command {
|
||||||
get_configs_path().join(&self.name).join("talosconfig")
|
let path = 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",
|
||||||
self.talosconfig_path()
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
"endpoint",
|
"endpoint",
|
||||||
&self.control_plane_ip.to_string(),
|
&self.control_plane_ip.to_string(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await;
|
command
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn talosconfig_write(&self) {
|
pub fn talosctl_merge_command(&self) -> Command {
|
||||||
let config = self.talosconfig().await;
|
let cluster_path = get_configs_path().join(&self.name).join("talosconfig");
|
||||||
|
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",
|
||||||
TalosConfig::merged_path()
|
path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
"merge",
|
"merge",
|
||||||
self.talosconfig_path()
|
cluster_path.to_str().expect("Path should be valid utf-8"),
|
||||||
.to_str()
|
|
||||||
.expect("Path should be valid utf-8"),
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
run_command(command).await;
|
command
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+59
-60
@@ -2,17 +2,15 @@ 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,
|
||||||
@@ -25,50 +23,46 @@ fn apply_netmask(
|
|||||||
Ok((*ip & *netmask).to_string())
|
Ok((*ip & *netmask).to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn configure_environment(env: &mut Environment) {
|
|
||||||
// Configure jinja
|
|
||||||
env.set_trim_blocks(true);
|
|
||||||
env.set_lstrip_blocks(true);
|
|
||||||
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
|
|
||||||
env.set_auto_escape_callback(|_| AutoEscape::None);
|
|
||||||
|
|
||||||
// Add filters
|
|
||||||
env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
|
|
||||||
let mask = netmask.to_bits();
|
|
||||||
let prefix = mask.leading_ones();
|
|
||||||
|
|
||||||
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
|
|
||||||
Ok(prefix as u8)
|
|
||||||
} else {
|
|
||||||
Err(minijinja::Error::new(
|
|
||||||
minijinja::ErrorKind::InvalidOperation,
|
|
||||||
"invalid IP prefix length",
|
|
||||||
))
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
env.add_function("apply_netmask", apply_netmask);
|
|
||||||
|
|
||||||
// Helper function for getting the path to kubeconfig files
|
|
||||||
env.add_filter("kubeconfig", move |names: Vec<String>| {
|
|
||||||
names
|
|
||||||
.iter()
|
|
||||||
.map(|name| {
|
|
||||||
get_configs_path()
|
|
||||||
.join(name)
|
|
||||||
.join("kubeconfig")
|
|
||||||
.to_string_lossy()
|
|
||||||
.to_string()
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'a> PathEnvironment<'a> {
|
impl<'a> PathEnvironment<'a> {
|
||||||
pub fn new(path: &Path) -> Self {
|
pub fn new(path: &Path) -> Self {
|
||||||
let mut env = Environment::new();
|
let mut env = Environment::new();
|
||||||
|
|
||||||
configure_environment(&mut env);
|
// Configure jinja
|
||||||
|
env.set_trim_blocks(true);
|
||||||
|
env.set_lstrip_blocks(true);
|
||||||
|
env.set_undefined_behavior(minijinja::UndefinedBehavior::Strict);
|
||||||
|
env.set_auto_escape_callback(|_| AutoEscape::None);
|
||||||
|
|
||||||
|
// Add filters
|
||||||
|
env.add_filter("to_prefix", |netmask: ViaDeserialize<Ipv4Addr>| {
|
||||||
|
let mask = netmask.to_bits();
|
||||||
|
let prefix = mask.leading_ones();
|
||||||
|
|
||||||
|
if mask.checked_shl(prefix).unwrap_or(0) == 0 {
|
||||||
|
Ok(prefix as u8)
|
||||||
|
} else {
|
||||||
|
Err(minijinja::Error::new(
|
||||||
|
minijinja::ErrorKind::InvalidOperation,
|
||||||
|
"invalid IP prefix length",
|
||||||
|
))
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
env.add_function("apply_netmask", apply_netmask);
|
||||||
|
|
||||||
|
// Helper function for getting the path to kubeconfig files
|
||||||
|
env.add_filter("kubeconfig", move |names: Vec<String>| {
|
||||||
|
names
|
||||||
|
.iter()
|
||||||
|
.map(|name| {
|
||||||
|
get_configs_path()
|
||||||
|
.join(name)
|
||||||
|
.join("kubeconfig")
|
||||||
|
.to_string_lossy()
|
||||||
|
.to_string()
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
});
|
||||||
|
|
||||||
// Add path loader
|
// Add path loader
|
||||||
env.set_loader(path_loader(&path));
|
env.set_loader(path_loader(&path));
|
||||||
@@ -82,23 +76,6 @@ 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
|
||||||
@@ -109,3 +86,25 @@ 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()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+1
-15
@@ -1,16 +1,13 @@
|
|||||||
#![feature(path_absolute_method)]
|
#![feature(impl_trait_in_assoc_type, 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();
|
||||||
@@ -32,14 +29,3 @@ 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()
|
|
||||||
}
|
|
||||||
|
|||||||
+67
-160
@@ -1,27 +1,15 @@
|
|||||||
mod cli;
|
mod cli;
|
||||||
|
|
||||||
use std::net::SocketAddr;
|
use std::process::Command;
|
||||||
use std::path::PathBuf;
|
|
||||||
use std::pin::pin;
|
|
||||||
|
|
||||||
use axum::extract::Request;
|
|
||||||
use axum::http::Uri;
|
|
||||||
use axum::response::IntoResponse;
|
|
||||||
use axum::routing::get;
|
|
||||||
use axum::{Router, debug_handler};
|
|
||||||
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, configure_environment};
|
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 minijinja::context;
|
||||||
use futures::future::join_all;
|
|
||||||
use ipxe::IPXE_DIR;
|
|
||||||
use minijinja::{Environment, context};
|
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use reqwest::{StatusCode, header};
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
use crate::cli::{Cli, Commands, GlobalOpts};
|
use crate::cli::{Cli, Commands, GlobalOpts};
|
||||||
@@ -31,26 +19,40 @@ enum Error {
|
|||||||
#[error("No clusters where found")]
|
#[error("No clusters where found")]
|
||||||
NoClustersFound,
|
NoClustersFound,
|
||||||
#[error("Server error: {0}")]
|
#[error("Server error: {0}")]
|
||||||
ServerError(#[from] ServerError),
|
Server(#[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> {
|
||||||
let clusters = Cluster::get_all().await;
|
set_repo_path(&opts.repo);
|
||||||
|
|
||||||
|
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");
|
||||||
// We don't really care if this fails, as that likely mean that the directory did not exist
|
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();
|
||||||
|
|
||||||
// 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
|
||||||
@@ -60,170 +62,75 @@ async fn generate(opts: &GlobalOpts) -> Result<(), Error> {
|
|||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
tokio::fs::write(path.join(template_name), content)
|
std::fs::write(path.join(template_name), content).unwrap();
|
||||||
.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();
|
||||||
tokio::fs::remove_dir_all(&path).await.ok();
|
if path.exists() {
|
||||||
tokio::fs::create_dir_all(&path).await.unwrap();
|
std::fs::remove_dir_all(&path).unwrap();
|
||||||
|
}
|
||||||
|
std::fs::create_dir(&path).unwrap();
|
||||||
|
|
||||||
// Generate config files
|
// Generate config files
|
||||||
join_all(clusters.values().map(|cluster| async move {
|
for cluster in clusters.values() {
|
||||||
join_all(cluster.nodes().map(|node| {
|
for node in cluster.nodes() {
|
||||||
let cluster = cluster.clone();
|
let config = node.talosctl_gen_config(cluster).await;
|
||||||
async move {
|
let path = node.config_path(cluster);
|
||||||
node.config_write(&cluster).await;
|
std::fs::create_dir_all(path.parent().expect("Config should have parent directory"))
|
||||||
}
|
.unwrap();
|
||||||
}))
|
|
||||||
.await;
|
|
||||||
|
|
||||||
// Run these commands in parallel with the the node commands
|
std::fs::write(path, config).unwrap();
|
||||||
// NOTE: These do need to happen in the correct order
|
}
|
||||||
cluster.talosconfig_write().await;
|
|
||||||
}))
|
|
||||||
.await;
|
|
||||||
|
|
||||||
// Merge all the cluster talosconfig files into a single file
|
run_command(cluster.talosctl_gen_config_command()).await;
|
||||||
// Since this all modifies the same output file this has to happen sequentially
|
run_command(cluster.talosctl_add_endpoint_command()).await;
|
||||||
for (_, cluster) in clusters {
|
run_command(cluster.talosctl_merge_command()).await;
|
||||||
cluster.talosconfig_merge().await;
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(context) = context {
|
|
||||||
set_context(context).await;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[debug_handler]
|
|
||||||
async fn handler(req: Request) -> impl IntoResponse {
|
|
||||||
println!("{req:?}");
|
|
||||||
let uri: Uri = req
|
|
||||||
.headers()
|
|
||||||
.iter()
|
|
||||||
.find(|(name, _)| header::HOST.eq(name))
|
|
||||||
.map(|(_, value)| value)
|
|
||||||
.expect("Host header should exist")
|
|
||||||
.to_str()
|
|
||||||
.expect("Header value should be valid ASCII")
|
|
||||||
.parse()
|
|
||||||
.expect("Host should be valid Uri");
|
|
||||||
|
|
||||||
let host = uri.host().expect("Uri should have host");
|
|
||||||
let port = uri.port().map(|port| port.as_u16()).unwrap_or(80);
|
|
||||||
|
|
||||||
let Some(path) = req.uri().path().strip_prefix("/") else {
|
|
||||||
return StatusCode::BAD_REQUEST.into_response();
|
|
||||||
};
|
|
||||||
|
|
||||||
let Some((file, content_type)) = get_file(path, format!("http://{host}:{port}")).await else {
|
|
||||||
return StatusCode::NOT_FOUND.into_response();
|
|
||||||
};
|
|
||||||
|
|
||||||
let path = PathBuf::from(path);
|
|
||||||
let filename = path.file_name().unwrap();
|
|
||||||
let filename = filename.to_str().unwrap();
|
|
||||||
|
|
||||||
let content_type = [(header::CONTENT_TYPE, content_type)];
|
|
||||||
let disposition = [(
|
|
||||||
header::CONTENT_DISPOSITION,
|
|
||||||
format!("inline; filename=\"{filename}\""),
|
|
||||||
)];
|
|
||||||
|
|
||||||
(content_type, disposition, file).into_response()
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Make this a proper async function
|
|
||||||
fn get_file(
|
|
||||||
filename: impl ToString,
|
|
||||||
http_url: impl ToString,
|
|
||||||
) -> impl Future<Output = Option<(Vec<u8>, &'static str)>> {
|
|
||||||
// TODO: Make this a static that is initialized once
|
|
||||||
let re =
|
|
||||||
Regex::new(r"^talos/(?<cluster>.+)/(?<node>.+)\.ya?ml$").expect("regex should be valid");
|
|
||||||
|
|
||||||
let filename: String = filename.to_string();
|
|
||||||
let re = re.clone();
|
|
||||||
|
|
||||||
async move {
|
|
||||||
const IPXE_PATTERN: &str = "ipxe/";
|
|
||||||
if filename == format!("{IPXE_PATTERN}boot.ipxe") {
|
|
||||||
let mut env = Environment::new();
|
|
||||||
|
|
||||||
configure_environment(&mut env);
|
|
||||||
|
|
||||||
let template = env
|
|
||||||
.template_from_str(include_str!("./boot.ipxe"))
|
|
||||||
.expect("Template should be valid");
|
|
||||||
|
|
||||||
let clusters = Cluster::get_all().await;
|
|
||||||
let content = template
|
|
||||||
.render(context! {
|
|
||||||
clusters => clusters.values().collect::<Vec<_>>(),
|
|
||||||
httpUrl => http_url.to_string()
|
|
||||||
})
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
Some((content.into(), "text/plain; charset=utf-8"))
|
|
||||||
} else if let Some(filename) = filename.strip_prefix(IPXE_PATTERN) {
|
|
||||||
Some((
|
|
||||||
IPXE_DIR.get_file(filename)?.contents().to_owned(),
|
|
||||||
"application/octet-stream",
|
|
||||||
))
|
|
||||||
} else if let Some(caps) = re.captures(&filename) {
|
|
||||||
let cluster = &caps["cluster"];
|
|
||||||
let node = &caps["node"];
|
|
||||||
|
|
||||||
let clusters = Cluster::get_all().await;
|
|
||||||
let cluster = clusters.get(cluster)?;
|
|
||||||
|
|
||||||
let node = cluster.node(node)?;
|
|
||||||
|
|
||||||
let config = node.config(cluster).await;
|
|
||||||
|
|
||||||
Some((config.into(), "application/yaml; charset=utf-8"))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
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?,
|
Commands::Generate => generate(&cli.global_opts).await.unwrap(),
|
||||||
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(),
|
||||||
"crete",
|
"crete",
|
||||||
&mut std::io::stdout(),
|
&mut std::io::stdout(),
|
||||||
),
|
),
|
||||||
Commands::Serve { port, ip } => {
|
Commands::Serve => {
|
||||||
tokio::spawn(async move {
|
set_repo_path(&cli.global_opts.repo);
|
||||||
let app = Router::new().fallback_service(get(handler));
|
|
||||||
let addr: SocketAddr = (ip, port).into();
|
|
||||||
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
|
||||||
|
|
||||||
println!("Http server started on {addr}");
|
tftp::serve(|filename| {
|
||||||
axum::serve(listener, app).await.unwrap();
|
|
||||||
});
|
|
||||||
|
|
||||||
tftp::serve(ip, move |filename, ip| {
|
|
||||||
let filename = filename.to_owned();
|
let filename = filename.to_owned();
|
||||||
|
|
||||||
async move {
|
async move {
|
||||||
get_file(filename, format!("http://{ip}:{port}"))
|
let re = Regex::new(r"talos/(?<cluster>.+)/(?<node>.+)\.ya?ml")
|
||||||
.await
|
.expect("Regex should be valid");
|
||||||
.map(|(file, _)| file)
|
|
||||||
|
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?;
|
||||||
|
|||||||
+20
-20
@@ -11,7 +11,18 @@ 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, run_command};
|
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)]
|
#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone, Copy, PartialEq, Eq)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
@@ -91,7 +102,7 @@ pub(crate) struct NodeDeserialize {
|
|||||||
sops: Secret,
|
sops: Secret,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Clone)]
|
#[derive(Debug, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Node {
|
pub struct Node {
|
||||||
hostname: String,
|
hostname: String,
|
||||||
@@ -107,9 +118,9 @@ pub struct Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Node {
|
impl Node {
|
||||||
pub(crate) async fn get(
|
pub(crate) fn get(
|
||||||
node_name: &str,
|
node_name: &str,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
cluster: &Cluster,
|
cluster: &Cluster,
|
||||||
default: &OptionalNodeDeserialize,
|
default: &OptionalNodeDeserialize,
|
||||||
base: &Base,
|
base: &Base,
|
||||||
@@ -122,7 +133,7 @@ impl Node {
|
|||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
path.add_extension("yaml");
|
path.add_extension("yaml");
|
||||||
let content = tokio::fs::read_to_string(path).await.unwrap();
|
let content = std::fs::read_to_string(path).unwrap();
|
||||||
|
|
||||||
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
|
let node: OptionalNodeDeserialize = serde_yaml::from_str(&content).unwrap();
|
||||||
|
|
||||||
@@ -173,7 +184,7 @@ impl Node {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Render patches
|
// Render patches
|
||||||
let patches = patches.render(env, cluster, &node).await;
|
let patches = patches.render(env, cluster, &node);
|
||||||
|
|
||||||
Node { patches, ..node }
|
Node { patches, ..node }
|
||||||
}
|
}
|
||||||
@@ -182,7 +193,7 @@ impl Node {
|
|||||||
&self.hostname
|
&self.hostname
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn config(&self, cluster: &Cluster) -> String {
|
pub async fn talosctl_gen_config(&self, cluster: &Cluster) -> String {
|
||||||
let mut command = Command::new("talosctl");
|
let mut command = Command::new("talosctl");
|
||||||
command.args([
|
command.args([
|
||||||
"gen",
|
"gen",
|
||||||
@@ -206,7 +217,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 {
|
||||||
@@ -220,7 +231,7 @@ impl Node {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
run_command(command).await
|
get_output(command).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
|
pub fn config_path(&self, cluster: &Cluster) -> PathBuf {
|
||||||
@@ -229,17 +240,6 @@ 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 {
|
||||||
|
|||||||
+20
-29
@@ -16,36 +16,27 @@ pub(crate) struct Patches<T> {
|
|||||||
|
|
||||||
pub(crate) type OptionalPatchesString = OptionalPatches<String>;
|
pub(crate) type OptionalPatchesString = OptionalPatches<String>;
|
||||||
|
|
||||||
async fn render(
|
fn render(
|
||||||
patches: Vec<String>,
|
patches: Vec<String>,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
cluster: &Cluster,
|
cluster: &Cluster,
|
||||||
node: &Node,
|
node: &Node,
|
||||||
) -> Vec<serde_yaml::Value> {
|
) -> Vec<serde_yaml::Value> {
|
||||||
let env = env.clone();
|
patches
|
||||||
let cluster = cluster.clone();
|
.into_iter()
|
||||||
let node = node.clone();
|
.map(|name| {
|
||||||
|
let content = env
|
||||||
|
.get_template(&name)
|
||||||
|
.unwrap()
|
||||||
|
.render(context! {
|
||||||
|
node,
|
||||||
|
cluster
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
// Minijinja will still have blocking I/O internally
|
serde_yaml::from_str(&content).unwrap()
|
||||||
tokio::task::spawn_blocking(move || {
|
})
|
||||||
patches
|
.collect()
|
||||||
.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> {
|
||||||
@@ -59,15 +50,15 @@ impl Patches<String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) async fn render(
|
pub(crate) fn render(
|
||||||
self,
|
self,
|
||||||
env: &Environment<'static>,
|
env: &Environment,
|
||||||
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).await,
|
all: render(self.all.clone(), env, cluster, node),
|
||||||
control_plane: render(self.control_plane.clone(), env, cluster, node).await,
|
control_plane: render(self.control_plane.clone(), env, cluster, node),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-16
@@ -21,29 +21,27 @@ 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,
|
||||||
}
|
}
|
||||||
|
|
||||||
// We can't use async directly inside a custom deserializer, and using the blocking client also
|
let text =
|
||||||
// does not work as it will try to start tokio inside of tokio.
|
tokio::task::block_in_place(|| Handle::current().block_on(async { res.text().await }))
|
||||||
// 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 =
|
let response: Response = serde_json::from_str(&text).map_err(serde::de::Error::custom)?;
|
||||||
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)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
+4
-6
@@ -310,8 +310,8 @@ impl Packet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn recv_from(socket: &UdpSocket) -> Result<(Self, SocketAddr), Error> {
|
pub async fn recv_from(socket: &UdpSocket) -> Result<(Self, SocketAddr), Error> {
|
||||||
let mut buf = [0u8; PACKET_SIZE];
|
let mut buf = Vec::with_capacity(PACKET_SIZE);
|
||||||
let (_, src) = socket.recv_from(&mut buf).await?;
|
let (_, src) = socket.recv_buf_from(&mut buf).await?;
|
||||||
|
|
||||||
let packet = buf.try_into()?;
|
let packet = buf.try_into()?;
|
||||||
|
|
||||||
@@ -342,12 +342,10 @@ impl TryFrom<&Packet> for Vec<u8> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TryFrom<[u8; PACKET_SIZE]> for Packet {
|
impl TryFrom<Vec<u8>> for Packet {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
fn try_from(
|
fn try_from(buf: Vec<u8>) -> Result<Self, <Packet as TryFrom<Vec<u8>>>::Error> {
|
||||||
buf: [u8; PACKET_SIZE],
|
|
||||||
) -> Result<Self, <Packet as TryFrom<[u8; PACKET_SIZE]>>::Error> {
|
|
||||||
let mut reader = BufReader::new(Cursor::new(buf));
|
let mut reader = BufReader::new(Cursor::new(buf));
|
||||||
|
|
||||||
Packet::decode(&mut reader)
|
Packet::decode(&mut reader)
|
||||||
|
|||||||
+16
-36
@@ -1,14 +1,11 @@
|
|||||||
use std::io;
|
use std::io;
|
||||||
use std::net::{IpAddr, SocketAddr};
|
use std::net::SocketAddr;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use socket_pktinfo::{PktInfo, PktInfoUdpSocket};
|
|
||||||
use socket2::Domain;
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
use tokio::io::unix::AsyncFd;
|
|
||||||
use tokio::net::UdpSocket;
|
use tokio::net::UdpSocket;
|
||||||
|
|
||||||
use crate::tftp::packet::{ErrorCode, Mode, PACKET_SIZE};
|
use crate::tftp::packet::{ErrorCode, Mode};
|
||||||
use crate::tftp::{self, Packet};
|
use crate::tftp::{self, Packet};
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
#[derive(Debug, Error)]
|
||||||
@@ -32,25 +29,23 @@ pub enum Error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn handle_connection<F, Fut>(
|
pub async fn handle_connection<F, Fut>(
|
||||||
info: PktInfo,
|
src: SocketAddr,
|
||||||
packet: Packet,
|
packet: Packet,
|
||||||
callback: F,
|
callback: F,
|
||||||
) -> Result<(), Error>
|
) -> Result<(), Error>
|
||||||
where
|
where
|
||||||
F: Fn(&str, IpAddr) -> Fut,
|
F: Fn(&str) -> Fut,
|
||||||
Fut: Future<Output = Option<Vec<u8>>>,
|
Fut: Future<Output = Option<Vec<u8>>>,
|
||||||
{
|
{
|
||||||
let src = info.addr_src;
|
let socket = UdpSocket::bind("127.0.0.1:0").await?;
|
||||||
let socket = UdpSocket::bind((info.addr_dst, 0)).await?;
|
|
||||||
println!(
|
println!(
|
||||||
"{}: Connecting back from {}",
|
"{src}: Connecting from {}",
|
||||||
src,
|
socket.local_addr().expect("Socket is bound")
|
||||||
socket.local_addr().expect("Local addr should be set")
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let Packet::Read(request) = packet else {
|
let Packet::Read(request) = packet else {
|
||||||
Packet::error(ErrorCode::NotDefined, "Operation not supported")
|
Packet::error(ErrorCode::NotDefined, "Operation not supported")
|
||||||
.send_to(&socket, &info.addr_src)
|
.send_to(&socket, &src)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
return Err(Error::UnsupportedOperation(packet));
|
return Err(Error::UnsupportedOperation(packet));
|
||||||
@@ -59,7 +54,7 @@ where
|
|||||||
let filename = request.filename();
|
let filename = request.filename();
|
||||||
println!("{src}: {filename} [{:?}]", request.mode());
|
println!("{src}: {filename} [{:?}]", request.mode());
|
||||||
|
|
||||||
let Some(data) = callback(filename, info.addr_dst).await else {
|
let Some(data) = callback(filename).await else {
|
||||||
Packet::error(ErrorCode::FileNotFound, "Unknown file")
|
Packet::error(ErrorCode::FileNotFound, "Unknown file")
|
||||||
.send_to(&socket, &src)
|
.send_to(&socket, &src)
|
||||||
.await?;
|
.await?;
|
||||||
@@ -90,7 +85,7 @@ where
|
|||||||
let mut timeout = 0;
|
let mut timeout = 0;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
// Send the first chunk
|
// Send the first byte
|
||||||
if let Some((index, chunk)) = chunk {
|
if let Some((index, chunk)) = chunk {
|
||||||
Packet::data((index + 1) as u16, chunk)
|
Packet::data((index + 1) as u16, chunk)
|
||||||
.send_to(&socket, &src)
|
.send_to(&socket, &src)
|
||||||
@@ -150,36 +145,21 @@ where
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn serve<F, Fut>(ip: IpAddr, callback: F) -> Result<!, Error>
|
pub async fn serve<F, Fut>(callback: F) -> Result<!, Error>
|
||||||
where
|
where
|
||||||
F: Fn(&str, IpAddr) -> 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 = PktInfoUdpSocket::new(Domain::IPV4)?;
|
let socket = UdpSocket::bind("127.0.0.1:69").await?;
|
||||||
socket.set_nonblocking(true)?;
|
|
||||||
|
|
||||||
let addr: SocketAddr = (ip, 69).into();
|
println!("Server started");
|
||||||
socket.bind(&addr.into())?;
|
|
||||||
|
|
||||||
let async_fd = AsyncFd::new(socket)?;
|
|
||||||
let mut buf = [0u8; PACKET_SIZE];
|
|
||||||
|
|
||||||
println!("Tftp server started on {addr}");
|
|
||||||
loop {
|
loop {
|
||||||
let mut guard = async_fd.readable().await?;
|
let (packet, src) = Packet::recv_from(&socket).await?;
|
||||||
|
|
||||||
let (packet, info) = match guard.try_io(|inner| inner.get_ref().recv(&mut buf)) {
|
|
||||||
Ok(Ok((_, info))) => (buf.try_into()?, info),
|
|
||||||
Ok(Err(e)) => return Err(e)?,
|
|
||||||
// Socket was not ready
|
|
||||||
Err(_would_block) => continue,
|
|
||||||
};
|
|
||||||
|
|
||||||
let callback = callback.clone();
|
let callback = callback.clone();
|
||||||
let src = info.addr_src;
|
|
||||||
tokio::spawn({
|
tokio::spawn({
|
||||||
async move {
|
async move {
|
||||||
if let Err(err) = handle_connection(info, packet, callback).await {
|
if let Err(err) = handle_connection(src, packet, callback).await {
|
||||||
println!("{src}: {err}")
|
println!("{src}: {err}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ version = "0.1.0"
|
|||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
repo_path = "1.4.1"
|
repo_path = "1.2.4"
|
||||||
schemars = { workspace = true }
|
schemars = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
crete = { path = ".." }
|
crete = { path = ".." }
|
||||||
|
|||||||
Reference in New Issue
Block a user