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

(cherry picked from commit ab1567e8121dfcdb4f7a395b39a3a345f41c7474)
This commit is contained in:
Alexandru Scvortov
2021-06-30 21:26:24 +00:00
committed by github-actions[bot]
parent beb05a45aa
commit 3ee32f0ea9
3 changed files with 10 additions and 2 deletions
+8 -1
View File
@@ -40,7 +40,7 @@ let
allowedTCPPorts = [
10250 # kubelet
];
trustedInterfaces = ["docker0"];
trustedInterfaces = ["mynet"];
extraCommands = concatMapStrings (node: ''
iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
@@ -61,6 +61,13 @@ let
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) {