From e77459d2cbb2d45b1cab530808245bb8727df90b Mon Sep 17 00:00:00 2001 From: atlas Date: Tue, 27 Oct 2026 14:28:51 +0100 Subject: [PATCH] count the cache's container in the service-container cases --- nix/module-eval/swarm-services-switch.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/module-eval/swarm-services-switch.nix b/nix/module-eval/swarm-services-switch.nix index d390dac8..1df72a4d 100644 --- a/nix/module-eval/swarm-services-switch.nix +++ b/nix/module-eval/swarm-services-switch.nix @@ -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;