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(testing): passing of extraConfiguration

Browse source
This commit is contained in:
Jaka Hudoklin 2019-03-11 20:49:33 +01:00
parent e65d3c6c6f
commit 7da954157c
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/test.nix
View file

@ -57,7 +57,7 @@ in {
default = null; default = null;
}; };
extraConfig = mkOption { extraConfiguration = mkOption {
description = "Extra configuration for running test"; description = "Extra configuration for running test";
type = types.unspecified; type = types.unspecified;
default = {}; default = {};

7
modules/testing.nix
View file

@ -72,7 +72,7 @@ let
inherit name; inherit name;
nodes.kube = { config, pkgs, nodes, ... }: { nodes.kube = { config, pkgs, nodes, ... }: {
imports = [ kubernetesBaseConfig ]; imports = [ kubernetesBaseConfig extraConfiguration ];
services.kubernetes = { services.kubernetes = {
roles = ["master" "node"]; roles = ["master" "node"];
flannel.enable = false; flannel.enable = false;
@ -186,15 +186,16 @@ let
}; };
config = mkMerge [{ config = mkMerge [{
inherit evaled;
inherit (test) name description enable; inherit (test) name description enable;
} (mkIf config.evaled { } (mkIf (config.evaled != null) {
inherit (evaled.config.test) assertions; inherit (evaled.config.test) assertions;
success = all (el: el.assertion) config.assertions; success = all (el: el.assertion) config.assertions;
test = test =
if cfg.e2e && evaled.config.test.testScript != null if cfg.e2e && evaled.config.test.testScript != null
then mkKubernetesSingleNodeTest { then mkKubernetesSingleNodeTest {
inherit (evaled.config.test) testScript;
name = config.name; name = config.name;
inherit (evaled.config.test) testScript extraConfiguration;
} else null; } else null;
generated = mkIf (hasAttr "kubernetes" evaled.config) generated = mkIf (hasAttr "kubernetes" evaled.config)
(pkgs.writeText "${config.name}-gen.json" (builtins.toJSON evaled.config.kubernetes.generated)); (pkgs.writeText "${config.name}-gen.json" (builtins.toJSON evaled.config.kubernetes.generated));