Merge pull request #128818 from NixOS/backport-128546-to-release-21.05

[Backport release-21.05] kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
This commit is contained in:
Niklas Hambüchen
2021-07-27 16:18:00 +02:00
committed by GitHub
3 changed files with 10 additions and 2 deletions
@@ -189,6 +189,7 @@ in
# manually paste it in place. Just symlink.
# otherwise, create the target file, ready for users to insert the token
mkdir -p $(dirname ${certmgrAPITokenPath})
if [ -f "${cfsslAPITokenPath}" ]; then
ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}"
else
@@ -59,7 +59,7 @@ in
description = "Kubernetes Proxy Service";
wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ];
path = with pkgs; [ iptables conntrack_tools ];
path = with pkgs; [ iptables conntrack-tools ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-proxy \