sharang
6cd1a1546c
Lands the per-VM × per-service manifest tree, per-env overlays, VM specs
for SysEleven provisioning, DNS zone placeholder, plan/apply/validate
scripts, and a Makefile.
Structure (per INFRASTRUCTURE.md §2 + IMPLEMENTATION_PLAN.md M1.1):
- manifests/{vm-edge,vm-control,vm-data,stage}/<service>.toml — 35 stubs
- overlays/{dev,stage,prod}/overlay.toml — env-selection rules
- vms/{vm-edge,vm-control,vm-data,stage}.toml — OpenStack flavor/IP/firewall
- dns/yourplatform.com.zone.template — PowerDNS zone (body lands in M0.3)
- cluster.toml.tmpl — cluster-level config rendered per env
- scripts/validate.sh — TOML parse + structural sanity
- scripts/plan.sh — merge manifests + overlay → .orca-out/<env>/
- scripts/apply.sh — push to Orca controller (no-op until M1.2)
- Makefile — validate / plan / apply / diff / clean
Each manifest header names the milestone that finalises its real values;
images today are 'placeholder' for services that need their own repo to
exist first. make validate stays green; apply gates on ORCA_API_URL.
CI workflow swapped from the broken 'orca validate' to 'make validate',
which calls a Python TOML parser plus structural checks (placement.node
matches vm dir, resources.memory present, no mis-nested keys).
Refs: M1.1
64 lines
2.2 KiB
Bash
Executable File
64 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# TOML syntax + structural sanity for every manifest in this repo.
|
|
# Used by `make validate` and by .gitea/workflows/ci.yaml.
|
|
set -euo pipefail
|
|
|
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
|
cd "$ROOT"
|
|
|
|
python3 - "$ROOT" <<'PY'
|
|
import sys, tomllib, pathlib
|
|
root = pathlib.Path(sys.argv[1])
|
|
errs = []
|
|
count = 0
|
|
for p in sorted(root.glob('manifests/**/*.toml')):
|
|
count += 1
|
|
try:
|
|
data = tomllib.load(open(p, 'rb'))
|
|
except Exception as e:
|
|
errs.append(f'{p}: TOML parse: {e}')
|
|
continue
|
|
svcs = data.get('service')
|
|
if not svcs:
|
|
errs.append(f'{p}: no [[service]] block')
|
|
continue
|
|
for svc in svcs:
|
|
for required in ('name', 'image'):
|
|
if required not in svc:
|
|
errs.append(f'{p}: service missing required field "{required}"')
|
|
# forbidden nesting bugs
|
|
for sub in ('placement', 'resources', 'env', 'volume'):
|
|
if isinstance(svc.get(sub), dict):
|
|
for fb in ('depends_on', 'extra_ports', 'cmd', 'mounts'):
|
|
if fb in svc[sub]:
|
|
errs.append(f'{p}: "{fb}" nested under [service.{sub}] — must be at [[service]] level')
|
|
# placement.node must match parent vm directory
|
|
node = (svc.get('placement') or {}).get('node')
|
|
vm_dir = p.parent.name
|
|
if node and node != vm_dir:
|
|
errs.append(f'{p}: placement.node "{node}" mismatches dir "{vm_dir}"')
|
|
if not node:
|
|
errs.append(f'{p}: missing placement.node')
|
|
mem = (svc.get('resources') or {}).get('memory')
|
|
if not mem:
|
|
errs.append(f'{p}: missing resources.memory (mandatory per §8 rule 5)')
|
|
# Validate overlays parse too
|
|
for p in sorted(root.glob('overlays/*/overlay.toml')):
|
|
count += 1
|
|
try:
|
|
tomllib.load(open(p, 'rb'))
|
|
except Exception as e:
|
|
errs.append(f'{p}: TOML parse: {e}')
|
|
# Validate VMs parse too
|
|
for p in sorted(root.glob('vms/*.toml')):
|
|
count += 1
|
|
try:
|
|
tomllib.load(open(p, 'rb'))
|
|
except Exception as e:
|
|
errs.append(f'{p}: TOML parse: {e}')
|
|
print(f'checked {count} files')
|
|
for e in errs:
|
|
print(' ', e)
|
|
sys.exit(1 if errs else 0)
|
|
PY
|