restructure

This commit is contained in:
XenGi 2026-02-22 13:34:25 +01:00
parent 1d10ef75df
commit 6625e9c1f3
Signed by: xengi
SSH key fingerprint: SHA256:jxWM2RTHvxxcncXycwwWkP7HCWb4VREN05UGJTbIPZg
2 changed files with 56 additions and 20 deletions

View file

@ -24,7 +24,7 @@
nixpkgs-k8s, nixpkgs-k8s,
flake-utils, flake-utils,
agenix, agenix,
NixVirt, NixVirt,
# k8nix, # k8nix,
}: }:
{ {

View file

@ -21,7 +21,6 @@ let
#}; #};
}; };
} }
./hosts/common.nix
]; ];
mkSystem = mkSystem =
extraModules: extraModules:
@ -32,21 +31,17 @@ let
mkControlPlaneNode = mkControlPlaneNode =
extraModules: extraModules:
mkSystem ([ mkSystem ([
#./services/etcd.nix {
#./services/k8s.nix age.secrets = {};
#./services/k8s-apiserver.nix }
#./services/k8s-controller-manager.nix
#./services/k8s-kubelet.nix
#./services/k8s-proxy.nix
#./services/k8s-scheduler.nix
] ]
++ extraModules); ++ extraModules);
mkWorkerNode = mkWorkerNode =
extraModules: extraModules:
mkSystem ([ mkSystem ([
#./services/k8s.nix {
#./services/k8s-kubelet.nix age.secrets = {};
#./services/k8s-proxy.nix }
] ]
++ extraModules); ++ extraModules);
in in
@ -58,12 +53,53 @@ in
./hosts/kaede ./hosts/kaede
]; ];
}; };
"master-01" = mkControlPlaneNode [ ]; "control-plane-01" = mkControlPlaneNode [
"master-02" = mkControlPlaneNode [ ]; {
"master-03" = mkControlPlaneNode [ ]; age.secrets = {};
"worker-01" = mkWorkerNode [ ]; }
"worker-02" = mkWorkerNode [ ]; ./hosts/control-plane-01
"worker-03" = mkWorkerNode [ ]; ];
"worker-04" = mkWorkerNode [ ]; "control-plane-02" = mkControlPlaneNode [
"worker-05" = mkWorkerNode [ ]; {
age.secrets = {};
}
./hosts/control-plane-02
];
"control-plane-03" = mkControlPlaneNode [
{
age.secrets = {};
}
./hosts/control-plane-03
];
"worker-01" = mkWorkerNode [
{
age.secrets = {};
}
./hosts/worker-01
];
"worker-02" = mkWorkerNode [
{
age.secrets = {};
}
./hosts/worker-02
];
"worker-03" = mkWorkerNode [
{
age.secrets = {};
}
./hosts/worker-03
];
"worker-04" = mkWorkerNode [
{
age.secrets = {};
}
./hosts/worker-04
];
"worker-05" = mkWorkerNode [
{
age.secrets = {};
}
./hosts/worker-05
];
} }