Unverified Commit 52a153aa authored by Jairo Llopis's avatar Jairo Llopis
Browse files

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
parent 5e5d7fb2

nixos/tests/k3s/default.nix

+14 −2
Original line number Diff line number Diff line 
{ 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;

}

nixos/tests/k3s/multi-node.nix

+3 −3
Original line number Diff line number Diff line 
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"

nixos/tests/k3s/single-node.nix

+3 −3
Original line number Diff line number Diff line 
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"