kubernetes: fix conntrack-tools package name, missing dir, and tests

Changed files
+10 -2
nixos
modules
services
cluster
kubernetes
tests
kubernetes
+1
nixos/modules/services/cluster/kubernetes/pki.nix
···
# 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
+1 -1
nixos/modules/services/cluster/kubernetes/proxy.nix
···
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 \
+8 -1
nixos/tests/kubernetes/base.nix
···
allowedTCPPorts = [
10250 # kubelet
];
-
trustedInterfaces = ["docker0"];
+
trustedInterfaces = ["mynet"];
extraCommands = concatMapStrings (node: ''
iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
···
advertiseAddress = master.ip;
};
masterAddress = "${masterName}.${config.networking.domain}";
+
# workaround for:
+
# https://github.com/kubernetes/kubernetes/issues/102676
+
# (workaround from) https://github.com/kubernetes/kubernetes/issues/95488
+
kubelet.extraOpts = ''\
+
--cgroups-per-qos=false \
+
--enforce-node-allocatable="" \
+
'';
};
}
(optionalAttrs (any (role: role == "master") machine.roles) {