Compare commits

...

5 commits

Author SHA1 Message Date
asonix ff683258c7 Add k3s16 2023-08-21 16:03:08 -05:00
asonix 1f4777f9d2 Add k3s15 2023-08-21 15:45:51 -05:00
asonix c441a3676c Add k3s14 2023-08-21 13:45:39 -05:00
asonix 6e34bb8014 Add k3s13 2023-08-21 13:21:50 -05:00
asonix dde5b3491a Update nixpkgs 2023-08-21 13:21:44 -05:00
2 changed files with 92 additions and 16 deletions

View file

@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1691472822,
"narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=",
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1690066826,
"narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=",
"lastModified": 1692492726,
"narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce45b591975d070044ca24e3003c830d26fea1c8",
"rev": "5e63e8bbc46bc4fc22254da1edaf42fc7549c18a",
"type": "github"
},
"original": {
@ -90,11 +90,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1691421349,
"narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
"lastModified": 1692525914,
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
"type": "github"
},
"original": {
@ -152,11 +152,11 @@
"rockchip": "rockchip"
},
"locked": {
"lastModified": 1691609547,
"narHash": "sha256-7H1h6qroH89IjvVZNZu1IlzO8ZqvPlT5O9Mr0UnjnRI=",
"lastModified": 1692640630,
"narHash": "sha256-jTvWsXBsj0ugrO/ys0txhQzFLYhUg0PnuvMLtkhiDNs=",
"ref": "asonix/nabam-sd-image",
"rev": "97bf2cb84ef32fc218d1efecfd5e2a12626971c9",
"revCount": 59,
"rev": "89d9495b78c10bac93dd7cee353814bf82d0a856",
"revCount": 60,
"type": "git",
"url": "https://git.asonix.dog/asonix/sd-images"
},
@ -174,11 +174,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1690199016,
"narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=",
"lastModified": 1692500916,
"narHash": "sha256-iKADqEOHmyi+LCJ5LzWcM2zH0DP3WHFETjX98blH0tE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500",
"rev": "4f0f113b7dbcb92edb9c901515fcab0b91c6def7",
"type": "github"
},
"original": {

View file

@ -714,6 +714,34 @@
serverIp = "192.168.20.120";
};
k3s13 = makeSoQuartzK3sConfig system {
hostname = "k3s13";
selfIp = "192.168.20.132";
serverIp = "192.168.20.120";
enableK3s = false;
};
k3s14 = makeSoQuartzK3sConfig system {
hostname = "k3s14";
selfIp = "192.168.20.133";
serverIp = "192.168.20.120";
enableK3s = false;
};
k3s15 = makeSoQuartzK3sConfig system {
hostname = "k3s15";
selfIp = "192.168.20.134";
serverIp = "192.168.20.120";
enableK3s = false;
};
k3s16 = makeSoQuartzK3sConfig system {
hostname = "k3s16";
selfIp = "192.168.20.135";
serverIp = "192.168.20.120";
enableK3s = false;
};
k3s-rock1 = makeRock64K3sConfig system {
hostname = "k3s-rock1";
selfIp = "192.168.20.110";
@ -879,6 +907,22 @@
ip = "192.168.20.131";
name = "k3s12";
}
{
ip = "192.168.20.132";
name = "k3s13";
}
{
ip = "192.168.20.133";
name = "k3s14";
}
{
ip = "192.168.20.134";
name = "k3s15";
}
{
ip = "192.168.20.135";
name = "k3s16";
}
]) ++ (builtins.map db [
{
ip = "192.168.20.11";
@ -998,6 +1042,22 @@
ip = "192.168.20.131";
name = "k3s12";
}
{
ip = "192.168.20.132";
name = "k3s13";
}
{
ip = "192.168.20.133";
name = "k3s14";
}
{
ip = "192.168.20.134";
name = "k3s15";
}
{
ip = "192.168.20.135";
name = "k3s16";
}
]) ++ (builtins.map db [
{
ip = "192.168.20.11";
@ -1106,6 +1166,22 @@
name = "k3s12";
ip = "192.168.20.131";
}
{
name = "k3s13";
ip = "192.168.20.132";
}
{
name = "k3s14";
ip = "192.168.20.133";
}
{
name = "k3s15";
ip = "192.168.20.134";
}
{
name = "k3s16";
ip = "192.168.20.135";
}
{
name = "k3s-quartza1";
ip = "192.168.20.160";