From 6625e9c1f39c3120975249323535a85621eab13c Mon Sep 17 00:00:00 2001 From: "Ricardo (XenGi) Band" Date: Sun, 22 Feb 2026 13:34:25 +0100 Subject: [PATCH] restructure --- flake.nix | 2 +- nixosConfigurations.nix | 74 ++++++++++++++++++++++++++++++----------- 2 files changed, 56 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index db28537..5e92a7b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ nixpkgs-k8s, flake-utils, agenix, - NixVirt, + NixVirt, # k8nix, }: { diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix index 7cc9cc9..2b1d4a2 100644 --- a/nixosConfigurations.nix +++ b/nixosConfigurations.nix @@ -21,7 +21,6 @@ let #}; }; } - ./hosts/common.nix ]; mkSystem = extraModules: @@ -32,21 +31,17 @@ let mkControlPlaneNode = extraModules: mkSystem ([ - #./services/etcd.nix - #./services/k8s.nix - #./services/k8s-apiserver.nix - #./services/k8s-controller-manager.nix - #./services/k8s-kubelet.nix - #./services/k8s-proxy.nix - #./services/k8s-scheduler.nix + { + age.secrets = {}; + } ] ++ extraModules); mkWorkerNode = extraModules: mkSystem ([ - #./services/k8s.nix - #./services/k8s-kubelet.nix - #./services/k8s-proxy.nix + { + age.secrets = {}; + } ] ++ extraModules); in @@ -58,12 +53,53 @@ in ./hosts/kaede ]; }; - "master-01" = mkControlPlaneNode [ ]; - "master-02" = mkControlPlaneNode [ ]; - "master-03" = mkControlPlaneNode [ ]; - "worker-01" = mkWorkerNode [ ]; - "worker-02" = mkWorkerNode [ ]; - "worker-03" = mkWorkerNode [ ]; - "worker-04" = mkWorkerNode [ ]; - "worker-05" = mkWorkerNode [ ]; + "control-plane-01" = mkControlPlaneNode [ + { + age.secrets = {}; + } + ./hosts/control-plane-01 + ]; + "control-plane-02" = mkControlPlaneNode [ + { + 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 + ]; } +