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