feat(ollama): ADR-110 GCP 三層容災架構(GCP-A → GCP-B → Local → Gemini)
Some checks failed
Code Review / ai-code-review (push) Successful in 50s
CD Pipeline / tests (push) Failing after 1m14s
CD Pipeline / build-and-deploy (push) Has been skipped
CD Pipeline / post-deploy-checks (push) Has been skipped

## 變更摘要
- Primary: http://34.143.170.20:11434 (GCP-A SSD, 9x 載速 + 2x 推理)
- Secondary: http://34.21.145.224:11434 (GCP-B SSD)
- Fallback: http://192.168.0.111:11434 (M1 Pro Local HDD,最後防線)
- 廢止 ADR-105「111 唯一鐵律」,新建 ADR-110

## 核心改動
- config.py: 新增 OLLAMA_SECONDARY_URL;validator 加 GCP IP 白名單(34.143.170.20, 34.21.145.224)
- ollama_failover_manager.py: 三層 Ollama 決策矩陣;並行健康檢查三台;health_111 → health_gcp_a
- ollama_health_monitor.py: host label 萃取改為通用版(支援 GCP 公網 IP)
- failover_alerter.py: 故障/恢復主機動態顯示,不再硬編碼「Ollama 111 (GPU)」
- ollama_auto_recovery.py: notify_recovery 改為 ollama_gcp_a;recovered_host 動態
- k8s/awoooi-prod: configmap + deployment + network-policy 同步更新(egress 加 GCP /32)
- 服務層: 10 個服務檔案硬編碼 192.168.0.111 改為讀 settings.OLLAMA_URL
- 測試: URL 常數更新,新增三層容災場景,GCP IP 白名單驗證測試

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Your Name
2026-05-03 22:49:23 +08:00
parent e45b055e0e
commit b1ef05fa8c
28 changed files with 816 additions and 355 deletions

View File

@@ -4,7 +4,7 @@ AI Provider 版本探測 — 為每個 Provider 提供 get_version()
每個 probe 函數獨立運作,失敗只影響該 provider不 crash 整批。
Provider:
- ollama : 192.168.0.111 Ollama (primary)
- ollama : 34.143.170.20 GCP-A Ollama (primary) — 2026-05-03 ogt: ADR-110 GCP-A Primary
- ollama_188 : 192.168.0.188 Ollama (fallback)
- gemini : Google Gemini API (版本 = model name)
- claude : Anthropic Claude (版本 = model name)
@@ -43,14 +43,14 @@ class ProviderVersionInfo:
# =============================================================================
async def probe_ollama_version(url: str, model: str) -> ProviderVersionInfo:
"""探測 Ollama111 或 188GET /api/tags 取 model digest + modified_at
"""探測 OllamaGCP-A 或 188GET /api/tags 取 model digest + modified_at
Args:
url: Ollama base URL例如 "http://192.168.0.111:11434"
url: Ollama base URL例如 "http://34.143.170.20:11434"GCP-A Primary
model: model name例如 "qwen2.5:7b-instruct"
Returns:
ProviderVersionInfo — provider 依 URL 自動判斷111=ollama, 否則=ollama_188
ProviderVersionInfo — provider 依 URL 自動判斷(GCP-A=ollama, 本地111=ollama_local, 否則=ollama_remote
Raises:
ValueError: model 不在清單
@@ -58,7 +58,15 @@ async def probe_ollama_version(url: str, model: str) -> ProviderVersionInfo:
"""
import httpx
provider_name = "ollama" if "192.168.0.111" in url else "ollama_188"
# 2026-05-03 ogt: ADR-110 GCP-A Primary — 擴展 provider 判斷邏輯支援 GCP 三層容災
_GCP_OLLAMA_IPS = {"34.143.170.20", "34.21.145.224"}
_LOCAL_OLLAMA_IPS = {"192.168.0.111"}
if any(ip in url for ip in _GCP_OLLAMA_IPS):
provider_name = "ollama"
elif any(ip in url for ip in _LOCAL_OLLAMA_IPS):
provider_name = "ollama_local"
else:
provider_name = "ollama_remote"
async with httpx.AsyncClient(timeout=5.0) as client:
resp = await client.get(f"{url}/api/tags")