diff options
author | Charles Strahan <charles@cstrahan.com> | 2018-04-04 19:14:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 19:14:48 -0400 |
commit | 5c066e2bba13c8272a8fa477b82c09ff484967e5 (patch) | |
tree | 4dcb215cbe0a9e06fff0681c39b6f614d82e53f0 /nixos/modules/services | |
parent | cae43fb1dd6518572bc0022c6636bd86898683df (diff) | |
parent | 709b6f664e472ae2075bbee83bfb1dd1ba95e0e7 (diff) | |
download | nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.gz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.bz2 nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.lz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.xz nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.tar.zst nixlib-5c066e2bba13c8272a8fa477b82c09ff484967e5.zip |
Merge pull request #37218 from cstrahan/kube-test-fix
nixos: kubernetes fixes
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 39c5d78d4191..aeb0a0d2432d 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -766,7 +766,7 @@ in { rm /opt/cni/bin/* || true ${concatMapStrings (package: '' echo "Linking cni package: ${package}" - ln -fs ${package.plugins}/* /opt/cni/bin + ln -fs ${package}/bin/* /opt/cni/bin '') cfg.kubelet.cni.packages} ''; serviceConfig = { @@ -828,7 +828,7 @@ in { }; # Allways include cni plugins - services.kubernetes.kubelet.cni.packages = [pkgs.cni]; + services.kubernetes.kubelet.cni.packages = [pkgs.cni-plugins]; boot.kernelModules = ["br_netfilter"]; |