feat: refactor module definitions to use submodules, better defaults

This commit is contained in:
Jaka Hudoklin 2017-12-20 16:54:56 +01:00
parent 3ad7f6f8e6
commit ba9ad5067a

View file

@ -6,29 +6,33 @@ with import ./lib.nix { inherit pkgs lib; };
let let
globalConfig = config; globalConfig = config;
evalK8SModule = {module, name, configuration}: evalModules { mkModuleOptions = moduleDefinition: module:
modules = [ let
nameToModule = moduleConfig:
if isFunction moduleConfig then
{name, ...}@args:
(moduleConfig (args // {name = module.name;})) // {_file = "module-${module.name}";}
else {name, ...}: moduleConfig // {_file = "module-${module.name}";};
in [
(import ./kubernetes.nix { (import ./kubernetes.nix {
customResourceDefinitions = config.kubernetes.resources.customResourceDefinitions; customResourceDefinitions =
config.kubernetes.resources.customResourceDefinitions;
}) })
./modules.nix module configuration ./modules.nix (nameToModule moduleDefinition.module)
] ++ config.kubernetes.defaultModuleConfiguration; ] ++ config.kubernetes.defaultModuleConfiguration.all
args = { ++ (optionals (hasAttr moduleDefinition.name config.kubernetes.defaultModuleConfiguration)
inherit pkgs k8s name; config.kubernetes.defaultModuleConfiguration.${moduleDefinition.name});
};
};
prefixResources = resources: serviceName: prefixResources = resources: serviceName:
mapAttrs (groupName: resources: mapAttrs (groupName: resources:
mapAttrs' (name: resource: nameValuePair "${serviceName}-${name}" resource) resources mapAttrs' (name: resource: nameValuePair "${serviceName}-${name}" resource) resources
) resources; ) resources;
in {
options.kubernetes.defaultModuleConfiguration = mkOption {
description = "Default configuration for kubernetes modules";
type = types.listOf types.attrs;
default = {};
};
defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption {
type = types.listOf types.attrs;
default = [];
}) config.kubernetes.moduleDefinitions;
in {
options.kubernetes.moduleDefinitions = mkOption { options.kubernetes.moduleDefinitions = mkOption {
description = "Attribute set of module definitions"; description = "Attribute set of module definitions";
default = {}; default = {};
@ -47,6 +51,20 @@ in {
})); }));
}; };
options.kubernetes.defaultModuleConfiguration = mkOption {
description = "Module default options";
type = types.submodule {
options = defaultModuleConfigurationOptions // {
all = mkOption {
description = "Module default configuration for all modules";
type = types.listOf types.attrs;
default = [];
};
};
};
default = {};
};
options.kubernetes.modules = mkOption { options.kubernetes.modules = mkOption {
description = "Attribute set of module definitions"; description = "Attribute set of module definitions";
default = {}; default = {};
@ -60,7 +78,9 @@ in {
configuration = mkOption { configuration = mkOption {
description = "Module configuration"; description = "Module configuration";
type = types.attrs; type = types.submodule {
imports = mkModuleOptions globalConfig.kubernetes.moduleDefinitions.${config.module} config;
};
default = {}; default = {};
}; };
@ -68,18 +88,6 @@ in {
description = "Name of the module to use"; description = "Name of the module to use";
type = types.str; type = types.str;
}; };
evaledModule = mkOption {
description = "Evaluated config";
internal = true;
};
};
config = {
evaledModule = (evalK8SModule {
module = globalConfig.kubernetes.moduleDefinitions.${config.module}.module;
inherit (config) name configuration;
});
}; };
})); }));
}; };
@ -87,17 +95,17 @@ in {
config = { config = {
kubernetes.resources = mkMerge ( kubernetes.resources = mkMerge (
mapAttrsToList (name: module: mapAttrsToList (name: module:
prefixResources (moduleToAttrs module.evaledModule.config.kubernetes.resources) module.name prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name
) config.kubernetes.modules ) config.kubernetes.modules
); );
kubernetes.customResources = mkMerge ( kubernetes.customResources = mkMerge (
mapAttrsToList (name: module: mapAttrsToList (name: module:
prefixResources (moduleToAttrs module.evaledModule.config.kubernetes.customResources) module.name prefixResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
) config.kubernetes.modules ) config.kubernetes.modules
); );
kubernetes.defaultModuleConfiguration = [{ kubernetes.defaultModuleConfiguration.all = [{
config.kubernetes.version = mkDefault config.kubernetes.version; config.kubernetes.version = mkDefault config.kubernetes.version;
}]; }];
}; };