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

Revert "feat(modules): mkAllDefault for all resources and customResources"

Browse source 
This reverts commit bd7ce4b4db.
This commit is contained in:
Jaka Hudoklin 2018-04-06 19:00:03 +02:00
parent 8a0a1ac45a
commit c7200b8ce8
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules.nix
View file

@ -164,21 +164,17 @@ in {
config = { config = {
kubernetes.resources = mkMerge ( kubernetes.resources = mkMerge (
mapAttrsToList (name: module: mapAttrsToList (name: module:
mkAllDefault ( if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name
then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name else moduleToAttrs module.configuration.kubernetes.resources
else moduleToAttrs module.configuration.kubernetes.resources
) 1000
) config.kubernetes.modules ) config.kubernetes.modules
); );
kubernetes.customResources = mkMerge ( kubernetes.customResources = mkMerge (
mapAttrsToList (name: module: mapAttrsToList (name: module:
mkAllDefault ( if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name else moduleToAttrs module.configuration.kubernetes.customResources
else moduleToAttrs module.configuration.kubernetes.customResources
) 1000
) config.kubernetes.modules ) config.kubernetes.modules
); );