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

Merge pull request #176520 from euank/k3s-ipset 

k3s: add ipset runtime dependency
parents 03ee925c c1541800

nixos/tests/k3s/single-node.nix

+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()

    '';

  })

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

+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

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

+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

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

+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

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

+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