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
2021-07-27 16:18:00 +02:00
parent 1bd5157b2c 3ee32f0ea9
commit 0a532d8b22
3 changed files with 10 additions and 2 deletions
@@ -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) {