Files
computer-playbook/cli/administration/deploy/development/inventory/planner.py
T
kevinveenbirkenbachandClaude Opus 5.5 4eb4c0fe22 fix(inventory): bake the variant a pin forces, as the round's include already does
services_overrides_for_round applied the # variant-pin: markers when it resolved a round's include set, while plan_dev_inventory_matrix built round_variants, which the inventory bake, the deploy CLI and the swarm matrix read, by clamping the round index alone. Once docs variant 0 pinned web-app-dashboard#reciprocal, round 2 of a sweep resolved dashboard variant 1 (SSO off, no web-app-keycloak in the inventory) but baked variant 0 (SSO on): Keycloak came up without its own bake, defaulted totp_enabled to true, and every dashboard login stopped at CONFIGURE_TOTP while the Keycloak card was missing (11 jobs of run 40042690056).

active_variants_for_round holds the clamp-plus-pins logic once; services_overrides_for_round and the planner both call it, and the planner keeps the primary apps' indices on top.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-24 19:18:53 +02:00

141 lines
5.2 KiB
Python

"""Matrix-deploy planner.
Pure function — reads role metadata via cached YAML helpers and emits
``PlanEntry`` tuples; no filesystem side effects. The include set per
round is resolved by the ``CombinedResolver`` (see ``.legacy_resolver``):
each role contributes its own pulled-in providers and the include is
the union. A service-key is therefore pulled in as soon as ANY role in
the round-aware closure says it should be (literal ``True`` OR the
``"{{ '<role>' in group_names }}"`` Jinja form, both accepted by
``utils.roles.applications.services.registry.is_explicit_truth``); if
EVERY role marks it ``False`` it stays out of the include.
"""
from __future__ import annotations
from typing import TYPE_CHECKING
from utils.cache.applications import get_variants
from utils.roles.applications.variants import active_variants_for_round
from . import legacy_resolver
if TYPE_CHECKING:
from collections.abc import Mapping, Sequence
from .spec import PlanEntry
def filter_plan_to_variants(
plan: list[PlanEntry],
variants: list[int] | None,
) -> list[PlanEntry]:
"""Pin a matrix plan to a subset of rounds when `variants` is set.
`variants=None` returns the plan unchanged (full-matrix mode). This is the
runner-split entry point: a role with more variants than one runner should
iterate is sliced into bundles (e.g. ``0,1,2`` on one runner and ``3,4`` on
the next), each bundle passed as `variants`. Out-of-range indices raise
`ValueError` so the caller surfaces a clean operator error.
"""
if variants is None:
return plan
available = sorted(entry[0] for entry in plan)
missing = sorted(v for v in variants if v not in available)
if missing:
raise ValueError(
f"variants {missing} out of range; available rounds: {available}"
)
wanted = set(variants)
return [entry for entry in plan if entry[0] in wanted]
def plan_dev_inventory_matrix(
*,
roles_dir: str,
primary_apps: Sequence[str],
base_inventory_dir: str,
pinned_variants: Mapping[str, int] | None = None,
) -> list[PlanEntry]:
"""Return ``[(round_index, inventory_dir, round_variants, include, purge_set), ...]`` — per-round variant-closure plus a plan-constant union for the inter-round wipe.
Args:
roles_dir: the roles tree the variants are read from.
primary_apps: the apps the sweep deploys.
base_inventory_dir: the inventory directory each round is written under.
pinned_variants: apps that keep one variant in every round instead of
following the round index, and the variant each keeps. An app that
rides along as a host rather than a subject wants this: the round
index belongs to the subject and means nothing for the passenger.
"""
if not primary_apps:
raise ValueError("plan_dev_inventory_matrix: primary_apps must not be empty")
pins = dict(pinned_variants or {})
variants_per_app = get_variants(roles_dir=roles_dir)
primary_variant_counts = {
app_id: max(1, len(variants_per_app.get(app_id) or [{}]))
for app_id in primary_apps
}
total_rounds = max(
(
count
for app_id, count in primary_variant_counts.items()
if app_id not in pins
),
default=1,
)
base = str(base_inventory_dir).rstrip("/")
per_variant_includes: list[tuple[str, ...]] = []
primary_round_variants_per_round: list[dict[str, int]] = []
for round_index in range(total_rounds):
primary_round_variants = {
app_id: min(pins[app_id], count - 1)
if app_id in pins
else (round_index if round_index < count else 0)
for app_id, count in primary_variant_counts.items()
}
primary_round_variants_per_round.append(primary_round_variants)
services_overrides = legacy_resolver._build_services_overrides_for_round(
roles_dir=roles_dir,
round_index=round_index,
primary_app_variants=primary_round_variants,
)
per_variant_includes.append(
legacy_resolver._resolve_round_include(
primary_apps=primary_apps,
services_overrides=services_overrides,
)
)
seen_union: set[str] = set()
union_apps: list[str] = []
for variant_include in per_variant_includes:
for dep in variant_include:
if dep not in seen_union:
seen_union.add(dep)
union_apps.append(dep)
purge_set: tuple[str, ...] = tuple(union_apps)
plan: list[PlanEntry] = []
for round_index in range(total_rounds):
primary_round_variants = primary_round_variants_per_round[round_index]
round_include = per_variant_includes[round_index]
round_variants = {
**active_variants_for_round(
roles_dir=roles_dir,
round_index=round_index,
primary_app_variants=primary_round_variants,
variants_per_app=variants_per_app,
),
**primary_round_variants,
}
inv_dir = f"{base}-{round_index}" if total_rounds > 1 else base
plan.append((round_index, inv_dir, round_variants, round_include, purge_set))
return plan