mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-12 16:10:05 +01:00
fix(modules): do not pass nameToModule
This commit is contained in:
parent
5b219efe76
commit
9d93d4c1a5
1 changed files with 2 additions and 13 deletions
15
modules.nix
15
modules.nix
|
|
@ -7,24 +7,13 @@ let
|
|||
globalConfig = config;
|
||||
|
||||
mkModuleOptions = moduleDefinition: module:
|
||||
let
|
||||
nameToModule = moduleConfig:
|
||||
if isFunction moduleConfig then
|
||||
{name, ...}@args:
|
||||
(moduleConfig (args // {
|
||||
name = module.name;
|
||||
moduleDefinition = moduleDefinition;
|
||||
module = module;
|
||||
k8s = k8s;
|
||||
})) // {_file = "module-${module.name}";}
|
||||
else {name, ...}: moduleConfig // {_file = "module-${module.name}";};
|
||||
in [
|
||||
[
|
||||
(import ./kubernetes.nix {
|
||||
customResourceDefinitions =
|
||||
config.kubernetes.resources.customResourceDefinitions;
|
||||
})
|
||||
./modules.nix
|
||||
(nameToModule moduleDefinition.module)
|
||||
(moduleDefinition.module)
|
||||
{
|
||||
config.kubernetes.defaults.all.metadata.namespace = mkDefault module.namespace;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue