diff --git a/modules/k3s/default.nix b/modules/k3s/default.nix index 768daf7..ae57466 100644 --- a/modules/k3s/default.nix +++ b/modules/k3s/default.nix @@ -35,7 +35,7 @@ in token = config.sops.secrets.k3s_token.path; clusterInit = mkIf cfg.initServer true; serverAddr = mkIf (!cfg.initServer) "https://10.5.0.103:6443"; - # manifests = import ./manifests.nix { inherit lib cfg } + manifests = import ./manifests.nix { inherit lib cfg inputs } }; }; } \ No newline at end of file diff --git a/modules/k3s/deployments/default.nix b/modules/k3s/deployments/default.nix index 4922150..0a42c8e 100644 --- a/modules/k3s/deployments/default.nix +++ b/modules/k3s/deployments/default.nix @@ -1,8 +1,8 @@ -{ cfg, lib, ... }: +{ cfg, lib, inputs, ... }: let manifests = [ - + "./ubuntu.nix" ]; - imported = map ( n: import ${n} { inherit cfg, lib } ) manifests; + imported = map ( n: import ${n} { inherit cfg lib inputs } ) manifests; in lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file diff --git a/modules/k3s/deployments/ubuntu.nix b/modules/k3s/deployments/ubuntu.nix new file mode 100644 index 0000000..de58f82 --- /dev/null +++ b/modules/k3s/deployments/ubuntu.nix @@ -0,0 +1,14 @@ +{cfg, lib, inputs, ...}: +{ + ubuntu.content = { + apiVersion = "v1"; + kind = "Pod"; + metadata.name = "ubuntu"; + spec.containers = [ + { + name = "ubuntu"; + image = "ubuntu:latest"; + } + ]; + }; +} \ No newline at end of file diff --git a/modules/k3s/services/default.nix b/modules/k3s/services/default.nix index f916720..2c919f6 100644 --- a/modules/k3s/services/default.nix +++ b/modules/k3s/services/default.nix @@ -1,8 +1,8 @@ -{ cfg, lib, ... }: +{ cfg, lib, inputs, ... }: let manifests = [ - + "" ]; - imported = map ( n: import ${n} { inherit cfg, lib } ) manifests; + imported = map ( n: import ${n} { inherit cfg lib inputs } ) manifests; in lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file