b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
k3s: test all versions
This commit is contained in:
superherointj 2023-02-14 12:31:32 -03:00 committed by GitHub
parent 3d53723112 0ca947e125
commit e836805076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/tests/k3s/default.nix
View file

@ -1,9 +1,13 @@
{ 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;
}

6
nixos/tests/k3s/multi-node.nix
View file

@ -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"

6
nixos/tests/k3s/single-node.nix
View file

@ -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"

3
pkgs/applications/networking/cluster/k3s/1_23/default.nix
View file

@ -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;
}

3
pkgs/applications/networking/cluster/k3s/1_24/default.nix
View file

@ -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;
}

3
pkgs/applications/networking/cluster/k3s/1_25/default.nix
View file

@ -322,8 +322,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.25
# passthru.updateScript = ./update.sh;
# Fix-Me: Needs to be adapted specifically for 1.25
# passthru.tests = nixosTests.k3s;
passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}

9
pkgs/applications/networking/cluster/k3s/1_26/default.nix
View file

@ -319,7 +319,14 @@ buildGoModule rec {
passthru.updateScript = ./update.sh;
passthru.tests = nixosTests.k3s;
passthru.mkTests = version:
let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
in {
single-node = nixosTests.k3s.single-node.${k3s_version};
multi-node = nixosTests.k3s.multi-node.${k3s_version};
};
passthru.tests = passthru.mkTests k3sVersion;
meta = baseMeta;
}