mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-13 00:20:07 +01:00
fix(modules): fix customResources
This commit is contained in:
parent
3eb8bc0731
commit
d582830627
4 changed files with 56 additions and 20 deletions
12
modules.nix
12
modules.nix
|
|
@ -54,10 +54,7 @@ let
|
|||
_module.args.name = module.name;
|
||||
_module.args.module = module;
|
||||
}
|
||||
(import ./kubernetes.nix {
|
||||
customResourceDefinitions =
|
||||
config.kubernetes.resources.customResourceDefinitions;
|
||||
})
|
||||
./kubernetes.nix
|
||||
./modules.nix
|
||||
(moduleDefinition.module)
|
||||
{
|
||||
|
|
@ -72,6 +69,11 @@ let
|
|||
mapAttrs' (name: resource: nameValuePair "${serviceName}-${name}" resource) resources
|
||||
) resources;
|
||||
|
||||
prefixGroupResources = resources: serviceName:
|
||||
mapAttrs' (groupName: resources:
|
||||
nameValuePair "${serviceName}-${groupName}" resources
|
||||
) resources;
|
||||
|
||||
defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption {
|
||||
description = "Module default configuration for ${name} module";
|
||||
type = types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs);
|
||||
|
|
@ -153,7 +155,7 @@ in {
|
|||
|
||||
kubernetes.customResources = mkMerge (
|
||||
mapAttrsToList (name: module:
|
||||
prefixResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
|
||||
prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
|
||||
) config.kubernetes.modules
|
||||
);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue