Merge branch 'master' of github.com:xtruder/kubenix

This commit is contained in:
Jaka Hudoklin 2018-03-28 21:03:24 +02:00
commit 7208da5cba
3 changed files with 15 additions and 9 deletions

View file

@ -76,7 +76,7 @@ let
defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption {
description = "Module default configuration for ${name} module";
type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs);
type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified);
default = [];
}) config.kubernetes.moduleDefinitions;
in {
@ -110,7 +110,7 @@ in {
options = defaultModuleConfigurationOptions // {
all = mkOption {
description = "Module default configuration for all modules";
type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs);
type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified);
default = [];
};
};
@ -135,6 +135,12 @@ in {
default = "default";
};
labels = mkOption {
description = "Attribute set of module lables";
type = types.attrsOf types.str;
default = {};
};
configuration = mkOption {
description = "Module configuration";
type = submodule {