diff options
Diffstat (limited to 'nixos/tests/k3s/multi-node.nix')
| -rw-r--r-- | nixos/tests/k3s/multi-node.nix | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index ae9609fbccc9f..ce7e4b6ead148 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, ... }: +import ../make-test-python.nix ({ pkgs, lib, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -54,7 +54,15 @@ import ../make-test-python.nix ({ pkgs, ... }: role = "server"; package = pkgs.k3s; clusterInit = true; - extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1"; + extraFlags = '' + --disable coredns \ + --disable local-storage \ + --disable metrics-server \ + --disable servicelb \ + --disable traefik \ + --node-ip 192.168.1.1 \ + --pause-image test.local/pause:local + ''; }; networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; networking.firewall.allowedUDPPorts = [ 8472 ]; @@ -76,7 +84,15 @@ import ../make-test-python.nix ({ pkgs, ... }: enable = true; serverAddr = "https://192.168.1.1:6443"; clusterInit = false; - extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.3"; + extraFlags = '' + --disable coredns \ + --disable local-storage \ + --disable metrics-server \ + --disable servicelb \ + --disable traefik \ + --node-ip 192.168.1.3 \ + --pause-image test.local/pause:local + ''; }; networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; networking.firewall.allowedUDPPorts = [ 8472 ]; @@ -123,7 +139,8 @@ import ../make-test-python.nix ({ pkgs, ... }: server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - m.succeed("k3s check-config") + '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" + + lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + '' m.succeed( "${pauseImage} | k3s ctr image import -" ) |