diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index c120f461ddc9..d61595d889e2 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -77,6 +77,9 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test") machine.succeed("k3s kubectl delete -f ${testPodYaml}") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + machine.shutdown() ''; }) diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix index 72fbe89dd6b3..3abe8c675539 100644 --- a/pkgs/applications/networking/cluster/k3s/1_23/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 11037db5b6d3..9ebac6b7448e 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index b62eec692855..5b5fc097e77d 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 diff --git a/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/pkgs/applications/networking/cluster/k3s/1_26/default.nix index cef2355a3da6..1b8b5a1b2a64 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -4,6 +4,7 @@ , socat , iptables , iproute2 +, ipset , bridge-utils , btrfs-progs , conntrack-tools @@ -249,6 +250,7 @@ buildGoModule rec { socat iptables iproute2 + ipset bridge-utils ethtool util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388