Commit c1541800 authored by Euan Kemp's avatar Euan Kemp
Browse files

k3s: add ipset runtime dependency

Fixes #176445

The included change to the k3s test fails without the package change.
parent 03057aa1
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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()
    '';
  })
+2 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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