nix: allSwarmServices turns on the review classifier
deploy.review-classifier.enable now defaults to allSwarmServices, as the
other shared services do, but only where the host has the classifier's
store identity (deploy.bao.reviewClassifierClient{Cert,Key}File). The
classifier module asserts that pair; glue-bao-tls.nix mints it only on the
host that runs the store, so a services host with the store placed
elsewhere would otherwise fail eval. An explicit value still wins.
The operator still writes the Anthropic key by hand; until then each run
fails with "no API key…" while the service runs.
This commit is contained in:
parent
ed15105e6f
commit
34bde7a5af
5 changed files with 67 additions and 24 deletions
|
|
@ -93,6 +93,12 @@ let
|
|||
# swarm-required-services.nix documents the switch for.
|
||||
swarmServicesHere = hiveWithController { deploy.allSwarmServices = true; };
|
||||
|
||||
# Same, with the operator opting out of the classifier alone.
|
||||
swarmServicesWithoutClassifier = hiveWithController {
|
||||
deploy.allSwarmServices = true;
|
||||
deploy.review-classifier.enable = false;
|
||||
};
|
||||
|
||||
# Same, with one of those services placed on another host. Every derivation
|
||||
# in that module is `mkDefault` so this stays expressible.
|
||||
swarmServicesBaoElsewhere = hive {
|
||||
|
|
@ -158,7 +164,8 @@ let
|
|||
lib.filter (l: swarmServiceLinkDomains ? ${l.label}) cfg.services.hyperhive.swarm.controller.links;
|
||||
|
||||
# Every service container at once: the services-only host plus the CI
|
||||
# runner, the one container on a netns of its own.
|
||||
# runner. The CI runner and the review classifier are the two containers on
|
||||
# a netns of their own.
|
||||
serviceContainersWithCi = hive {
|
||||
deploy.hive-controller.enable = false;
|
||||
deploy.allSwarmServices = true;
|
||||
|
|
@ -178,15 +185,33 @@ let
|
|||
lib.length (lib.attrNames es) == 9 && lib.all lib.id (lib.attrValues es);
|
||||
}
|
||||
{
|
||||
# Every run spends money on an operator's key, so hosting the shared
|
||||
# services does not start the classifier. The queue is the control:
|
||||
# the same fixture does turn the switch's own services on.
|
||||
name = "hosting the swarm's shared services leaves the review classifier off";
|
||||
# The container is the control that the toggle reaches the module, not
|
||||
# only the option; `nats` is the control that the switch is on at all.
|
||||
name = "hosting the swarm's shared services turns on the review classifier";
|
||||
ok =
|
||||
!swarmServicesHere.services.hyperhive.deploy.review-classifier.enable
|
||||
&& !(swarmServicesHere.containers ? swarm-review-classifier)
|
||||
swarmServicesHere.services.hyperhive.deploy.review-classifier.enable
|
||||
&& swarmServicesHere.containers ? swarm-review-classifier
|
||||
&& swarmServicesHere.services.hyperhive.deploy.nats.enable;
|
||||
}
|
||||
{
|
||||
# The default yields to an operator who has spoken. The same fixture
|
||||
# without the line is the control.
|
||||
name = "an explicit false keeps the review classifier off where the shared services are hosted";
|
||||
ok =
|
||||
!swarmServicesWithoutClassifier.services.hyperhive.deploy.review-classifier.enable
|
||||
&& !(swarmServicesWithoutClassifier.containers ? swarm-review-classifier)
|
||||
&& swarmServicesWithoutClassifier.services.hyperhive.deploy.nats.enable;
|
||||
}
|
||||
{
|
||||
# The classifier's module asserts a store identity that only the store's
|
||||
# host mints, so with the store placed elsewhere the default stays off
|
||||
# rather than failing that host's eval. `nats` is the control.
|
||||
name = "the review classifier stays off where the shared services are hosted without the store";
|
||||
ok =
|
||||
!swarmServicesBaoElsewhere.services.hyperhive.deploy.review-classifier.enable
|
||||
&& !(swarmServicesBaoElsewhere.containers ? swarm-review-classifier)
|
||||
&& swarmServicesBaoElsewhere.services.hyperhive.deploy.nats.enable;
|
||||
}
|
||||
{
|
||||
# The switch fills in for an operator who has not spoken and yields to
|
||||
# one who has — that is what keeps a shared service placeable on a host
|
||||
|
|
@ -431,7 +456,7 @@ 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) == 10
|
||||
lib.length (lib.attrNames serviceContainers) == 11
|
||||
&& lib.all (
|
||||
c: c.privateNetwork == (c.config.services.hyperhive.swarmContainer.privateNetwork or null)
|
||||
) (lib.attrValues serviceContainers);
|
||||
|
|
|
|||
Loading…
Reference in a new issue