mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
kevinveenbirkenbachandClaude Opus 5
7162b7bf4c
834 commits from the Tor onion-service branch against 299 of ours, from merge base7b646bdece: 127 conflicted files, 3506 files changed. The two sides are largely orthogonal. Theirs adds svc-net-tor and a `tor` service across the role tree, plus two sweeping refactors: shipped scripts sorted by language (files/ruby/, files/python/, files/shell/, scripts/lint/*.sh) and the unit suite moved under tests/unit/python/. Ours is requirement 036, the native AI gateway, plus the MCP role work. Most conflicts were both sides appending to the same service map, resolved as unions. Resolutions that were not unions: Credentials moved namespace. Theirs renamed meta/schema.yml to meta/secrets.yml and re-addressed credentials as secrets.credentials.<name>. Git carried our litellm_api_key blocks through the rename, but every consumer we added still read 'credentials.<name>', which no longer resolves. All 45 call sites are migrated. plugins/filter/container_volumes.py is deleted by theirs and relocated to plugins/lookup/container_volumes.py, where it carries the same tmpfs defect ourf85996b43had just fixed: a hard-coded {"size": ...} that silently drops a per mount `mode`. The fix is re-applied in the relocated file, as that commit's merge note anticipated. compose.yml keeps only INFINITO_PLAYWRIGHT_REPORTS_BASE_DIR. Theirs also forwards INFINITO_PLAYWRIGHT_STAGE_BASE_DIR; that line is deliberately dropped, per the analysis recorded in45804e9ad-- STAGE has a drift-proof role-vars fallback, while forwarding it promotes a setdefault-pinnable .env value above that SPOT. tasks/stages/01_constructor.yml takes their include, ./tasks/utils/setup/group.yml, because their refactor removed tasks/groups/*-roles.yml, leaving our include target nonexistent. Our task name is kept, since svc-virt is in the loop. Makefile swarm-zombie is a union: their validate plus teardown, then our lab_subnet cleanup, which their side dropped while leaving lab_subnet.sh as the only orphaned reference in the file. 01_bootstrap.sh keeps our deterministic --ip pinning, which distinguishes an already-attached node from a real failure, over their `|| true`. Their language-sorted layout orphaned references our side still held: zammad's two scripts/apply/*.rb, jenkins' java-with-ca-trust.sh, and the notify topics their handlers renamed to hyphenated form. All corrected. roles/sys-svc-compose/files/shell/swarm/stack_ready.sh gains our latched-update block: paused, rollback_paused, rollback_started and rollback_completed exit 2 rather than polling a state that cannot resolve without another deploy. config_from_run is unioned to (title, logged, jobs); the production caller in trigger/__main__.py now passes jobs, without which our suite suppression would have been inert. READMEs are regenerated rather than hand-merged: 15 LiteLLM rows and 91 Tor rows now derive from the merged metadata, which is itself evidence the meta merge is coherent. Verified: 5161 unit tests pass. The single failure, test_query.py TestSortSpec, also fails on fork/feature/svc-net-tor atb51d2f9919, measured in a baseline worktree -- so this merge introduces no new unit-test failure. Two modules are excluded from that run because `baudolo`, a dependency their branch introduces, is not installed on this host. Not verified: no deploy has run against the merged tree, and make quality has not been run end to end here. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
56 lines
2.5 KiB
Django/Jinja
56 lines
2.5 KiB
Django/Jinja
{# Aggregate plain-HTTP registries (cluster build registry + Hub pull-through
|
|
mirror) into a single insecure_registries list so docker accepts them. #}
|
|
{% set _insecure = [] %}
|
|
{% if DEPLOYMENT_MODE == 'swarm' and (swarm.registry.host | length > 0) %}
|
|
{% set _ = _insecure.append(swarm.registry.host ~ ':' ~ swarm.registry.port) %}
|
|
{% endif %}
|
|
{% set _cache_hosts = groups['svc-registry-cache'] | default([]) %}
|
|
{% if _cache_hosts | length > 0 %}
|
|
{% set _cache_port = lookup('config', 'svc-registry-cache', 'services.cache.ports.local.registry') %}
|
|
{% set _ = _insecure.append(_cache_hosts[0] ~ ':' ~ _cache_port) %}
|
|
{% endif %}
|
|
{
|
|
{% if SYS_SVC_CONTAINER_DATA_ROOT | length > 0 %}
|
|
"data-root": "{{ SYS_SVC_CONTAINER_DATA_ROOT }}",
|
|
{% endif %}
|
|
{% if lookup('container_dns') %}
|
|
"dns": {{ lookup('container_dns') | to_json }},
|
|
{% endif %}
|
|
"dns-search": ["{{ DOMAIN_PRIMARY }}"],
|
|
"dns-opts": ["ndots:0"],
|
|
"default-address-pools": {{ NETWORK_DOCKER_ADDRESS_POOLS | tojson }},
|
|
"log-driver": "json-file",
|
|
"log-opts": {"max-size": "10m", "max-file": "2"}
|
|
{% if DOCKER_IN_CONTAINER | bool %},
|
|
"storage-driver": "fuse-overlayfs"
|
|
{% endif %}
|
|
{% if SYS_DOCKER_DAEMONM_MTU is defined and SYS_DOCKER_DAEMONM_MTU | int > 0 %},
|
|
"mtu": {{ SYS_DOCKER_DAEMONM_MTU | int }}
|
|
{% endif %}
|
|
{% set firewall_backend = none if DEPLOYMENT_MODE == 'swarm' else SYS_SVC_CONTAINER_DOCKER_FIREWALL_BACKEND_BY_OS_FAMILY.get(ansible_facts['os_family']) %}
|
|
{% if firewall_backend %},
|
|
"firewall-backend": "{{ firewall_backend }}"
|
|
{% endif %}
|
|
{% if _insecure | length > 0 %},
|
|
"insecure-registries": [{% for r in _insecure %}"{{ r }}"{% if not loop.last %}, {% endif %}{% endfor %}]
|
|
{% endif %}
|
|
{% if _cache_hosts | length > 0 %},
|
|
"registry-mirrors": ["http://{{ _cache_hosts[0] }}:{{ _cache_port }}"]
|
|
{% endif %}
|
|
{% set _shim_paths = {'kata': KATA_SHIM_BINARY, 'runsc': RUNSC_SHIM_BINARY} %}
|
|
{% set _present = [] %}
|
|
{% if sys_svc_container_kata_shim.stat.exists %}{% set _ = _present.append('kata') %}{% endif %}
|
|
{% if sys_svc_container_runsc_shim.stat.exists %}{% set _ = _present.append('runsc') %}{% endif %}
|
|
{% if _present | length > 0 %},
|
|
"runtimes": {
|
|
{% for _name in _present %}
|
|
"{{ _name }}": {"path": "{{ _shim_paths[_name] }}"{% if _name == 'runsc' and DOCKER_IN_CONTAINER | bool %}, "runtimeArgs": ["--network=host"]{% endif %}}{% if not loop.last %},{% endif %}
|
|
|
|
{% endfor %}
|
|
}
|
|
{% if DEPLOYMENT_MODE == 'swarm' and not (IS_STACK_HOST | bool) and (SANDBOX_RUNTIME | trim) in _present %},
|
|
"default-runtime": "{{ SANDBOX_RUNTIME | trim }}"
|
|
{% endif %}
|
|
{% endif %}
|
|
}
|