diff --git a/deploy/kubernetes/region/base/deployment.yaml b/deploy/kubernetes/region/base/deployment.yaml index 5b1bab4..0e61a15 100644 --- a/deploy/kubernetes/region/base/deployment.yaml +++ b/deploy/kubernetes/region/base/deployment.yaml @@ -59,24 +59,37 @@ spec: # M10 QUIC dev sessions are loopback by default. Only the enabled # dev-session-route component (ADR-0087) may bind the pod interface. m10=() + grant=() if [ -n "$REGION_SESSION" ]; then m10=(--m10-listen "$REGION_SESSION_LISTEN" --m10-cert /run/session/server.pem --m10-key /run/session/server.key --m10-issuer /run/session/issuer.pub - --m10-environment "$REGION_SESSION" --session-window "$REGION_SESSION_WINDOW" - --m10-max-grant-lifetime "$REGION_M10_MAX_GRANT_LIFETIME") + --m10-environment "$REGION_SESSION" --session-window "$REGION_SESSION_WINDOW") + grant=(--m10-max-grant-lifetime "$REGION_M10_MAX_GRANT_LIFETIME") fi - exec /usr/local/bin/evo-server --profile lineage "${retained[@]}" "${inputs[@]}" \ + # Lineage keeps its 20 s drain and overlay grant ceiling. The cellular + # profile (M11.3) fixes its own 10 s drain and 300 s grant ceiling and + # needs the world's --life-route catalog, one entry per region. + profile=(--profile lineage "${grant[@]}" --drain-ms 20000) + if [ "$REGION_PROFILE" = cellular ]; then + profile=(--profile cellular) + for route in $REGION_LIFE_ROUTES; do profile+=(--life-route "$route"); done + fi + exec /usr/local/bin/evo-server "${profile[@]}" "${retained[@]}" "${inputs[@]}" \ "${m10[@]}" \ --world "$REGION_WORLD" --region "$REGION_ID" --frame "$REGION_FRAME" \ --pg-service /run/postgres/pg_service.conf --pg-passfile /run/postgres/pgpass \ --objects /objects --objects-reserve-mib "$REGION_RESERVE_MIB" \ --build "$REGION_BUILD" --lease-profile default \ - --flush-ms 1000 --drain-ms 20000 --ops-listen 0.0.0.0:9100 + --flush-ms 1000 --ops-listen 0.0.0.0:9100 env: - {name: REGION_WORLD, value: set-by-overlay} - {name: REGION_ID, value: set-by-overlay} - {name: REGION_FRAME, value: "9"} - {name: REGION_BUILD, value: set-by-overlay} + # lineage, or cellular (M11.3, needs a cellular-v1 genesis and REGION_LIFE_ROUTES: + # space-separated REGION=HOST:PORT=TLS_NAME, one per region including this one). + - {name: REGION_PROFILE, value: lineage} + - {name: REGION_LIFE_ROUTES, value: ""} # Earlier builds whose commits this region may still hold, space-separated. - {name: REGION_RETAINED, value: ""} # Drill-only overrides; Git keeps no synthetic load and the 1024 MiB reserve. diff --git a/deploy/kubernetes/region/base/provision-job.yaml b/deploy/kubernetes/region/base/provision-job.yaml index 156c226..51cad64 100644 --- a/deploy/kubernetes/region/base/provision-job.yaml +++ b/deploy/kubernetes/region/base/provision-job.yaml @@ -42,14 +42,20 @@ spec: set -eu umask 077 cp /run/postgres/pgpass /tmp/pgpass + # cellular-v1 needs its explicit opening (frame, funding, sites, patches, + # stable commit) as whitespace-free words in REGION_OPENING_ARGS. + opening=(--opening "$REGION_OPENING") + for word in $REGION_OPENING_ARGS; do opening+=("$word"); done exec /usr/local/bin/evo-world-clone provision \ - --world "$REGION_WORLD" --region "$REGION_ID" --opening development-v1 \ + --world "$REGION_WORLD" --region "$REGION_ID" "${opening[@]}" \ --pg-service /run/postgres/pg_service.conf --pg-passfile /tmp/pgpass \ --objects /objects --build "$REGION_BUILD" --retain-build true env: - {name: REGION_WORLD, value: set-by-overlay} - {name: REGION_ID, value: set-by-overlay} - {name: REGION_BUILD, value: set-by-overlay} + - {name: REGION_OPENING, value: development-v1} + - {name: REGION_OPENING_ARGS, value: ""} resources: requests: {cpu: 50m, memory: 64Mi} limits: {memory: 256Mi} diff --git a/deploy/kubernetes/region/dev/kustomization.yaml b/deploy/kubernetes/region/dev/kustomization.yaml index f27cee6..6da4622 100644 --- a/deploy/kubernetes/region/dev/kustomization.yaml +++ b/deploy/kubernetes/region/dev/kustomization.yaml @@ -1,4 +1,4 @@ -# Region host for evolution-dev: world 100, region 1, frame 9 (development opening). +# Region host for evolution-dev: world 100, region 2, frame 9 (cellular-v1 opening, M11.3). # The server image digest appears twice on purpose: as the image and as the build # identity the region records in every commit. The policy check requires they match. apiVersion: kustomize.config.k8s.io/v1beta1 diff --git a/deploy/kubernetes/region/dev/region-values.yaml b/deploy/kubernetes/region/dev/region-values.yaml index 6aabfe9..296f8d0 100644 --- a/deploy/kubernetes/region/dev/region-values.yaml +++ b/deploy/kubernetes/region/dev/region-values.yaml @@ -1,4 +1,6 @@ # Region identity and build (the server image digest without "sha256:"). +# M11.3 cellular probe: region 2 holds a cellular-v1 genesis. Region 1's lineage history +# stays in the stores untouched; it is simply not served while dev runs cellular. apiVersion: apps/v1 kind: Deployment metadata: @@ -10,8 +12,11 @@ spec: - name: evo-server env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "1"} + - {name: REGION_ID, value: "2"} - {name: REGION_BUILD, value: 566c29329433934f1436faf94652a7b925df8b4587ab04470322172f47c31c02} + - {name: REGION_PROFILE, value: cellular} + # The whole world's catalog: dev world 100 has only this region. + - {name: REGION_LIFE_ROUTES, value: "2=void.aeternalisgames.com:7400=void.aeternalisgames.com"} # Keep the currently promoted build plus prior committed builds recoverable. - {name: REGION_RETAINED, value: "6c96629eb3c26513d55207b109fe2a9873a58f43510bd067b7d5422572e3fb42 7952185d5ef96504b5793b76fe72e42cbe9c9ac19149bf912adb2c3a735f8dbf f378a43d6146eeed864110b90848df0bec9672fa4c9941a2d04de249068a4a09 ecac8f9f2489c547ce58f12ed01baaa3939c8adbf8aed05c313abbf422cdc855 4af7209941643e0c6a100e2b4e2fef8a959b87fdbfac2173b7867cfc1808bd66 edb39f956df1f481d7ba724cac4ceb3a4fe494efc02f994d31d6c96dfae04a78 0ded41070dd3e0c0daa43e13dadc58c449865eec00530cfceff3c1579c66e916 754446fe4e5f33e9c0d5a1a74a02444a01de1700673442c90827c708aba62cee c597c0bac8b4a796e1e8b70344f9866cb047cc90cfb15af774d38860594ea27a e83c333a87056c678b5e835947647ef42370b43dbfc31997744f28d993f9c4aa db2b0e6a6071502381a768d70fd9bab8c08c64e4717fc23da45dbe8adc5fa3d6 cdc10712ff8bf956f8f5900709500046493523b51dc670d5b2d01eaf604bcd38 028571f257b485acafbe79b704a80f273d899485c4bb264d9c8137bf51e33217"} --- @@ -26,5 +31,27 @@ spec: - name: provision env: - {name: REGION_WORLD, value: "100"} - - {name: REGION_ID, value: "1"} + - {name: REGION_ID, value: "2"} - {name: REGION_BUILD, value: 566c29329433934f1436faf94652a7b925df8b4587ab04470322172f47c31c02} + # M11.3 dev trial opening (tunable, not a world rule): 10 x 10 mm arena at 20 C; + # nursery funds 8 primitive founders (8 x primitive_endowment()); 8 spawn sites; + # 4 rich (~2 founders), 3 lean and 1 empty 1,000 um patch (X,Y,SOURCE,ENERGY,C,N,P,O). + # Genesis is written once: keep --commit stable so every sync resolves it. + - {name: REGION_OPENING, value: cellular-v1} + - name: REGION_OPENING_ARGS + value: >- + --frame 9 --source-id 1 --commit 18ff2e1ab8cef4c9cd73d4cc6e322496 + --width-um 10000 --height-um 10000 --ambient-temperature-mk 293150 + --funding-energy-pj 66073600 --funding-carbon-fg 48128000 + --funding-nitrogen-fg 10752000 --funding-phosphorus-fg 5504000 + --funding-other-fg 22656000 + --site 2500,2500 --site 2500,5000 --site 2500,7500 --site 5000,2500 + --site 5000,7500 --site 7500,2500 --site 7500,5000 --site 7500,7500 + --patch 1000,4000,2,4000000,3000000,700000,350000,1400000 + --patch 3000,3000,2,16000000,12000000,2700000,1400000,5700000 + --patch 3000,7000,2,4000000,3000000,700000,350000,1400000 + --patch 5000,5000,2,16000000,12000000,2700000,1400000,5700000 + --patch 6000,1000,2,0,0,0,0,0 + --patch 7000,3000,2,4000000,3000000,700000,350000,1400000 + --patch 7000,7000,2,16000000,12000000,2700000,1400000,5700000 + --patch 9000,9000,2,16000000,12000000,2700000,1400000,5700000