From 76e2e36d688b9a8196ff5e1ef4dba783835368ad Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 6 Apr 2018 19:35:35 +0200 Subject: [PATCH] Revert "Revert "feat(modules): mkAllDefault for all resources and customResources"" This reverts commit c7200b8ce8cc05ba88c42d10a0885cc584ffe3a7. --- modules.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules.nix b/modules.nix index 8f219b8..c01a72a 100644 --- a/modules.nix +++ b/modules.nix @@ -164,17 +164,21 @@ in { config = { kubernetes.resources = mkMerge ( mapAttrsToList (name: module: - if config.kubernetes.moduleDefinitions."${module.module}".prefixResources - then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name - else moduleToAttrs module.configuration.kubernetes.resources + 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: - if config.kubernetes.moduleDefinitions."${module.module}".prefixResources - then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name - else moduleToAttrs module.configuration.kubernetes.customResources + 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 );