technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: kubernetes defaults as lists

Browse source
This commit is contained in:
Jaka Hudoklin 2017-12-20 16:55:23 +01:00
parent ba9ad5067a
commit 213d75267b
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kubernetes.nix
View file

@ -224,7 +224,7 @@ let
groupVersion = if group != "" then "${group}/${version}" else version; groupVersion = if group != "" then "${group}/${version}" else version;
in types.submodule ({name, ...}: { in types.submodule ({name, ...}: {
options = definition.options // extraOptions; options = definition.options // extraOptions;
config = mkMerge [ config = mkMerge ([
definition.config definition.config
{ {
kind = mkOptionDefault kind; kind = mkOptionDefault kind;
@ -233,13 +233,8 @@ let
# metdata.name cannot use option default, due deep config # metdata.name cannot use option default, due deep config
metadata.name = mkOptionDefault name; metadata.name = mkOptionDefault name;
} }
(mkAllDefault config.kubernetes.defaults.${groupName} 1001) ] ++ config.kubernetes.defaults.${groupName}
(mkAllDefault ( ++ config.kubernetes.defaults.all);
if hasAttr "all" config.kubernetes.defaults
then config.kubernetes.defaults.all
else {}
) 1001)
];
}); });
type = type =
@ -312,8 +307,8 @@ let
}; };
defaultOptions = mapAttrs (name: value: mkOption { defaultOptions = mapAttrs (name: value: mkOption {
type = types.attrs; type = types.listOf types.attrs;
default = {}; default = [];
}) versionOptions.${config.kubernetes.version}; }) versionOptions.${config.kubernetes.version};
in { in {
options.kubernetes.version = mkOption { options.kubernetes.version = mkOption {
@ -334,8 +329,8 @@ in {
type = types.submodule { type = types.submodule {
options = defaultOptions // { options = defaultOptions // {
all = mkOption { all = mkOption {
type = types.attrs; type = types.listOf types.attrs;
default = {}; default = [];
}; };
}; };
}; };