diff options
author | Jairo Llopis <yajo.sk8@gmail.com> | 2023-02-09 09:57:37 +0000 |
---|---|---|
committer | Jairo Llopis <yajo.sk8@gmail.com> | 2023-02-10 09:12:14 +0000 |
commit | 52a153aae20d999854d7ece49b865e95b929e490 (patch) | |
tree | be28d0a1ff42a22db5f6375539b2079bdb2c0744 /nixos/tests | |
parent | 5e5d7fb2cea8b4e02fdf1bca28826236f7a54eb5 (diff) |
k3s: test all versions
Since https://github.com/NixOS/nixpkgs/issues/213943 got fixed, only the main k3s derivation is tested. Here I changed the tests a bit to make them test all provided k3s derivations @moduon MT-1718
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/k3s/default.nix | 16 | ||||
-rw-r--r-- | nixos/tests/k3s/multi-node.nix | 6 | ||||
-rw-r--r-- | nixos/tests/k3s/single-node.nix | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index 07d93c41c7a68..453a96439d8d9 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -1,9 +1,21 @@ { system ? builtins.currentSystem , pkgs ? import ../../.. { inherit system; } +, lib ? pkgs.lib }: +let + allK3s = { + inherit (pkgs) + k3s + k3s_1_23 + k3s_1_24 + k3s_1_25 + k3s_1_26 + ; + }; +in { # Run a single node k3s cluster and verify a pod can run - single-node = import ./single-node.nix { inherit system pkgs; }; + single-node = lib.mapAttrs (_: k3s: import ./single-node.nix { inherit system pkgs k3s; }) allK3s; # Run a multi-node k3s cluster and verify pod networking works across nodes - multi-node = import ./multi-node.nix { inherit system pkgs; }; + multi-node = lib.mapAttrs (_: k3s: import ./multi-node.nix { inherit system pkgs k3s; }) allK3s; } diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 9a6c7fd465739..932b4639b39c8 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -39,7 +39,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: tokenFile = pkgs.writeText "token" "p@s$w0rd"; in { - name = "k3s-multi-node"; + name = "${k3s.name}-multi-node"; nodes = { server = { pkgs, ... }: { @@ -52,7 +52,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: inherit tokenFile; enable = true; role = "server"; - package = pkgs.k3s; + package = k3s; clusterInit = true; extraFlags = builtins.toString [ "--disable" "coredns" diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index a95fa4a031e3f..c120f461ddc95 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, lib, ... }: +import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -24,7 +24,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ''; in { - name = "k3s"; + name = "${k3s.name}-single-node"; meta = with pkgs.lib.maintainers; { maintainers = [ euank ]; }; @@ -38,7 +38,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: services.k3s.enable = true; services.k3s.role = "server"; - services.k3s.package = pkgs.k3s; + services.k3s.package = k3s; # Slightly reduce resource usage services.k3s.extraFlags = builtins.toString [ "--disable" "coredns" |