allow to pass defaults as attribute sets

This commit is contained in:
Jaka Hudoklin 2017-12-23 20:13:55 +01:00
parent 70d33e20b8
commit 699511bf54
3 changed files with 16 additions and 13 deletions

View file

@ -29,7 +29,8 @@ let
) resources;
defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption {
type = types.listOf types.attrs;
description = "Module default configuration for ${name} module";
type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs);
default = [];
}) config.kubernetes.moduleDefinitions;
in {
@ -57,7 +58,7 @@ in {
options = defaultModuleConfigurationOptions // {
all = mkOption {
description = "Module default configuration for all modules";
type = types.listOf types.attrs;
type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs);
default = [];
};
};
@ -105,8 +106,8 @@ in {
) config.kubernetes.modules
);
kubernetes.defaultModuleConfiguration.all = [{
kubernetes.defaultModuleConfiguration.all = {
config.kubernetes.version = mkDefault config.kubernetes.version;
}];
};
};
}