technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-13 00:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(modules): do not pass nameToModule

Browse source
This commit is contained in:
Jaka Hudoklin 2018-01-09 21:23:59 +01:00
parent 5b219efe76
commit 9d93d4c1a5
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules.nix
View file

@ -7,24 +7,13 @@ let
globalConfig = config; globalConfig = config;
mkModuleOptions = moduleDefinition: module: 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 { (import ./kubernetes.nix {
customResourceDefinitions = customResourceDefinitions =
config.kubernetes.resources.customResourceDefinitions; config.kubernetes.resources.customResourceDefinitions;
}) })
./modules.nix ./modules.nix
(nameToModule moduleDefinition.module) (moduleDefinition.module)
{ {
config.kubernetes.defaults.all.metadata.namespace = mkDefault module.namespace; config.kubernetes.defaults.all.metadata.namespace = mkDefault module.namespace;
} }