docs+test(e2e): ADR-0026, S-15b demo note, default-fill e2e (refs #131)

.gitea/workflows/ci.yaml

@@ -201,12 +201,6 @@ jobs:
       - name: Observability backplane (Grafana + Tempo + Prometheus datasources)
         id: obs
         run: OBS_TIMEOUT=180 make verify-observability
-      - name: Objecttypen API up + token authenticates
-        id: objecttypen
-        run: OBJECTTYPEN_TIMEOUT=120 make verify-objecttypen
-      - name: Objecten API up + token authenticates + trusts Objecttypen
-        id: objecten
-        run: OBJECTEN_TIMEOUT=120 make verify-objecten
       - name: ACL ↔ OpenZaak integration tests
         id: acl
         run: make verify-acl
@@ -239,8 +233,6 @@ jobs:
         env:
           UP: ${{ steps.up.outcome }}
           OBS: ${{ steps.obs.outcome }}
-          OBJECTTYPEN: ${{ steps.objecttypen.outcome }}
-          OBJECTEN: ${{ steps.objecten.outcome }}
           ACL: ${{ steps.acl.outcome }}
           NRC: ${{ steps.nrc.outcome }}
           PROJECTION: ${{ steps.projection.outcome }}
@@ -259,8 +251,6 @@ jobs:
             echo "| ----- | :----: |"
             echo "| Bring up + health | $(icon "$UP") |"
             echo "| Observability backplane | $(icon "$OBS") |"
-            echo "| Objecttypen API + token | $(icon "$OBJECTTYPEN") |"
-            echo "| Objecten API + token | $(icon "$OBJECTEN") |"
             echo "| ACL ↔ OpenZaak | $(icon "$ACL") |"
             echo "| OpenZaak → NRC | $(icon "$NRC") |"
             echo "| NRC → Event Subscriber → projection | $(icon "$PROJECTION") |"
@@ -280,7 +270,7 @@ jobs:
       # Log dump must precede teardown (which removes the containers).
       - name: Dump container logs on failure
         if: failure()
-        run: docker compose -f infra/docker-compose.yml logs --no-color --tail=100 oz-init openzaak nrc-init nrc-web nrc-celery nrc-beat flowable-db flowable-rest flowable-init keycloak acl bff domain projection-db event-subscriber projection-api self-service openbaar behandel beheer objecttypen-db objecttypen-redis objecttypen-init objecttypen objecten-db objecten-redis objecten-init objecten tempo prometheus grafana 2>&1 || true
+        run: docker compose -f infra/docker-compose.yml logs --no-color --tail=100 oz-init openzaak nrc-init nrc-web nrc-celery nrc-beat flowable-db flowable-rest flowable-init keycloak acl bff domain projection-db event-subscriber projection-api self-service openbaar behandel beheer tempo prometheus grafana 2>&1 || true
       - name: Tear down
         if: always()
         run: make down

BACKLOG.md

@@ -277,16 +277,10 @@ Split into independently deployable sub-slices (CLAUDE.md §13):
 
 ## Iteration 4 — Objecten and the authoritative register *(milestone: `Iteration 4 — Objecten`)*
 
-### S-18 · Objecten + Objecttypen up in compose; Register objecttype defined *(split — #19 closed)*
+### S-18 · Objecten + Objecttypen up in compose; Register objecttype defined
 
 **Outcome:** Objecten and Objecttypen running. A `RegisterRecord` objecttype defined with the public-safe schema.
 
-Split into independently deployable sub-slices (CLAUDE.md §13):
-
-- **S-18a** (#139, ✅) · Objecttypen API up in compose (own DB + seeded config + health + static token).
-- **S-18b** (#140, ✅) · Objecten API up in compose, wired to Objecttypen. Depends on S-18a.
-- **S-18c** (#141) · RegisterRecord objecttype defined + registered (public-safe JSON schema). Depends on S-18a/b.
-
 ### S-19 · ACL extension: write register-record to Objecten on approval
 
 **Outcome:** Approval path writes the canonical register record to Objecten, not OpenZaak eigenschappen. Projection now sourced from Objecten events.

Makefile

@@ -10,7 +10,7 @@ COMPOSE    := infra/docker-compose.yml
 # Long-running services with a healthcheck — the smoke polls these for readiness
 # (infra/wait-healthy.sh). One-shot init jobs (oz-init, nrc-init, flowable-init)
 # are not polled; they only need to have run. See docs/runbooks/gitea-actions-gotchas.md.
-WAIT_SVCS  := openzaak nrc-web acl bff domain event-subscriber projection-api self-service openbaar behandel beheer objecttypen objecten
+WAIT_SVCS  := openzaak nrc-web acl bff domain event-subscriber projection-api self-service openbaar behandel beheer
 # Config files (OpenZaak data.yaml, Keycloak realms, Flowable BPMN) are streamed
 # into external named volumes via `docker cp` (infra/seed-config.sh) instead of
 # bind-mounted, because bind mounts don't reach sibling containers on the
@@ -18,7 +18,7 @@ WAIT_SVCS  := openzaak nrc-web acl bff domain event-subscriber projection-api se
 # volumes are `external`, so compose won't remove them — CFG_VOLS lists them for
 # explicit teardown. See docs/runbooks/gitea-actions-gotchas.md.
 SEED       := bash infra/seed-config.sh
-CFG_VOLS   := rr-oz-config rr-nrc-config rr-kc-realms rr-fl-bpmn rr-objecttypen-config rr-objecten-config
+CFG_VOLS   := rr-oz-config rr-nrc-config rr-kc-realms rr-fl-bpmn
 # Local-only stack: same services but config is bind-mounted (no seed step), so a
 # plain `docker compose -f infra/docker-compose.local.yml up` works on any local
 # engine. This is the no-make / Windows-friendly path. See that file's header.
@@ -43,7 +43,7 @@ export DOCKER_HOST := unix://$(PODMAN_SOCK)
 endif
 endif
 
-.PHONY: ci lint build unit mutation frontend integration verify verify-up verify-acl verify-nrc verify-projection verify-bff verify-domain verify-observability verify-tracing verify-metrics verify-objecttypen verify-objecten verify-notifications smoke up down local verify-local local-down changelog openzaak-up openzaak-smoke openzaak-seed openzaak-down stack-up stack-smoke stack-down keycloak-up keycloak-smoke keycloak-down flowable-up flowable-smoke flowable-down help
+.PHONY: ci lint build unit mutation frontend integration verify verify-up verify-acl verify-nrc verify-projection verify-bff verify-domain verify-observability verify-tracing verify-metrics verify-notifications smoke up down local verify-local local-down changelog openzaak-up openzaak-smoke openzaak-seed openzaak-down stack-up stack-smoke stack-down keycloak-up keycloak-smoke keycloak-down flowable-up flowable-smoke flowable-down help
 
 ## ci: run the full pipeline — lint, build, unit, mutation, frontend, verify (mirrors Gitea Actions)
 ## `verify` is the live-stack stage (full stack up once → ACL + notification checks).
@@ -94,14 +94,14 @@ mutation:
 # podman-compose, and needing no `--wait` flag or host port access. The one-shots
 # (oz-init, flowable-init) aren't polled; they just need to have run.
 smoke:
-	$(SEED) oz nrc kc fl objecttypen objecten
+	$(SEED) oz nrc kc fl
 	docker compose -f $(COMPOSE) up -d --build
 	bash -c 'WAIT_TIMEOUT=420 bash infra/wait-healthy.sh $(WAIT_SVCS); rc=$$?; docker compose -f $(COMPOSE) down --volumes; docker volume rm -f $(CFG_VOLS) >/dev/null 2>&1; exit $$rc'
 
 ## up: seed config volumes and start the full stack (use instead of bare
 ## `docker compose up`, which can't self-seed the external config volumes)
 up:
-	$(SEED) oz nrc kc fl objecttypen objecten
+	$(SEED) oz nrc kc fl
 	docker compose -f $(COMPOSE) up -d --build
 
 ## down: stop and remove the local stack (incl. the external config volumes)
@@ -139,7 +139,7 @@ changelog:
 ## verify-up: bring the FULL stack up and wait for health (CI verify-stack step 1;
 ## subsumes the old compose-smoke health gate — the DoD "up reaches green" check).
 verify-up:
-	$(SEED) oz nrc kc fl objecttypen objecten
+	$(SEED) oz nrc kc fl
 	docker compose -f $(COMPOSE) up -d --build
 	WAIT_TIMEOUT=420 bash infra/wait-healthy.sh $(WAIT_SVCS)
 
@@ -186,21 +186,11 @@ verify-tracing:
 verify-metrics:
 	bash infra/run-metrics-check.sh
 
-## verify-objecttypen: assert the Objecttypen API is up + its static token authenticates
-## (S-18a), against the already-running stack.
-verify-objecttypen:
-	bash infra/run-objecttypen-check.sh
-
-## verify-objecten: assert the Objecten API is up + its static token authenticates and it
-## trusts the Objecttypen API (S-18b), against the already-running stack.
-verify-objecten:
-	bash infra/run-objecten-check.sh
-
 ## verify: local mirror of the CI verify-stack job — full stack up once, all checks,
 ## tear down (always). For fast single-concern local iteration use `integration`
 ## (oz-only) or `verify-notifications` (oz+nrc) instead.
 verify:
-	$(SEED) oz nrc kc fl objecttypen objecten
+	$(SEED) oz nrc kc fl
 	docker compose -f $(COMPOSE) up -d --build
 	@bash -c 'set -e; rc=0; \
 	  WAIT_TIMEOUT=420 bash infra/wait-healthy.sh $(WAIT_SVCS) \

docs/demo-script.md

@@ -5,64 +5,6 @@ copy-pasteable walkthrough against a local `make up` stack.
 
 ---
 
-## S-18b — Objecten API up in compose, wired to Objecttypen (#140)
-
-**Outcome:** the upstream Maykin **Objecten API** runs in the stack — own **PostGIS** DB + redis,
-config seeded like the other CG modules (`objecten-init` runs `setup_configuration` from the
-`rr-objecten-config` volume: migrate + provision a dev **static API token** + register the
-**Objecttypen API** (S-18a) as a trusted service), a health-checked `objecten` web on host `:8021`.
-An object can now reference its objecttype; the ACL writes register records here on approval (S-19).
-
-```bash
-make up
-# 1. The API is up; the seeded token authenticates (401 without, 200 with):
-curl -s -o /dev/null -w "%{http_code}\n" http://localhost:8021/api/v2/objects                                       # 401
-curl -s -o /dev/null -w "%{http_code}\n" -H "Authorization: Token 1234567890abcdef1234567890abcdef12345678" \
-  http://localhost:8021/api/v2/objects                                                                              # 200
-#
-# 2. It trusts Objecttypen — the seeded zgw_consumers service points at the Objecttypen API:
-docker exec infra-objecten-1 python src/manage.py shell -c \
-  "from zgw_consumers.models import Service; print(*[(s.slug,s.api_root) for s in Service.objects.all()])"
-#   → ('objecttypen', 'http://objecttypen:8000/api/v2/')
-#
-# 3. Automated (a CI verify-stack step): asserts unauth 401 + token 200, against the running stack.
-make verify-objecten           # → OK — no-auth 401, token 200
-```
-
-**The path:** verbatim upstream image (`maykinmedia/objects-api`, pinned 3.4.0) + the same seed
-pattern as S-18a — `infra/seed-config.sh objecten` streams `data.yaml` into an external config
-volume, `objecten-init` (RUN_SETUP_CONFIG) applies it. Its `zgw_consumers` step registers Objecttypen
-(`api_type: orc`, api-key auth with the S-18a dev token). The RegisterRecord objecttype (S-18c) and
-the ACL write path (S-19) build on this.
-
----
-
-## S-18a — Objecttypen API up in compose (#139)
-
-**Outcome:** the upstream Maykin **Objecttypen API** runs in the stack — own Postgres + redis, config
-seeded like the other CG modules (`objecttypen-init` runs `setup_configuration` from the
-`rr-objecttypen-config` volume: migrate + provision a dev **static API token**), a health-checked
-`objecttypen` web service on host `:8020`. This is the objecttype catalogue the register record
-(S-18b/S-18c, S-19) will use.
-
-```bash
-make up
-# 1. The API is up; the seeded token authenticates (401 without, 200 with):
-curl -s -o /dev/null -w "%{http_code}\n" http://localhost:8020/api/v2/objecttypes                                   # 401
-curl -s -o /dev/null -w "%{http_code}\n" -H "Authorization: Token 0123456789abcdef0123456789abcdef01234567" \
-  http://localhost:8020/api/v2/objecttypes                                                                          # 200
-#
-# 2. Automated (a CI verify-stack step): asserts both, against the running stack.
-make verify-objecttypen        # → OK — no-auth 401, token 200
-```
-
-**The path:** verbatim upstream image (`maykinmedia/objecttypes-api`, pinned) + the same seed pattern
-as OpenZaak/NRC — `infra/seed-config.sh objecttypen` streams `data.yaml` into an external config
-volume, `objecttypen-init` (RUN_SETUP_CONFIG) applies it. Objecten (S-18b) and the RegisterRecord
-objecttype (S-18c) build on this.
-
----
-
 ## S-15b — Beheer-portal: default-fill configuration editor (#131, ADR-0026)
 
 **Outcome:** a beheerder edits the ACL's ZGW **default-fill** values (bronorganisatie,

infra/docker-compose.local.yml

@@ -560,143 +560,11 @@ services:
         condition: service_started
     networks: [cg]
 
-  # ── Objecttypen API (S-18a) — bind-mounted config (local variant) ──────────
-  objecttypen-db:
-    image: docker.io/library/postgres:17-alpine
-    environment:
-      POSTGRES_USER: objecttypes
-      POSTGRES_PASSWORD: objecttypes
-      POSTGRES_DB: objecttypes
-    volumes:
-      - objecttypen-db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U objecttypes"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    networks: [cg]
-
-  objecttypen-redis:
-    image: docker.io/library/redis:7
-    networks: [cg]
-
-  objecttypen-init:
-    image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
-    environment: &objecttypen-env-local
-      # 1 uWSGI worker, not the image default of 4×4 (#144) — idle workers starve the CI runner.
-      UWSGI_PROCESSES: "1"
-      UWSGI_THREADS: "2"
-      DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
-      SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
-      DB_HOST: objecttypen-db
-      DB_NAME: objecttypes
-      DB_USER: objecttypes
-      DB_PASSWORD: objecttypes
-      ALLOWED_HOSTS: "*"
-      CACHE_DEFAULT: objecttypen-redis:6379/0
-      CACHE_AXES: objecttypen-redis:6379/0
-      DISABLE_2FA: "true"
-      OTEL_SDK_DISABLED: "true"
-      RUN_SETUP_CONFIG: "true"
-    command: /setup_configuration.sh
-    volumes:
-      - ./objecttypen/setup_configuration:/app/setup_configuration:ro,z
-    depends_on:
-      objecttypen-db:
-        condition: service_healthy
-      objecttypen-redis:
-        condition: service_started
-    networks: [cg]
-
-  objecttypen:
-    image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
-    environment: *objecttypen-env-local
-    healthcheck:
-      test: ["CMD", "python", "-c", "import requests,sys; sys.exit(0 if requests.head('http://localhost:8000/admin/').status_code in (200,302) else 1)"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-    ports:
-      - "8020:8000"
-    depends_on:
-      objecttypen-init:
-        condition: service_completed_successfully
-    networks: [cg]
-
-  # ── Objecten API (S-18b) — bind-mounted config (local variant) ─────────────
-  objecten-db:
-    image: docker.io/postgis/postgis:17-3.5
-    environment:
-      POSTGRES_USER: objects
-      POSTGRES_PASSWORD: objects
-      POSTGRES_DB: objects
-    volumes:
-      - objecten-db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U objects"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    networks: [cg]
-
-  objecten-redis:
-    image: docker.io/library/redis:7
-    networks: [cg]
-
-  objecten-init:
-    image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
-    environment: &objecten-env-local
-      # 1 uWSGI worker, not the image default of 4×4 (#144) — idle workers starve the CI runner.
-      UWSGI_PROCESSES: "1"
-      UWSGI_THREADS: "2"
-      DJANGO_SETTINGS_MODULE: objects.conf.docker
-      SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
-      DB_HOST: objecten-db
-      DB_NAME: objects
-      DB_USER: objects
-      DB_PASSWORD: objects
-      ALLOWED_HOSTS: "*"
-      CACHE_DEFAULT: objecten-redis:6379/0
-      CACHE_AXES: objecten-redis:6379/0
-      DISABLE_2FA: "true"
-      OTEL_SDK_DISABLED: "true"
-      RUN_SETUP_CONFIG: "true"
-    command: /setup_configuration.sh
-    volumes:
-      - ./objecten/setup_configuration:/app/setup_configuration:ro,z
-    depends_on:
-      objecten-db:
-        condition: service_healthy
-      objecten-redis:
-        condition: service_started
-      objecttypen:
-        condition: service_healthy
-    networks: [cg]
-
-  objecten:
-    image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
-    environment: *objecten-env-local
-    healthcheck:
-      test: ["CMD", "python", "-c", "import requests,sys; sys.exit(0 if requests.head('http://localhost:8000/admin/').status_code in (200,302) else 1)"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-    ports:
-      - "8021:8000"
-    depends_on:
-      objecten-init:
-        condition: service_completed_successfully
-    networks: [cg]
-
 volumes:
   oz-db:
   nrc-db:
   flowable-db:
   projection-db:
-  objecttypen-db:
-  objecten-db:
   # Carries the seed-generated acl.env (server-assigned zaaktype URLs) from local-seed to the ACL.
   seed-env:
 

infra/docker-compose.yml

@@ -569,150 +569,6 @@ services:
         condition: service_started
     networks: [cg]
 
-  # ── Objecttypen API (S-18a) — upstream Maykin image, verbatim ──────────────
-  # The register's objecttype catalogue. Same shape as the other CG modules: own DB + redis, an
-  # `-init` that runs setup_configuration (RUN_SETUP_CONFIG → migrate + provision a static API token)
-  # from the external config volume streamed in by infra/seed-config.sh, and a health-checked web
-  # service that depends on init completing.
-  objecttypen-db:
-    image: docker.io/library/postgres:17-alpine
-    environment:
-      POSTGRES_USER: objecttypes
-      POSTGRES_PASSWORD: objecttypes
-      POSTGRES_DB: objecttypes
-    volumes:
-      - objecttypen-db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U objecttypes"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    networks: [cg]
-
-  objecttypen-redis:
-    image: docker.io/library/redis:7
-    networks: [cg]
-
-  objecttypen-init:
-    image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
-    environment: &objecttypen-env
-      # 1 uWSGI worker, not the image default of 4×4: this API only serves single-request smoke
-      # checks and sits idle during the e2e step — 4 idle Django workers each pin ~200 MB and starve
-      # the shared CI runner (#144). Init ignores this (it runs setup_configuration, not uwsgi).
-      UWSGI_PROCESSES: "1"
-      UWSGI_THREADS: "2"
-      DJANGO_SETTINGS_MODULE: objecttypes.conf.docker
-      SECRET_KEY: ${OBJECTTYPES_SECRET_KEY:-dev-only-not-for-production}
-      DB_HOST: objecttypen-db
-      DB_NAME: objecttypes
-      DB_USER: objecttypes
-      DB_PASSWORD: objecttypes
-      ALLOWED_HOSTS: "*"
-      CACHE_DEFAULT: objecttypen-redis:6379/0
-      CACHE_AXES: objecttypen-redis:6379/0
-      DISABLE_2FA: "true"
-      OTEL_SDK_DISABLED: "true"
-      RUN_SETUP_CONFIG: "true"
-    command: /setup_configuration.sh
-    # data.yaml is streamed into this external volume by infra/seed-config.sh before start.
-    volumes:
-      - objecttypen-config:/app/setup_configuration:ro
-    depends_on:
-      objecttypen-db:
-        condition: service_healthy
-      objecttypen-redis:
-        condition: service_started
-    networks: [cg]
-
-  objecttypen:
-    image: docker.io/maykinmedia/objecttypes-api:${OBJECTTYPES_TAG:-3.4.2}
-    environment: *objecttypen-env
-    healthcheck:
-      test: ["CMD", "python", "-c", "import requests,sys; sys.exit(0 if requests.head('http://localhost:8000/admin/').status_code in (200,302) else 1)"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-    ports:
-      - "8020:8000"
-    depends_on:
-      objecttypen-init:
-        condition: service_completed_successfully
-    networks: [cg]
-
-  # ── Objecten API (S-18b) — upstream Maykin image, verbatim ─────────────────
-  # The authoritative object store. Same shape as Objecttypen (own DB + redis, an `-init` that runs
-  # setup_configuration from the external config volume, a health-checked web). Two differences: the
-  # DB is PostGIS (objects carry geometry), and setup_configuration registers the Objecttypen API
-  # (S-18a) as a trusted service so an object can reference its objecttype.
-  objecten-db:
-    image: docker.io/postgis/postgis:17-3.5
-    environment:
-      POSTGRES_USER: objects
-      POSTGRES_PASSWORD: objects
-      POSTGRES_DB: objects
-    volumes:
-      - objecten-db:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U objects"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    networks: [cg]
-
-  objecten-redis:
-    image: docker.io/library/redis:7
-    networks: [cg]
-
-  objecten-init:
-    image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
-    environment: &objecten-env
-      # 1 uWSGI worker, not the image default of 4×4 — see the objecttypen note above (#144).
-      UWSGI_PROCESSES: "1"
-      UWSGI_THREADS: "2"
-      DJANGO_SETTINGS_MODULE: objects.conf.docker
-      SECRET_KEY: ${OBJECTS_SECRET_KEY:-dev-only-not-for-production}
-      DB_HOST: objecten-db
-      DB_NAME: objects
-      DB_USER: objects
-      DB_PASSWORD: objects
-      ALLOWED_HOSTS: "*"
-      CACHE_DEFAULT: objecten-redis:6379/0
-      CACHE_AXES: objecten-redis:6379/0
-      DISABLE_2FA: "true"
-      OTEL_SDK_DISABLED: "true"
-      RUN_SETUP_CONFIG: "true"
-    command: /setup_configuration.sh
-    # data.yaml is streamed into this external volume by infra/seed-config.sh before start.
-    volumes:
-      - objecten-config:/app/setup_configuration:ro
-    depends_on:
-      objecten-db:
-        condition: service_healthy
-      objecten-redis:
-        condition: service_started
-      # Objecten's setup_configuration registers the Objecttypen service; that service only needs to
-      # exist as config, but wait for Objecttypen to be up so the register is meaningful end to end.
-      objecttypen:
-        condition: service_healthy
-    networks: [cg]
-
-  objecten:
-    image: docker.io/maykinmedia/objects-api:${OBJECTS_TAG:-3.4.0}
-    environment: *objecten-env
-    healthcheck:
-      test: ["CMD", "python", "-c", "import requests,sys; sys.exit(0 if requests.head('http://localhost:8000/admin/').status_code in (200,302) else 1)"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-      start_period: 30s
-    ports:
-      - "8021:8000"
-    depends_on:
-      objecten-init:
-        condition: service_completed_successfully
-    networks: [cg]
-
   # ── Observability backplane (S-16a, ADR-0023) ──────────────────────────────
   # Grafana-native stack: Tempo ingests OTLP traces (the .NET services export
   # straight to it — no collector hop, S-16b), Prometheus scrapes service
@@ -762,8 +618,6 @@ volumes:
   nrc-db:
   flowable-db:
   projection-db:
-  objecttypen-db:
-  objecten-db:
   # Config volumes — created and populated out-of-band by infra/seed-config.sh
   # (docker cp), because bind mounts don't reach sibling containers on the CI
   # runner. `external` keeps the names deterministic; the seed step manages them.
@@ -779,12 +633,6 @@ volumes:
   fl-bpmn:
     external: true
     name: rr-fl-bpmn
-  objecttypen-config:
-    external: true
-    name: rr-objecttypen-config
-  objecten-config:
-    external: true
-    name: rr-objecten-config
 
 networks:
   cg:

infra/objecten-check.py

@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-"""S-18b (#140): prove the Objecten API is up and its static token authenticates.
-
-Assert an unauthenticated call to /api/v2/objects is 401 and an authenticated one (the seeded dev
-token) is 200 — i.e. the service migrated, booted, and setup_configuration provisioned the token
-and the Objecttypen service it trusts. Stdlib only so it runs in a bare python:3-slim container on
-the compose network.
-"""
-import os
-import sys
-import time
-import urllib.error
-import urllib.request
-
-BASE = os.environ["OBJECTEN"]          # http://<ip>:8000
-TOKEN = os.environ["OBJECTEN_TOKEN"]
-TIMEOUT = int(os.environ.get("OBJECTEN_TIMEOUT", "60"))
-
-
-def status(url, token=None):
-    req = urllib.request.Request(url)
-    if token:
-        req.add_header("Authorization", f"Token {token}")
-    try:
-        with urllib.request.urlopen(req, timeout=10) as r:
-            return r.status
-    except urllib.error.HTTPError as e:
-        return e.code
-    except Exception:
-        return 0
-
-
-def main():
-    url = f"{BASE}/api/v2/objects"
-    deadline = time.time() + TIMEOUT
-    while time.time() < deadline:
-        unauth = status(url)
-        authed = status(url, TOKEN)
-        if unauth == 401 and authed == 200:
-            print(f"OK — {url}: no-auth {unauth}, token {authed}")
-            return 0
-        time.sleep(3)
-    print(f"FAIL — {url}: expected no-auth 401 + token 200, got {status(url)} / {status(url, TOKEN)}",
-          file=sys.stderr)
-    return 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

infra/objecten/setup_configuration/data.yaml

@@ -1,31 +0,0 @@
-# Objecten API setup_configuration (S-18b). Streamed into the external rr-objecten-config volume by
-# infra/seed-config.sh and applied by objecten-init (RUN_SETUP_CONFIG). Declarative + idempotent.
-#
-# Two things: (1) register the Objecttypen API (S-18a) as a trusted service so an object can
-# reference its objecttype — authenticating with the dev static token Objecttypen provisioned; and
-# (2) a dev static token so peers (the ACL, S-19) can write objects here. Dev-only, not for prod.
-
-# (1) Trust the Objecttypen API. `orc` = overige RESTful component (how zgw_consumers classifies the
-# Objecttypen API). The RegisterRecord objecttype (S-18c) will reference an objecttype under this
-# service by uuid.
-zgw_consumers_config_enable: true
-zgw_consumers:
-  services:
-    - identifier: objecttypen
-      label: Objecttypen API
-      api_type: orc
-      api_root: http://objecttypen:8000/api/v2/
-      auth_type: api_key
-      header_key: Authorization
-      header_value: Token 0123456789abcdef0123456789abcdef01234567
-
-# (2) Static API token peers use to write/read objects.
-tokenauth_config_enable: true
-tokenauth:
-  items:
-    - identifier: register-referentie
-      token: 1234567890abcdef1234567890abcdef12345678
-      contact_person: Register Referentie
-      email: admin@localhost
-      organization: Respellion
-      is_superuser: true

infra/objecttypen-check.py

@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-"""S-18a (#139): prove the Objecttypen API is up and its static token authenticates.
-
-Assert an unauthenticated call to /api/v2/objecttypes is 401 and an authenticated one (the seeded
-dev token) is 200 — i.e. the service migrated, booted, and setup_configuration provisioned the token.
-Stdlib only so it runs in a bare python:3-slim container on the compose network.
-"""
-import os
-import sys
-import time
-import urllib.error
-import urllib.request
-
-BASE = os.environ["OBJECTTYPEN"]          # http://<ip>:8000
-TOKEN = os.environ["OBJECTTYPEN_TOKEN"]
-TIMEOUT = int(os.environ.get("OBJECTTYPEN_TIMEOUT", "60"))
-
-
-def status(url, token=None):
-    req = urllib.request.Request(url)
-    if token:
-        req.add_header("Authorization", f"Token {token}")
-    try:
-        with urllib.request.urlopen(req, timeout=10) as r:
-            return r.status
-    except urllib.error.HTTPError as e:
-        return e.code
-    except Exception:
-        return 0
-
-
-def main():
-    url = f"{BASE}/api/v2/objecttypes"
-    deadline = time.time() + TIMEOUT
-    while time.time() < deadline:
-        unauth = status(url)
-        authed = status(url, TOKEN)
-        if unauth == 401 and authed == 200:
-            print(f"OK — {url}: no-auth {unauth}, token {authed}")
-            return 0
-        time.sleep(3)
-    print(f"FAIL — {url}: expected no-auth 401 + token 200, got {status(url)} / {status(url, TOKEN)}",
-          file=sys.stderr)
-    return 1
-
-
-if __name__ == "__main__":
-    sys.exit(main())

infra/objecttypen/setup_configuration/data.yaml

@@ -1,11 +0,0 @@
-# Objecttypen API setup_configuration (S-18a). Streamed into the external rr-objecttypen-config
-# volume by infra/seed-config.sh and applied by objecttypen-init (RUN_SETUP_CONFIG). Declarative +
-# idempotent. Dev-only static token so peers (Objecten S-18b, the ACL) can authenticate.
-tokenauth_config_enable: true
-tokenauth:
-  items:
-    - identifier: register-referentie
-      token: 0123456789abcdef0123456789abcdef01234567
-      contact_person: Register Referentie
-      email: admin@localhost
-      organization: Respellion

infra/run-objecten-check.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# S-18b (#140): assert the Objecten API is healthy + its static token authenticates, against an
-# ALREADY-RUNNING stack. Runs the check in a python:3-slim container on the stack network (the
-# service is reached by container IP; the runner can't reach published ports — gitea-actions-gotchas.md
-# §5/§6). Does NOT manage the stack lifecycle.
-set -euo pipefail
-
-here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# The dev token provisioned by infra/objecten/setup_configuration/data.yaml.
-TOKEN="${OBJECTEN_TOKEN:-1234567890abcdef1234567890abcdef12345678}"
-
-ot="$(docker ps -q --filter 'name=objecten' --filter 'health=healthy' | head -1)"
-[ -n "$ot" ] || ot="$(docker ps -q --filter 'name=[-_]objecten[-_]' | head -1)"
-[ -n "$ot" ] || { echo "ERROR: no running objecten container — bring the stack up first" >&2; exit 1; }
-net="$(docker inspect -f '{{range $k,$_ := .NetworkSettings.Networks}}{{$k}}{{"\n"}}{{end}}' "$ot" | head -1)"
-ip="$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$ot")"
-echo ">> network=$net objecten=$ip"
-
-cid="$(docker create --network "$net" \
-  -e "OBJECTEN=http://$ip:8000" -e "OBJECTEN_TOKEN=$TOKEN" \
-  -e "OBJECTEN_TIMEOUT=${OBJECTEN_TIMEOUT:-60}" \
-  python:3-slim python /objecten-check.py)"
-docker cp "$here/objecten-check.py" "$cid:/objecten-check.py" >/dev/null
-rc=0; docker start -a "$cid" || rc=$?
-docker rm -f "$cid" >/dev/null
-exit $rc

infra/run-objecttypen-check.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# S-18a (#139): assert the Objecttypen API is healthy + its static token authenticates, against an
-# ALREADY-RUNNING stack. Runs the check in a python:3-slim container on the stack network (the
-# service is reached by container IP; the runner can't reach published ports — gitea-actions-gotchas.md
-# §5/§6). Does NOT manage the stack lifecycle.
-set -euo pipefail
-
-here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# The dev token provisioned by infra/objecttypen/setup_configuration/data.yaml.
-TOKEN="${OBJECTTYPEN_TOKEN:-0123456789abcdef0123456789abcdef01234567}"
-
-ot="$(docker ps -q --filter 'name=objecttypen' --filter 'health=healthy' | head -1)"
-[ -n "$ot" ] || ot="$(docker ps -q --filter 'name=[-_]objecttypen[-_]' | head -1)"
-[ -n "$ot" ] || { echo "ERROR: no running objecttypen container — bring the stack up first" >&2; exit 1; }
-net="$(docker inspect -f '{{range $k,$_ := .NetworkSettings.Networks}}{{$k}}{{"\n"}}{{end}}' "$ot" | head -1)"
-ip="$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$ot")"
-echo ">> network=$net objecttypen=$ip"
-
-cid="$(docker create --network "$net" \
-  -e "OBJECTTYPEN=http://$ip:8000" -e "OBJECTTYPEN_TOKEN=$TOKEN" \
-  -e "OBJECTTYPEN_TIMEOUT=${OBJECTTYPEN_TIMEOUT:-60}" \
-  python:3-slim python /objecttypen-check.py)"
-docker cp "$here/objecttypen-check.py" "$cid:/objecttypen-check.py" >/dev/null
-rc=0; docker start -a "$cid" || rc=$?
-docker rm -f "$cid" >/dev/null
-exit $rc

infra/seed-config.sh

@@ -13,7 +13,7 @@
 # subcommand. Fixed-name `external` volumes keep the names deterministic across
 # both runtimes. See docs/runbooks/gitea-actions-gotchas.md.
 #
-# Usage: seed-config.sh <key> [<key> ...]   where key ∈ { oz, nrc, kc, fl, objecttypen, objecten }
+# Usage: seed-config.sh <key> [<key> ...]   where key ∈ { oz, kc, fl }
 set -euo pipefail
 
 here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -33,7 +33,7 @@ populate() {  # volume  source(file or dir/.)
   echo "  seeded $vol"
 }
 
-[ "$#" -gt 0 ] || { echo "usage: seed-config.sh <oz|nrc|kc|fl|objecttypen|objecten> ..." >&2; exit 2; }
+[ "$#" -gt 0 ] || { echo "usage: seed-config.sh <oz|nrc|kc|fl> ..." >&2; exit 2; }
 
 # The registratie process (BPMN) and its diploma-eligibility DMN are deployed as SEPARATE Flowable
 # deployments — the process engine and the DMN engine each own theirs (S-13, ADR-0016). flowable-rest
@@ -49,8 +49,6 @@ for key in "$@"; do
     oz) populate rr-oz-config "$here/openzaak/setup_configuration/." ;;
     nrc) populate rr-nrc-config "$here/opennotificaties/setup_configuration/." ;;
     kc) populate rr-kc-realms "$here/keycloak/realms/." ;;
-    objecttypen) populate rr-objecttypen-config "$here/objecttypen/setup_configuration/." ;;
-    objecten) populate rr-objecten-config "$here/objecten/setup_configuration/." ;;
     fl) d="$(mktemp -d)"; stage_flowable_workflows "$d"; populate rr-fl-bpmn "$d/." ;;
     *)  echo "unknown seed key: $key" >&2; exit 2 ;;
   esac