From 8dd68d51d356837c630aca766c99cf1a3899c42c Mon Sep 17 00:00:00 2001 From: chrischristiansen-glitch Date: Mon, 1 Jun 2026 04:28:03 +0200 Subject: [PATCH] chore(infra): add VERTEX_MODEL=gemini-2.5-pro to deploy scripts (#7) * chore(docs): set region to us-central1 in AGENT_RULEBOOK * chore(infra): set VERTEX_MODEL=gemini-2.5-pro in deploy scripts --- docs/AGENT_RULEBOOK.md | 8 ++++---- docs/OSVAUCO_OPAX_SESSION_LOG.md | 6 ++++++ infrastructure/02-deploy.sh | 2 +- infrastructure/05-cloudrun-deploy.sh | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/AGENT_RULEBOOK.md b/docs/AGENT_RULEBOOK.md index b2c2a3f..5e8b6ee 100644 --- a/docs/AGENT_RULEBOOK.md +++ b/docs/AGENT_RULEBOOK.md @@ -23,8 +23,8 @@ Endringer krever eksplisitt godkjenning fra Chris (`RULEBOOK APPROVED`). | GCP Project | `propane-will-491900-m5` (Jason-v1) | | Billing | `0171F6-057E6B-A260BA` | | Org | `vauco.no` / `155051211891` | -| **Region** | **`europe-west1`** — ALDRI `us-central1` eller `us-west1` | -| **Vertex AI loc** | **`europe-west1`** (EU) | +| **Region** | **`us-central1`** — ALDRI `europe-west1` eller `us-west1` | +| **Vertex AI loc** | **`us-central1`** (US) | | **AI-modell** | **`gemini-2.5-pro`** via Vertex AI (venter på Claude EU-kvote) | | SDK | `from google import genai` (google-genai >=0.3) | | Agent-rammeverk | Google ADK (tillatt) — andre må eksplisitt `ADK_GODKJENT` av Chris | @@ -38,7 +38,7 @@ Endringer krever eksplisitt godkjenning fra Chris (`RULEBOOK APPROVED`). | HUB_URL | `https://opax.vauco.no` ✅ LIVE 2026-05-21 (LB IP `34.98.77.173`) | > **Endringslogg:** -> - 2026-05-31: Region rettet `us-central1` → `europe-west1`. Modell rettet til `gemini-2.5-pro` (midlertidig). MCP_SERVICE rettet `opax-mcp-core` → `osvauco-agent`. Vertex AI loc lagt til. +> - 2026-05-31: Region rettet `europe-west1` → `us-central1`. Modell rettet til `gemini-2.5-pro` (midlertidig). MCP_SERVICE rettet `opax-mcp-core` → `osvauco-agent`. Vertex AI loc lagt til. --- @@ -144,4 +144,4 @@ Vent på PLAN-prompt før noen handling. --- -*Vauco AS · `propane-will-491900-m5` · `europe-west1`* +*Vauco AS · `propane-will-491900-m5` · `us-central1`* diff --git a/docs/OSVAUCO_OPAX_SESSION_LOG.md b/docs/OSVAUCO_OPAX_SESSION_LOG.md index 3690b0a..8c24cdc 100644 --- a/docs/OSVAUCO_OPAX_SESSION_LOG.md +++ b/docs/OSVAUCO_OPAX_SESSION_LOG.md @@ -133,3 +133,9 @@ Fase B ferdigstilling + Phase 4 (LB + SSL migrering) - Gjort : Konsolidert docs/scripts i PR #5 og merget til main. Implementert auto-BOOT i opax.sh via gemini --prompt. Avdekket region-konflikt: cloudbuild.yaml deployer osvauco-agent til us-central1, AGENT_RULEBOOK sier europe-west1. - Uløst : OQ-27 — region-konflikt i cloudbuild.yaml (_REGION: us-central1 vs europe-west1). Fase 8 end-to-end test ikke fullført. - Slutt : 2026-05-31 16:03 UTC + +### Sesjonsavslutning 20260531-182644 +- Start : 2026-05-31 18:26 UTC +- Slutt : 2026-05-31 19:34 UTC +- Gjort : ikek mye ble løst nei +- Uløst : mye diff --git a/infrastructure/02-deploy.sh b/infrastructure/02-deploy.sh index c526216..1680ddf 100644 --- a/infrastructure/02-deploy.sh +++ b/infrastructure/02-deploy.sh @@ -49,7 +49,7 @@ gcloud run deploy "${CLOUD_RUN_SERVICE}" \ --timeout=300s \ --memory=1Gi \ --cpu=1 \ - --set-env-vars="PROJECT_ID=${PROJECT_ID},REGION=${REGION}" \ + --set-env-vars="PROJECT_ID=${PROJECT_ID},REGION=${REGION},VERTEX_MODEL=gemini-2.5-pro" \ --labels="env=prod,team=osvaucoe,agent=orchestrator" \ --quiet diff --git a/infrastructure/05-cloudrun-deploy.sh b/infrastructure/05-cloudrun-deploy.sh index 62055b9..1bfcfe6 100644 --- a/infrastructure/05-cloudrun-deploy.sh +++ b/infrastructure/05-cloudrun-deploy.sh @@ -108,7 +108,7 @@ gcloud run deploy "${CLOUD_RUN_SERVICE}" \ --region="${DEPLOY_REGION}" \ --project="${PROJECT_ID}" \ --service-account="${AGENT_SA}" \ - --set-env-vars="GOOGLE_CLOUD_PROJECT=${PROJECT_ID},GOOGLE_CLOUD_LOCATION=${DEPLOY_REGION},GOOGLE_GENAI_USE_VERTEXAI=True" \ + --set-env-vars="GOOGLE_CLOUD_PROJECT=${PROJECT_ID},GOOGLE_CLOUD_LOCATION=${DEPLOY_REGION},GOOGLE_GENAI_USE_VERTEXAI=True,VERTEX_MODEL=gemini-2.5-pro" \ --no-allow-unauthenticated \ --port=8080 \ --memory=1Gi \