cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #176520 from euank/k3s-ipset

Browse source 
k3s: add ipset runtime dependency
This commit is contained in:
superherointj 2023-02-19 10:47:49 -03:00 committed by GitHub
commit 772e24f682
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
pkgs/applications/networking/cluster/k3s/1_23/default.nix
View file

@ -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
pkgs/applications/networking/cluster/k3s/1_24/default.nix
View file

@ -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
pkgs/applications/networking/cluster/k3s/1_25/default.nix
View file

@ -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
pkgs/applications/networking/cluster/k3s/1_26/default.nix
View file

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