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

fix(modules): use customResourceDefinitions from global module

Browse source
This commit is contained in:
Jaka Hudoklin 2017-11-27 13:12:45 +01:00
parent 722e001790
commit 9b3bd3b252
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules.nix
View file

@ -8,7 +8,10 @@ let
evalK8SModule = {module, name, configuration}: evalModules {
modules = [
./kubernetes.nix ./modules.nix module configuration
(import ./kubernetes.nix {
customResourceDefinitions = config.kubernetes.resources.customResourceDefinitions;
})
./modules.nix module configuration
] ++ config.kubernetes.defaultModuleConfiguration;
args = {
inherit pkgs k8s name;
@ -88,6 +91,12 @@ in {
) config.kubernetes.modules
);
kubernetes.customResources = mkMerge (
mapAttrsToList (name: module:
prefixResources (moduleToAttrs module.evaledModule.config.kubernetes.customResources) module.name
) config.kubernetes.modules
);
kubernetes.defaultModuleConfiguration = [{
config.kubernetes.version = mkDefault config.kubernetes.version;
}];