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

This reverts commit bd7ce4b4db.
This commit is contained in:
Jaka Hudoklin 2018-04-06 19:00:03 +02:00
parent 8a0a1ac45a
commit c7200b8ce8

View file

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