From bd7ce4b4db6fe5871b08225737dfbb0cdefde3e3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 4 Apr 2018 15:35:30 +0200
Subject: [PATCH] feat(modules): mkAllDefault for all resources and
 customResources

---
 modules.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules.nix b/modules.nix
index d7b20ce..5e9ab1a 100644
--- a/modules.nix
+++ b/modules.nix
@@ -58,7 +58,7 @@ let
       ./modules.nix
       (moduleDefinition.module)
       {
-        config.kubernetes.defaults.all.metadata.namespace = mkDefault module.namespace;
+        config.kubernetes.defaults.all.metadata.namespace = module.namespace;
       }
      ] ++ config.kubernetes.defaultModuleConfiguration.all
        ++ (optionals (hasAttr moduleDefinition.name config.kubernetes.defaultModuleConfiguration)
@@ -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
     );