Create the annia enqueuer #95
No reviewers
Labels
No labels
blocked
bug
duplicate
effort
high
effort
low
effort
medium
effort
minimal
enhancement
help wanted
invalid
pr
feedback
pr
reviewing
question
status
backlog
status
document
status
done
status
implement
status
pending
status
planning
status
reviewing
waiting
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
tepichord/milner!95
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feat/89-annia-enqueuer"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Closes #89
Automated PR created by forgejo-done adapter.
Two resolutions, both in kustomizations that each side added to: * apps/annia/kustomization.yaml — union of the two resource lists. main lists llm-gateway.yaml (the tailnet-egress Service, #93); the branch lists service.yaml + deployment.yaml (the enqueuer). Both survive: the conflict was in the one line that names the resources, not in their content. * infrastructure/kustomization.yaml — `namespaces/annia.yaml` was listed twice. git merged both additions with no conflict marker because they landed at different offsets (main put it after postgres.yaml, the branch after rabbitmq.yaml), and `kustomize build infrastructure` rejects the second entry as "may not add resource with an already registered id" — which test_kustomize_build catches, demonstrated by reinstating the duplicate. main's position is kept. Nothing else needed reconciling. The Vault* tripwire in tests/test_gitops.py is already (8, 13) for the merged tree — main added no VaultAuth/VaultStaticSecret (the preview-system pair predates the fork), so the branch's bump from (7, 11) is the whole of the change. `.woodpecker/gates.yaml`, tests/test_static.py and tests/test_docs.py merge byte-identical to main, so the CI-resolver, step-tool and docs guards need no reconciliation. Still open, deliberately not decided here: apps/annia/deployment.yaml pins `.../annia-enqueuer:<annia-infra-pin>`, a `<...>` placeholder, and the registry answers 404 NAME_UNKNOWN for that repository. `apps.yaml` has `wait: true`, so the layer will not reach Ready until annia-infra #310 publishes the image. tests: 227 passed (`nix develop --command python3 -m pytest tests/ -q`).