mirror of
https://github.com/TECHNOFAB11/kubenix.git
synced 2025-12-12 16:10:05 +01:00
Revert "Revert "feat(modules): mkAllDefault for all resources and customResources""
This reverts commit c7200b8ce8.
This commit is contained in:
parent
c7200b8ce8
commit
76e2e36d68
1 changed files with 10 additions and 6 deletions
16
modules.nix
16
modules.nix
|
|
@ -164,17 +164,21 @@ in {
|
||||||
config = {
|
config = {
|
||||||
kubernetes.resources = mkMerge (
|
kubernetes.resources = mkMerge (
|
||||||
mapAttrsToList (name: module:
|
mapAttrsToList (name: module:
|
||||||
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
|
mkAllDefault (
|
||||||
then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name
|
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
|
||||||
else moduleToAttrs module.configuration.kubernetes.resources
|
then prefixResources (moduleToAttrs module.configuration.kubernetes.resources) module.name
|
||||||
|
else moduleToAttrs module.configuration.kubernetes.resources
|
||||||
|
) 1000
|
||||||
) config.kubernetes.modules
|
) config.kubernetes.modules
|
||||||
);
|
);
|
||||||
|
|
||||||
kubernetes.customResources = mkMerge (
|
kubernetes.customResources = mkMerge (
|
||||||
mapAttrsToList (name: module:
|
mapAttrsToList (name: module:
|
||||||
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
|
mkAllDefault (
|
||||||
then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
|
if config.kubernetes.moduleDefinitions."${module.module}".prefixResources
|
||||||
else moduleToAttrs module.configuration.kubernetes.customResources
|
then prefixGroupResources (moduleToAttrs module.configuration.kubernetes.customResources) module.name
|
||||||
|
else moduleToAttrs module.configuration.kubernetes.customResources
|
||||||
|
) 1000
|
||||||
) config.kubernetes.modules
|
) config.kubernetes.modules
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue