Revert "feat(module): allow to optionally specify if set resources as default"

This reverts commit 1e8d129bf4.
This commit is contained in:
Jaka Hudoklin 2018-04-06 18:58:20 +02:00
parent a4526cc8c3
commit 8a0a1ac45a

View file

@ -92,17 +92,11 @@ in {
}; };
prefixResources = mkOption { prefixResources = mkOption {
description = "Whether resources should be automatically prefixed with module name"; description = "Whether resources should be automatically prefix";
type = types.bool; type = types.bool;
default = true; 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 { module = mkOption {
description = "Module definition"; description = "Module definition";
}; };
@ -169,30 +163,22 @@ in {
config = { config = {
kubernetes.resources = mkMerge ( kubernetes.resources = mkMerge (
mapAttrsToList (name: module: let mapAttrsToList (name: module:
moduleDefinition = config.kubernetes.moduleDefinitions."${module.module}"; mkAllDefault (
moduleConfig = if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
if moduleDefinition.prefixResources
then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name
else moduleToAttrs module.configuration.kubernetes.resources; else moduleToAttrs module.configuration.kubernetes.resources
in ) 1000
if moduleDefinition.assignAsDefaults
then mkAllDefault moduleConfig 1000
else moduleConfig
) config.kubernetes.modules ) config.kubernetes.modules
); );
kubernetes.customResources = mkMerge ( kubernetes.customResources = mkMerge (
mapAttrsToList (name: module: let mapAttrsToList (name: module:
moduleDefinition = config.kubernetes.moduleDefinitions."${module.module}"; mkAllDefault (
moduleConfig =
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
else moduleToAttrs module.configuration.kubernetes.customResources; else moduleToAttrs module.configuration.kubernetes.customResources
in ) 1000
if moduleDefinition.assignAsDefaults
then mkAllDefault moduleConfig 1000
else moduleConfig
) config.kubernetes.modules ) config.kubernetes.modules
); );