Unverified Commit e8368050 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #215482 from moduon/k3s-test-all-versions 

k3s: test all versions
parents 3d537231 0ca947e1

nixos/tests/k3s/default.nix

+6 −2
Original line number Diff line number Diff line 
{ system ? builtins.currentSystem

, pkgs ? import ../../.. { inherit system; }

, lib ? pkgs.lib

}:

let

  allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;

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"

pkgs/applications/networking/cluster/k3s/1_23/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -320,8 +320,7 @@ buildGoModule rec { 
  # Fix-Me: Needs to be adapted specifically for 1.23

  # passthru.updateScript = ./update.sh;



  # Fix-Me: Needs to be adapted specifically for 1.23

  # passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };

  passthru.tests = k3s.passthru.mkTests k3sVersion;



  meta = baseMeta;

}

pkgs/applications/networking/cluster/k3s/1_24/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ buildGoModule rec { 
  # Fix-Me: Needs to be adapted specifically for 1.24

  # passthru.updateScript = ./update.sh;



  # Fix-Me: Needs to be adapted specifically for 1.24

  # passthru.tests = nixosTests.k3s;

  passthru.tests = k3s.passthru.mkTests k3sVersion;



  meta = baseMeta;

}