diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-30 01:49:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 01:49:58 +0200 |
| commit | 3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181 (patch) | |
| tree | 2c646368cedb48125da425bea7acf27f5950dfcb /nixos/tests | |
| parent | c50de910d13971efb923c7cecf22ddc121aec066 (diff) | |
| parent | ab1567e8121dfcdb4f7a395b39a3a345f41c7474 (diff) | |
| download | nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar.gz nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar.bz2 nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar.lz nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar.xz nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.tar.zst nixpkgs-3a0d1ab3e2753c7db851b0d803bf5fc6e05b1181.zip | |
Merge pull request #128546 from scvalex/fix-kubernetes-tests
kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/kubernetes/base.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index 8cfac10b6dc..1f23ca55fb2 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -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) { |