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

fix regressions due updates in nixpkgs

Browse source
This commit is contained in:
Jaka Hudoklin 2020-01-15 10:42:29 +00:00 • committed by Jaka Hudoklin
parent 1faae85426
commit 13e5edd9f9
No known key found for this signature in database
GPG key ID: D1F18234B07BD6E2
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/k8s.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
rec { rec {
# TODO: refactor into mkOptionType # TODO: refactor with mkOptionType
mkSecretOption = {description ? "", default ? {}, allowNull ? true}: mkOption { mkSecretOption = {description ? "", default ? {}, allowNull ? true}: mkOption {
inherit description; inherit description;
type = (if allowNull then types.nullOr else id) (types.submodule { type = (if allowNull then types.nullOr else id) (types.submodule {

5
modules/legacy.nix
View file

@ -49,10 +49,12 @@ let
prefixResources = resources: serviceName: prefixResources = resources: serviceName:
mapAttrs' (name: resource: nameValuePair "${serviceName}-${name}" resource) resources; mapAttrs' (name: resource: nameValuePair "${serviceName}-${name}" resource) resources;
# TODO: rewrite using mkOptionType
defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption { defaultModuleConfigurationOptions = mapAttrs (name: moduleDefinition: mkOption {
description = "Module default configuration for ${name} module"; description = "Module default configuration for ${name} module";
type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified);
default = []; default = [];
apply = filter (v: v!=[]);
}) config.kubernetes.moduleDefinitions; }) config.kubernetes.moduleDefinitions;
getModuleDefinition = name: getModuleDefinition = name:
@ -101,6 +103,7 @@ in {
description = "Module default configuration for all modules"; description = "Module default configuration for all modules";
type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified); type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified);
default = []; default = [];
apply = filter (v: v != []);
}; };
}; };
}; };
@ -150,7 +153,7 @@ in {
}; };
options.kubernetes.defaults = mkOption { options.kubernetes.defaults = mkOption {
type = types.attrsOf (types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified)); type = types.attrsOf (types.coercedTo types.attrs (value: [value]) (types.listOf types.attrs));
description = "Legacy kubenix kubernetes defaults."; description = "Legacy kubenix kubernetes defaults.";
default = {}; default = {};
}; };

1
modules/testing.nix
View file

@ -239,6 +239,7 @@ in {
example = literalExample ''{config, ...}: { example = literalExample ''{config, ...}: {
kubernetes.version = config.kubernetes.version; kubernetes.version = config.kubernetes.version;
}''; }'';
apply = filter (v: v!=[]);
default = []; default = [];
}; };