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

This reverts commit c7200b8ce8.
This commit is contained in:
Jaka Hudoklin 2018-04-06 19:35:35 +02:00
parent c7200b8ce8
commit 76e2e36d68

View file

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