From 1bd3fe4d4e6bcde6345968a9554934b6b0bac00f Mon Sep 17 00:00:00 2001
From: David Arnold <dar@xoe.solutions>
Date: Thu, 6 May 2021 16:07:24 -0400
Subject: [PATCH] fixups

---
 modules/testing.nix                           | 406 ------------------
 modules/testing/default.nix                   |   4 +-
 modules/testing/driver/kubetest.nix           |   4 +-
 .../testing/driver/kubetest/test-options.nix  |  28 --
 .../driver/kubetest/testing-options.nix       |  15 -
 modules/testing/{test.nix => evalTest.nix}    |  51 +--
 modules/testing/runtime/nixos-k8s.nix         |  11 +
 modules/testing/test-options.nix              |  16 -
 release.nix                                   |  10 +-
 tests/default.nix                             |   3 +-
 tests/helm/simple.nix                         |   4 +-
 tests/istio/bookinfo.nix                      |   4 +-
 tests/k8s/crd.nix                             |   4 +-
 tests/k8s/defaults.nix                        |   4 +-
 tests/k8s/deployment-k3s.nix                  |  70 ---
 tests/k8s/deployment.nix                      |   1 -
 tests/k8s/imports.nix                         |   4 +-
 tests/k8s/order.nix                           |   4 +-
 tests/k8s/simple.nix                          |   4 +-
 tests/legacy/crd.nix                          |   3 +-
 tests/legacy/k8s.nix                          |   4 +-
 tests/legacy/modules.nix                      |   4 +-
 22 files changed, 49 insertions(+), 609 deletions(-)
 delete mode 100644 modules/testing.nix
 delete mode 100644 modules/testing/driver/kubetest/test-options.nix
 delete mode 100644 modules/testing/driver/kubetest/testing-options.nix
 rename modules/testing/{test.nix => evalTest.nix} (88%)
 delete mode 100644 tests/k8s/deployment-k3s.nix

diff --git a/modules/testing.nix b/modules/testing.nix
deleted file mode 100644
index 923f50a..0000000
--- a/modules/testing.nix
+++ /dev/null
@@ -1,406 +0,0 @@
-{ nixosPath, config, pkgs, lib, kubenix, ... }:
-
-with lib;
-
-let
-  cfg = config.testing;
-  k3s = pkgs.k3s;
-  k3sAirgapImages = pkgs.callPackage ./k3s-airgap-images.nix {};
-  toJSONFile = content: builtins.toFile "json" (builtins.toJSON content);
-
-  nixosTesting = import "${nixosPath}/lib/testing-python.nix" {
-    inherit pkgs;
-    system = "x86_64-linux";
-  };
-
-  kubernetesBaseConfig = { modulesPath, config, pkgs, lib, nodes, ... }: let
-    master = findFirst
-      (node: any (role: role == "master") node.config.services.kubernetes.roles)
-      (throw "no master node")
-      (attrValues nodes);
-    extraHosts = ''
-      ${master.config.networking.primaryIPAddress}  etcd.${config.networking.domain}
-      ${master.config.networking.primaryIPAddress}  api.${config.networking.domain}
-      ${concatMapStringsSep "\n"
-        (node: let n = node.config.networking; in "${n.primaryIPAddress}  ${n.hostName}.${n.domain}")
-        (attrValues nodes)}
-    '';
-  in {
-    imports = [ "${toString modulesPath}/profiles/minimal.nix" ];
-
-    config = mkMerge [{
-      boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*";
-      virtualisation.memorySize = mkDefault 2048;
-      virtualisation.cores = mkDefault 16;
-      virtualisation.diskSize = mkDefault 4096;
-      networking = {
-        inherit extraHosts;
-        domain = "my.xzy";
-        nameservers = ["10.0.0.254"];
-        firewall = {
-          allowedTCPPorts = [
-            10250 # kubelet
-          ];
-          trustedInterfaces = ["docker0" "cni0"];
-
-          extraCommands = concatMapStrings  (node: ''
-            iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
-          '') (attrValues nodes);
-        };
-      };
-      environment.systemPackages = [ pkgs.kubectl ];
-      environment.variables.KUBECONFIG = "/etc/kubernetes/cluster-admin.kubeconfig";
-      services.flannel.iface = "eth1";
-      services.kubernetes = {
-        easyCerts = true;
-        apiserver = {
-          securePort = 443;
-          advertiseAddress = master.config.networking.primaryIPAddress;
-        };
-        masterAddress = "${master.config.networking.hostName}.${master.config.networking.domain}";
-      };
-
-      systemd.extraConfig = "DefaultLimitNOFILE=1048576";
-
-      systemd.services.copy-certs = {
-        description = "Share k8s certificates with host";
-        script = "cp -rf /var/lib/kubernetes/secrets /tmp/xchg/";
-        after = [ "kubernetes.target" ];
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-        };
-      };
-    }
-    (mkIf (any (role: role == "master") config.services.kubernetes.roles) {
-      networking.firewall.allowedTCPPorts = [
-        443 # kubernetes apiserver
-      ];
-    })];
-  };
-
-  mkKubernetesSingleNodeTest = { name, testScript, extraConfiguration ? {} }:
-    nixosTesting.makeTest {
-      inherit name;
-
-      nodes.kube = { config, pkgs, nodes, ... }: {
-        imports = [ kubernetesBaseConfig extraConfiguration ];
-        services.kubernetes = {
-          roles = ["master" "node"];
-          flannel.enable = false;
-          kubelet = {
-            networkPlugin = "cni";
-            cni.config = [{
-              name = "mynet";
-              type = "bridge";
-              bridge = "cni0";
-              addIf = true;
-              ipMasq = true;
-              isGateway = true;
-              ipam = {
-                type = "host-local";
-                subnet = "10.1.0.0/16";
-                gateway = "10.1.0.1";
-                routes = [{
-                  dst = "0.0.0.0/0";
-                }];
-              };
-            }];
-          };
-        };
-        networking.primaryIPAddress = mkForce "192.168.1.1";
-      };
-
-      skipLint = true;
-
-      testScript = ''
-        start_all()
-
-        kube.wait_until_succeeds("kubectl get node kube.my.xzy | grep -w Ready")
-
-        ${testScript}
-      '';
-    };
-
-  k3sBaseConfig = { modulesPath, config, pkgs, lib, nodes, ... }: let
-    extraHosts = ''
-      ${concatMapStringsSep "\n"
-        (node: let n = node.config.networking; in "${n.primaryIPAddress}  ${n.hostName}.${n.domain}")
-        (attrValues nodes)}
-    '';
-  in {
-    imports = [ "${toString modulesPath}/profiles/minimal.nix" ];
-
-    config = mkMerge [{
-      virtualisation.memorySize = mkDefault 2048;
-      virtualisation.cores = mkDefault 16;
-      virtualisation.diskSize = mkDefault 4096;
-      virtualisation.docker.enable = true;
-      networking = {
-        inherit extraHosts;
-        domain = "my.xzy";
-        nameservers = ["10.43.0.10"];
-        firewall = {
-          trustedInterfaces = ["docker0" "cni0"];
-
-          extraCommands = concatMapStrings  (node: ''
-            iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
-          '') (attrValues nodes);
-        };
-      };
-      environment.systemPackages = [ pkgs.kubectl pkgs.docker k3s ];
-      environment.variables.KUBECONFIG = "/etc/rancher/k3s/k3s.yaml";
-      systemd.extraConfig = "DefaultLimitNOFILE=1048576";
-      systemd.services.seed-docker-images = {
-        description = "Copy k3s airgap images, and services.kubernetes.kubelet.seedDockerImages";
-        wantedBy = ["k3s.service"];
-        serviceConfig = {
-          Type = "oneshot";
-          ExecStart = [
-            "${pkgs.docker}/bin/docker load --input='${k3sAirgapImages}'"
-          ] ++ builtins.map 
-            (image : "${pkgs.docker}/bin/docker load --input='${image}'") 
-            config.services.kubernetes.kubelet.seedDockerImages;
-        };
-      };
-      systemd.services.k3s = {
-        description = "Lightweight Kubernetes";
-        wantedBy = ["multi-user.target"];
-        after = ["network-online.target" "seed-docker-images.service"];
-        
-        serviceConfig = {
-          # setting --service-cidr 10.0.0.0/24 --cluster-dns 10.0.0.254
-          # was flakey, removed and hard coding nameservers to default value
-          ExecStart = "${k3s}/bin/k3s server --docker";
-          Type = "notify";
-          KillMode = "process";
-          Delegate = "yes";
-          LimitNOFILE = "infinity";
-          LimitNPROC = "infinity";
-          LimitCORE = "infinity";
-          TasksMax = "infinity";
-          TimeoutStartSec = "0";
-          Restart = "always";
-          RestartSec = "5s";
-        };
-      };
-    }
-    (mkIf (any (role: role == "master") config.services.kubernetes.roles) {
-      networking.firewall.allowedTCPPorts = [
-        443 # kubernetes apiserver
-      ];
-    })];
-  };
-
-  mkK3sTest = { name, testScript, extraConfiguration ? {} }:
-  
-    nixosTesting.makeTest {
-      inherit name;
-      
-      nodes.kube = { config, pkgs, nodes, ... }: {
-        imports = [ k3sBaseConfig extraConfiguration ];
-        networking.primaryIPAddress = mkForce "192.168.1.1";
-      };
-
-      skipLint = true;
-
-      testScript = ''
-        start_all()
-
-        kube.wait_for_unit('k3s.service')
-        kube.wait_until_succeeds("kubectl get node kube | grep -w Ready")
-
-        ${testScript}
-      '';
-    };
-  testOptions = { config, ... }: let
-    modules = [config.module ./test.nix ./base.nix {
-      config = {
-        kubenix.project = mkDefault config.name;
-        _module.args = {
-          test = config;
-        } // cfg.args;
-      };
-    }] ++ cfg.defaults;
-
-    test = (kubenix.evalModules {
-      check = false;
-      inherit modules;
-    }).config.test;
-
-    evaled' = kubenix.evalModules {
-      inherit modules;
-    };
-
-    evaled =
-      if cfg.throwError then evaled'
-      else if (builtins.tryEval evaled'.config.test.assertions).success then evaled' else null;
-  in {
-    options = {
-      name = mkOption {
-        description = "test name";
-        type = types.str;
-        internal = true;
-      };
-
-      description = mkOption {
-        description = "test description";
-        type = types.str;
-        internal = true;
-      };
-
-      enable = mkOption {
-        description = "Whether to enable test";
-        type = types.bool;
-        internal = true;
-      };
-
-      module = mkOption {
-        description = "Module defining submodule";
-        type = types.unspecified;
-      };
-
-      evaled = mkOption {
-        description = "Test evaulation result";
-        type = types.nullOr types.attrs;
-        internal = true;
-      };
-
-      success = mkOption {
-        description = "Whether test was success";
-        type = types.bool;
-        internal = true;
-        default = false;
-      };
-
-      assertions = mkOption {
-        description = "Test result";
-        type = types.unspecified;
-        internal = true;
-        default = [];
-      };
-
-      test = mkOption {
-        description = "Test derivation to run";
-        type = types.nullOr types.package;
-        default = null;
-      };
-
-      result = mkOption {
-        description = "Test result";
-        type = types.package;
-      };
-    };
-
-    config = mkMerge [{
-      inherit evaled;
-      inherit (test) name description enable;
-      result = pkgs.runCommand "${cfg.name}-${config.name}-test.json" {
-        buildInputs = [ pkgs.jshon pkgs.jq ];
-      } ''
-        jshon -n object \
-          -s "${config.name}" -i name \
-          -s "${config.description}" -i description \
-          -n "${if config.success then "true" else "false"}" -i success \
-          ${if config.test == null then "-n null" else "-s '${config.test}'"} -i test > result.json
-
-        jq -s '.[0].assertions = .[1] | .[0]' result.json ${toJSONFile (map (getAttrs ["assertion" "message"]) config.assertions)} > $out
-      '';
-    } (mkIf (config.evaled != null) {
-      inherit (evaled.config.test) assertions;
-      success = all (el: el.assertion) config.assertions;
-      test =
-        if cfg.e2e && evaled.config.test.testScript != null
-        then 
-          if evaled.config.test.distro == null || 
-             evaled.config.test.distro == "nixos" then 
-            mkKubernetesSingleNodeTest {
-              name = config.name;
-              inherit (evaled.config.test) testScript extraConfiguration;
-            }
-          else if evaled.config.test.distro == "k3s" then
-            mkK3sTest {
-              name = config.name;
-              inherit (evaled.config.test) testScript extraConfiguration;
-            }
-          else throw "invalid test.distro ${evaled.config.test.distro}"
-        else null;
-    })];
-  };
-in {
-  options = {
-    testing.name = mkOption {
-      description = "Testing suite name";
-      type = types.str;
-      default = "default";
-    };
-
-    testing.throwError = mkOption {
-      description = "Whether to throw error";
-      type = types.bool;
-      default = true;
-    };
-
-    testing.e2e = mkOption {
-      description = "Whether to enable e2e tests";
-      type = types.bool;
-      default = true;
-    };
-
-    testing.defaults = mkOption {
-      description = "Testing defaults";
-      type = types.coercedTo types.unspecified (value: [value]) (types.listOf types.unspecified);
-      example = literalExample ''{config, ...}: {
-        kubernetes.version = config.kubernetes.version;
-      }'';
-      apply = filter (v: v!=[]);
-      default = [];
-    };
-
-    testing.tests = mkOption {
-      description = "List of test cases";
-      default = [];
-      type = types.listOf (types.coercedTo types.path (module: {inherit module;}) (types.submodule testOptions));
-      apply = tests: filter (test: test.enable) tests;
-    };
-
-    testing.args = mkOption {
-      description = "Attribute set of extra args passed to tests";
-      type = types.attrs;
-      default = {};
-    };
-
-    testing.testsByName = mkOption {
-      description = "Tests by name";
-      type = types.attrsOf types.attrs;
-      default = listToAttrs (map (test: nameValuePair test.name test) cfg.tests);
-    };
-
-    testing.success = mkOption {
-      description = "Whether testing was a success";
-      type = types.bool;
-      default = all (test: test.success) cfg.tests;
-    };
-
-    testing.results = mkOption {
-      description = "Test results";
-      type = types.attrsOf types.package;
-      default = mapAttrs (_: t: t.result) cfg.testsByName;
-    };
-
-    testing.result = mkOption {
-      description = "Testing results";
-      type = types.package;
-      default = pkgs.runCommand "${cfg.name}-test-results.json" {
-        buildInputs = [ pkgs.jq ];
-      } ''
-        jq -s -r '.' ${concatMapStringsSep " " (t: t.result) cfg.tests} > tests.json
-        jq -n \
-          --rawfile tests tests.json \
-          --argjson success `jq -s -r 'if all(.success) == true then true else false end' ${concatMapStringsSep " " (t: t.result) cfg.tests}` \
-          '{"success": $success, "tests": $tests | fromjson }' > $out
-      '';
-    };
-  };
-}
diff --git a/modules/testing/default.nix b/modules/testing/default.nix
index 5651437..72f3e7c 100644
--- a/modules/testing/default.nix
+++ b/modules/testing/default.nix
@@ -6,7 +6,7 @@ let
   cfg = config.testing;
 
   testModule = {
-    imports = [ ./test.nix ];
+    imports = [ ./evalTest.nix ];
 
     # passthru testing configuration
     config._module.args = {
@@ -86,12 +86,14 @@ in {
     };
 
     success = mkOption {
+      internal = true; # read only property
       description = "Whether testing was a success";
       type = types.bool;
       default = all (test: test.success) cfg.tests;
     };
 
     testScript = mkOption {
+      internal = true; # set by test driver
       type = types.package;
       description = "Script to run e2e tests";
     };
diff --git a/modules/testing/driver/kubetest.nix b/modules/testing/driver/kubetest.nix
index 8214dde..04a7317 100644
--- a/modules/testing/driver/kubetest.nix
+++ b/modules/testing/driver/kubetest.nix
@@ -18,9 +18,9 @@ let
       ${cfg.defaultHeader}
       ${t.script}
     ''
-    else p.script;
+    else t.script;
 
-  tests = pkgs.linkFarm "${testing.name}-tests" (map (t: {
+  tests = builtins.trace testing pkgs.linkFarm "${testing.name}-tests" (map (t: {
     path = toTestScript t;
     name = "${t.name}_test.py";
   }) testing.tests);
diff --git a/modules/testing/driver/kubetest/test-options.nix b/modules/testing/driver/kubetest/test-options.nix
deleted file mode 100644
index 2206695..0000000
--- a/modules/testing/driver/kubetest/test-options.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, config, ... }:
-
-with lib;
-
-let
-  cfg = config.kubetest;
-
-in {
-  options.test.kubetest = {
-    enable = mkOption {
-      description = "Whether to use kubetest test driver";
-      type = types.bool;
-      default = cfg.testScript != "";
-    };
-
-    testScript = mkOption {
-      type = types.lines;
-      description = "Test script to use for kubetest";
-      default = "";
-    };
-
-    extraPackages = mkOption {
-      type = types.listOf types.package;
-      description = "List of extra packages to use for kubetest";
-      default = [];
-    };
-  };
-}
diff --git a/modules/testing/driver/kubetest/testing-options.nix b/modules/testing/driver/kubetest/testing-options.nix
deleted file mode 100644
index 6d5a985..0000000
--- a/modules/testing/driver/kubetest/testing-options.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, config, ... }:
-
-with lib;
-
-{
-  options.testing.kubetest = {
-    defaultHeader = mkOption {
-      description = "Default test header";
-      type = types.lines;
-      default = ''
-        import pytest
-      '';
-    };
-  };
-}
diff --git a/modules/testing/test.nix b/modules/testing/evalTest.nix
similarity index 88%
rename from modules/testing/test.nix
rename to modules/testing/evalTest.nix
index 38185e5..3d2d28a 100644
--- a/modules/testing/test.nix
+++ b/modules/testing/evalTest.nix
@@ -55,29 +55,7 @@ let
     then evaled' else null;
 
 in {
-  imports = [
-    ./driver/kubetest.nix
-  ];
-
   options = {
-    name = mkOption {
-      description = "test name";
-      type = types.str;
-      internal = true;
-    };
-
-    description = mkOption {
-      description = "test description";
-      type = types.str;
-      internal = true;
-    };
-
-    enable = mkOption {
-      description = "Whether to enable test";
-      type = types.bool;
-      internal = true;
-    };
-
     module = mkOption {
       description = "Module defining kubenix test";
       type = types.unspecified;
@@ -96,6 +74,25 @@ in {
       default = false;
     };
 
+    # transparently forwarded from the test's `test` attribute for ease of access
+    name = mkOption {
+      description = "test name";
+      type = types.str;
+      internal = true;
+    };
+
+    description = mkOption {
+      description = "test description";
+      type = types.str;
+      internal = true;
+    };
+
+    enable = mkOption {
+      description = "Whether to enable test";
+      type = types.bool;
+      internal = true;
+    };
+
     assertions = mkOption {
       description = "Test result";
       type = types.unspecified;
@@ -109,26 +106,20 @@ in {
       internal = true;
     };
 
-    driver = mkOption {
-      description = "Name of the driver to use for testing";
-      type = types.str;
-      internal = true;
-    };
   };
 
   config = mkMerge [
     {
       inherit evaled;
-      inherit (testConfig) name description enable driver;
+      inherit (testConfig) name description enable;
     }
 
     # if test is evaled check assertions
     (mkIf (config.evaled != null) {
-      inherit (evaled.config.test) assertions;
+      inherit (evaled.config.test) assertions script;
 
       # if all assertions are true, test is successfull
       success = all (el: el.assertion) config.assertions;
-      script = evaled.config.test.script;
     })
   ];
 }
diff --git a/modules/testing/runtime/nixos-k8s.nix b/modules/testing/runtime/nixos-k8s.nix
index 31b5121..013beec 100644
--- a/modules/testing/runtime/nixos-k8s.nix
+++ b/modules/testing/runtime/nixos-k8s.nix
@@ -61,6 +61,17 @@ let
         };
 
         systemd.extraConfig = "DefaultLimitNOFILE=1048576";
+
+        systemd.services.copy-certs = {
+          description = "Share k8s certificates with host";
+          script = "cp -rf /var/lib/kubernetes/secrets /tmp/xchg/";
+          after = [ "kubernetes.target" ];
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig = {
+            Type = "oneshot";
+            RemainAfterExit = true;
+          };
+        };
       }
 
       # configuration only applied on master nodes
diff --git a/modules/testing/test-options.nix b/modules/testing/test-options.nix
index 296a2c1..24afdb3 100644
--- a/modules/testing/test-options.nix
+++ b/modules/testing/test-options.nix
@@ -52,21 +52,5 @@ in {
       type = types.nullOr (types.either types.lines types.path);
     };
 
-    testScript = mkOption {
-      description = "Script to run as part of testing";
-      type = types.nullOr types.lines;
-      default = null;
-    };
-
-    distro = mkOption {
-      description = "Kubernetes distro to run the test with. Defaults to 'nixos', other option is 'k3s'";
-      type = types.nullOr types.str;
-      default = null;
-    };
-
-    driver = mkOption {
-      description = "Name of the driver to use for testing";
-      type = types.str;
-    };
   };
 }
diff --git a/release.nix b/release.nix
index ec08b90..93eb2a7 100644
--- a/release.nix
+++ b/release.nix
@@ -4,7 +4,6 @@ in
 { pkgs ? import (fetch "nixpkgs") { }
 , nixosPath ? toString (fetch "nixpkgs") + "/nixos"
 , lib ? pkgs.lib
-, e2e ? true
 , throwError ? true
 }:
 
@@ -28,7 +27,7 @@ let
   };
 
   runK8STests = k8sVersion: import ./tests {
-    inherit pkgs lib kubenix k8sVersion e2e throwError nixosPath;
+    inherit pkgs lib kubenix k8sVersion throwError nixosPath;
   };
 in
 rec {
@@ -69,13 +68,6 @@ rec {
     k8s-1_21 = runK8STests "1.21";
   };
 
-  test-results = pkgs.recurseIntoAttrs (mapAttrs
-    (_: t: pkgs.recurseIntoAttrs {
-      results = pkgs.recurseIntoAttrs t.results;
-      result = t.result;
-    })
-    tests);
-
   test-check =
     if !(all (test: test.success) (attrValues tests))
     then throw "tests failed"
diff --git a/tests/default.nix b/tests/default.nix
index 8ab2982..f76bd8b 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -4,7 +4,7 @@
 
 , nixosPath ? toString <nixpkgs/nixos>
 
-, k8sVersion ? "1.18"
+, k8sVersion ? "1.21"
 , registryUrl ? throw "Registry url not defined"
 , throwError ? true # whether any testing error should throw an error
 , enabledTests ? null }:
@@ -26,7 +26,6 @@ let
           tests = [
             ./k8s/simple.nix
             ./k8s/deployment.nix
-            ./k8s/deployment-k3s.nix
             #  ./k8s/crd.nix # flaky
             ./k8s/defaults.nix
             ./k8s/order.nix
diff --git a/tests/helm/simple.nix b/tests/helm/simple.nix
index 8d05044..1f272a1 100644
--- a/tests/helm/simple.nix
+++ b/tests/helm/simple.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, kubenix, helm, k8sVersion, ... }:
+{ config, lib, pkgs, kubenix, helm, ... }:
 
 with lib;
 with kubenix.lib;
@@ -61,8 +61,6 @@ in {
     '';
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.resources.namespaces.test = {};
 
   kubernetes.helm.instances.app-psql = {
diff --git a/tests/istio/bookinfo.nix b/tests/istio/bookinfo.nix
index ba46713..269bca8 100644
--- a/tests/istio/bookinfo.nix
+++ b/tests/istio/bookinfo.nix
@@ -1,4 +1,4 @@
-{ config, kubenix, k8sVersion, ... }:
+{ config, kubenix, ... }:
 
 {
   imports = with kubenix.modules; [ test k8s istio ];
@@ -8,8 +8,6 @@
     description = "Simple istio bookinfo application (WIP)";
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.api."networking.istio.io"."v1alpha3" = {
     Gateway."bookinfo-gateway" = {
       spec = {
diff --git a/tests/k8s/crd.nix b/tests/k8s/crd.nix
index a1cf54d..0a0230c 100644
--- a/tests/k8s/crd.nix
+++ b/tests/k8s/crd.nix
@@ -1,4 +1,4 @@
-{ config, lib, kubenix, pkgs, k8sVersion, ... }:
+{ config, lib, kubenix, pkgs, ... }:
 
 with lib;
 
@@ -23,8 +23,6 @@ in {
     '';
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.customTypes = [
     {
       group = "stable.example.com";
diff --git a/tests/k8s/defaults.nix b/tests/k8s/defaults.nix
index 52a1a1e..7a5a230 100644
--- a/tests/k8s/defaults.nix
+++ b/tests/k8s/defaults.nix
@@ -1,4 +1,4 @@
-{ config, lib, kubenix, k8sVersion, ... }:
+{ config, lib, kubenix, ... }:
 
 with lib;
 
@@ -23,8 +23,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.resources.pods.pod1 = {};
 
   kubernetes.resources.pods.pod2 = {
diff --git a/tests/k8s/deployment-k3s.nix b/tests/k8s/deployment-k3s.nix
deleted file mode 100644
index 738088d..0000000
--- a/tests/k8s/deployment-k3s.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ config, lib, pkgs, kubenix, images, k8sVersion, ... }:
-
-with lib;
-
-let
-  cfg = config.kubernetes.api.resources.deployments.nginx;
-  image = images.nginx;
-in {
-  imports = [ kubenix.modules.test kubenix.modules.k8s kubenix.modules.docker ];
-
-  test = {
-    distro = "k3s";
-    name = "k8s-deployment-k3s";
-    description = "Simple k8s testing a simple deployment";
-    assertions = [{
-      message = "should have correct apiVersion and kind set";
-      assertion =
-        if ((builtins.compareVersions config.kubernetes.version "1.7") <= 0)
-        then cfg.apiVersion == "apps/v1beta1"
-        else if ((builtins.compareVersions config.kubernetes.version "1.8") <= 0)
-        then cfg.apiVersion == "apps/v1beta2"
-        else cfg.apiVersion == "apps/v1";
-    } {
-      message = "should have corrent kind set";
-      assertion = cfg.kind == "Deployment";
-    } {
-      message = "should have replicas set";
-      assertion = cfg.spec.replicas == 10;
-    }];
-    extraConfiguration = {
-      environment.systemPackages = [ pkgs.curl ];
-      services.kubernetes.kubelet.seedDockerImages = config.docker.export;
-    };
-    testScript = ''
-      kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}")
-
-      kube.succeed("kubectl get deployment | grep -i nginx")
-      kube.wait_until_succeeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10")
-      kube.wait_until_succeeds("curl http://nginx.default.svc.cluster.local | grep -i hello")
-    '';
-  };
-
-  docker.images.nginx.image = image;
-
-  kubernetes.version = k8sVersion;
-
-  kubernetes.resources.deployments.nginx = {
-    spec = {
-      replicas = 10;
-      selector.matchLabels.app = "nginx";
-      template.metadata.labels.app = "nginx";
-      template.spec = {
-        containers.nginx = {
-          image = config.docker.images.nginx.path;
-          imagePullPolicy = "Never";
-        };
-      };
-    };
-  };
-
-  kubernetes.resources.services.nginx = {
-    spec = {
-      ports = [{
-        name = "http";
-        port = 80;
-      }];
-      selector.app = "nginx";
-    };
-  };
-}
diff --git a/tests/k8s/deployment.nix b/tests/k8s/deployment.nix
index af8a8eb..7b60d40 100644
--- a/tests/k8s/deployment.nix
+++ b/tests/k8s/deployment.nix
@@ -42,7 +42,6 @@ in {
       message = "should have replicas set";
       assertion = cfg.spec.replicas == 3;
     }];
-    driver = "kubetest";
     script = ''
       import time
 
diff --git a/tests/k8s/imports.nix b/tests/k8s/imports.nix
index a43a51a..b4bd032 100644
--- a/tests/k8s/imports.nix
+++ b/tests/k8s/imports.nix
@@ -1,4 +1,4 @@
-{ config, lib, kubenix, k8sVersion, ... }:
+{ config, lib, kubenix, ... }:
 
 with lib;
 
@@ -21,8 +21,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.imports = [
     ./pod.json
     ./deployment.yaml
diff --git a/tests/k8s/order.nix b/tests/k8s/order.nix
index 03051e1..9b01dcf 100644
--- a/tests/k8s/order.nix
+++ b/tests/k8s/order.nix
@@ -1,4 +1,4 @@
-{ config, lib, kubenix, pkgs, k8sVersion, ... }:
+{ config, lib, kubenix, pkgs, ... }:
 
 with lib;
 
@@ -19,8 +19,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.resources.customResourceDefinitions.crontabs = {
     apiVersion = "apiextensions.k8s.io/v1";
     metadata.name = "crontabs.stable.example.com";
diff --git a/tests/k8s/simple.nix b/tests/k8s/simple.nix
index f9fe32a..78f7277 100644
--- a/tests/k8s/simple.nix
+++ b/tests/k8s/simple.nix
@@ -1,4 +1,4 @@
-{ config, kubenix, k8sVersion, ... }:
+{ config, kubenix, ... }:
 
 let
   cfg = config.kubernetes.api.resources.pods.nginx;
@@ -17,7 +17,5 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.resources.pods.nginx = {};
 }
diff --git a/tests/legacy/crd.nix b/tests/legacy/crd.nix
index f00eb35..47146df 100644
--- a/tests/legacy/crd.nix
+++ b/tests/legacy/crd.nix
@@ -1,4 +1,4 @@
-{ options, config, lib, kubenix, pkgs, k8sVersion, ... }:
+{ options, config, lib, kubenix, pkgs, ... }:
 
 with lib;
 
@@ -28,7 +28,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
   kubernetes.namespace = "test";
 
   kubernetes.moduleDefinitions.secret-claim.module = { config, k8s, module, ... }: {
diff --git a/tests/legacy/k8s.nix b/tests/legacy/k8s.nix
index 9745a1d..940abc5 100644
--- a/tests/legacy/k8s.nix
+++ b/tests/legacy/k8s.nix
@@ -1,4 +1,4 @@
-{ config, lib, kubenix, pkgs, k8sVersion, ... }:
+{ config, lib, kubenix, pkgs, ... }:
 
 with lib;
 
@@ -24,8 +24,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.resources.deployments.app = {
     spec = {
       replicas = 2;
diff --git a/tests/legacy/modules.nix b/tests/legacy/modules.nix
index 41cbf08..3c1e4f5 100644
--- a/tests/legacy/modules.nix
+++ b/tests/legacy/modules.nix
@@ -1,4 +1,4 @@
-{ options, config, lib, kubenix, pkgs, k8sVersion, ... }:
+{ options, config, lib, kubenix, pkgs, ... }:
 
 with lib;
 
@@ -36,8 +36,6 @@ in {
     }];
   };
 
-  kubernetes.version = k8sVersion;
-
   kubernetes.defaults.all.metadata.labels.module-label = "value";
 
   # propagate default module configuration and defaults