count the cache's container in the service-container cases
This commit is contained in:
parent
458a046b8d
commit
e77459d2cb
1 changed files with 4 additions and 4 deletions
|
|
@ -642,21 +642,21 @@ let
|
|||
# that lost a container can't pass by comparing fewer of them.
|
||||
name = "every service container restates its host-side privateNetwork";
|
||||
ok =
|
||||
lib.length (lib.attrNames serviceContainers) == 14
|
||||
lib.length (lib.attrNames serviceContainers) == 15
|
||||
&& lib.all (
|
||||
c: c.privateNetwork == (c.config.services.hyperhive.swarmContainer.privateNetwork or null)
|
||||
) (lib.attrValues serviceContainers);
|
||||
}
|
||||
{
|
||||
# Both values come from ../container-modules/swarm-container.nix.
|
||||
# Four of the 14 service containers share the host netns (hive-forge, bao,
|
||||
# the queue, the log store) and ten have one of their own.
|
||||
# Five of the 15 service containers share the host netns (hive-forge, bao,
|
||||
# the queue, the log store, the cache) and ten have one of their own.
|
||||
name = "a service container on the host netns runs no firewall or resolvconf of its own";
|
||||
ok =
|
||||
let
|
||||
shared = lib.filter (c: !c.privateNetwork) (lib.attrValues serviceContainers);
|
||||
in
|
||||
lib.length shared == 4
|
||||
lib.length shared == 5
|
||||
&& lib.all (
|
||||
c: !c.config.networking.firewall.enable && !c.config.networking.resolvconf.enable
|
||||
) shared;
|
||||
|
|
|
|||
Loading…
Reference in a new issue