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

fix(lib): mkSecretOption allow to pass null

Browse source
This commit is contained in:
Jaka Hudoklin 2017-12-18 12:33:16 +01:00
parent e682e31dcf
commit 73b1713fd0
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib.nix
View file

@ -57,16 +57,16 @@ rec {
type = types.str;
};
};
config = mkIf (hasAttr "default" options) (mkAllDefault options.default 1000);
} // optionalAttrs (hasAttr "default" options && options.default != null) {
config = mkAllDefault options.default 1000;
});
apply = value: {
apply = value: if value == null then null else {
valueFrom.secretKeyRef = {
inherit (value) name key;
};
};
default = {};
default = null;
});
}

8
test/modules.nix
View file

@ -15,10 +15,7 @@ with lib;
password = mkSecretOption {
description = "Nginx simple auth credentials";
default = {
name = "test";
key = "password";
};
default = null;
};
};
@ -32,7 +29,7 @@ with lib;
containerPort = config.port;
};
spec.template.spec.containers.nginx.env.name = config.password;
spec.template.spec.containers.nginx.env.name = mkIf (config.password != null) config.password;
}
];
@ -53,6 +50,7 @@ with lib;
kubernetes.modules.app-v1 = {
module = "nginx";
configuration.password.name = "test2";
configuration.password.key = "password";
};
kubernetes.modules.app-v2 = {
module = "nginx";