From 8a0a1ac45a8c56ad184f050ef730c1eb929768e3 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Fri, 6 Apr 2018 18:58:20 +0200
Subject: [PATCH] Revert "feat(module): allow to optionally specify if set
 resources as default"

This reverts commit 1e8d129bf4779446bc7dd3a2157e353acf0cb785.
---
 modules.nix | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/modules.nix b/modules.nix
index a42ee12..c01a72a 100644
--- a/modules.nix
+++ b/modules.nix
@@ -92,17 +92,11 @@ in {
         };
 
         prefixResources = mkOption {
-          description = "Whether resources should be automatically prefixed with module name";
+          description = "Whether resources should be automatically prefix";
           type = types.bool;
           default = true;
         };
 
-        assignAsDefaults = mkOption {
-          description = "Whether to assign resources as defaults, this is usefull for module that add some functionality";
-          type = types.bool;
-          default = false;
-        };
-
         module = mkOption {
           description = "Module definition";
         };
@@ -169,30 +163,22 @@ in {
 
   config = {
     kubernetes.resources = mkMerge (
-      mapAttrsToList (name: module: let
-        moduleDefinition = config.kubernetes.moduleDefinitions."${module.module}";
-        moduleConfig =
-          if moduleDefinition.prefixResources
+      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;
-      in
-        if moduleDefinition.assignAsDefaults
-        then mkAllDefault moduleConfig 1000
-        else moduleConfig
+          else moduleToAttrs module.configuration.kubernetes.resources
+        ) 1000
       ) config.kubernetes.modules
     );
 
     kubernetes.customResources = mkMerge (
-      mapAttrsToList (name: module: let
-        moduleDefinition = config.kubernetes.moduleDefinitions."${module.module}";
-        moduleConfig =
+      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;
-      in
-        if moduleDefinition.assignAsDefaults
-        then mkAllDefault moduleConfig 1000
-        else moduleConfig
+          else moduleToAttrs module.configuration.kubernetes.customResources
+        ) 1000
       ) config.kubernetes.modules
     );