7a10d27d61
Some checks failed
CD Pipeline / deploy (push) Has been cancelled
問題：
K8s 內網無法直連 GCP 公網 11434，所以 110 跳板架了 Nginx Proxy
轉發 11435/11436 到 GCP-A/GCP-B。但 services/ollama_service.py 的
get_host_label() 只看 IP substring（34.143.170.20 / 34.21.145.224），
K8s 環境會 fallback 到「未知」造成觀測台主機標籤錯亂。
修補：
- services/ollama_service.py::get_host_label
新增：
192.168.0.110:11435 → "GCP-SSD（via Nginx 110）"
192.168.0.110:11436 → "GCP-SSD-2（via Nginx 110）"
保留：直連 GCP / 111 / 188 / localhost 既有判斷
- services/ollama_service.py::get_provider_tag（新函式）
統一 provider 標籤判斷（之前散落 code_review_pipeline 等多處重寫）：
GCP 直連 + Nginx 11435 → 'gcp_ollama'
GCP-B 直連 + Nginx 11436 → 'ollama_secondary'
111 → 'ollama_111'
其他 → 'ollama_other'
跨環境統一：ai_calls.provider 在 docker-compose / K8s 都記同一 tag，
跨環境統計不分裂。
- services/code_review_pipeline_service.py:233
改用統一 get_provider_tag()，移除原本 hardcode 的 if/else IP 判斷。
- k8s/02-configmap.yaml（user 已改）
OLLAMA_HOST_PRIMARY = http://192.168.0.110:11435 (Nginx → GCP-A)
OLLAMA_HOST_SECONDARY = http://192.168.0.110:11436 (Nginx → GCP-B)
OLLAMA_HOST_FALLBACK = http://192.168.0.111:11434 (內網)
driver test:
http://34.143.170.20:11434 → GCP-SSD / gcp_ollama
http://192.168.0.110:11435 → GCP-SSD（via Nginx 110）/ gcp_ollama
http://192.168.0.111:11434 → 111 備援 / ollama_111
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
65 lines
1.9 KiB
YAML
65 lines
1.9 KiB
YAML
# =============================================================================
|
||
# WOOO TECH - Momo Pro System
|
||
# Kubernetes ConfigMap
|
||
# =============================================================================
|
||
apiVersion: v1
|
||
kind: ConfigMap
|
||
metadata:
|
||
name: momo-config
|
||
namespace: momo
|
||
data:
|
||
# Telegram
|
||
TELEGRAM_CHAT_IDS: '["5619078117","7664770082","8184109358"]'
|
||
|
||
# LINE
|
||
LINE_GROUP_ID: "Cd150747b69821dfd209f6e5aa99c84ff"
|
||
|
||
# Email
|
||
EMAIL_HOST: "smtp.gmail.com"
|
||
EMAIL_PORT: "587"
|
||
EMAIL_HOST_USER: "yingpin_chen@pchome.tw"
|
||
EMAIL_SENDER: "yingpin_chen@pchome.tw"
|
||
EMAIL_RECEIVER: "yingpin831@gmail.com"
|
||
|
||
# PostgreSQL 連線設定 (config.py 使用的變數)
|
||
POSTGRES_HOST: "momo-postgres"
|
||
POSTGRES_PORT: "5432"
|
||
POSTGRES_USER: "momo"
|
||
POSTGRES_DB: "momo_analytics"
|
||
|
||
# 應用設定
|
||
USE_DATABASE_AUTH: "false"
|
||
USE_POSTGRESQL: "true"
|
||
DISABLE_AUTO_IMPORT: "false"
|
||
USE_HTTPS: "false"
|
||
PYTHONUNBUFFERED: "1"
|
||
FLASK_APP: "app.py"
|
||
DISABLE_LOGIN: "true"
|
||
|
||
# 密碼策略
|
||
PASSWORD_MIN_LENGTH: "4"
|
||
PASSWORD_REQUIRE_UPPERCASE: "false"
|
||
PASSWORD_REQUIRE_LOWERCASE: "false"
|
||
PASSWORD_REQUIRE_DIGIT: "false"
|
||
PASSWORD_REQUIRE_SPECIAL: "false"
|
||
|
||
# Ollama AI 服務（ADR-027 三主機級聯：GCP-A → GCP-B → 111）
|
||
# 已架設 Nginx Proxy (110:11435/11436) 轉發至 GCP，解決 K8s 內網無法直連 GCP 11434 的問題。
|
||
OLLAMA_HOST_PRIMARY: "http://192.168.0.110:11435"
|
||
OLLAMA_HOST_SECONDARY: "http://192.168.0.110:11436"
|
||
OLLAMA_HOST_FALLBACK: "http://192.168.0.111:11434"
|
||
OLLAMA_MODEL: "qwen3:8b"
|
||
|
||
# Google Gemini AI 服務
|
||
# GEMINI_API_KEY: 請在 K8s Secret 中設定
|
||
GEMINI_MODEL: "gemini-1.5-flash"
|
||
AI_PROVIDER: "ollama"
|
||
|
||
# YouTube API (趨勢爬蟲)
|
||
# YOUTUBE_API_KEY: 請在 K8s Secret 中設定
|
||
|
||
# 外部服務連結（導航列顯示）
|
||
METABASE_URL: "https://monitor.wooo.work/metabase"
|
||
SUPERSET_URL: "https://monitor.wooo.work/superset"
|
||
GRIST_URL: "https://grist.wooo.work"
|