feat(infra): 切換 Ollama 到 M1 Pro 192.168.0.111 + NetworkPolicy 更新
Some checks failed
CD Pipeline / build-and-deploy (push) Has been cancelled
Some checks failed
CD Pipeline / build-and-deploy (push) Has been cancelled
- OLLAMA_URL: 188 → 111 (M1 Pro, 40+ tok/s vs 0.45 tok/s) - OPENCLAW_DEFAULT_MODEL: qwen2.5:7b-instruct → deepseek-r1:14b (SRE最強推理) - OPENCLAW_TIMEOUT: 90s → 120s (deepseek-r1:14b 實測最慢 54s) - NetworkPolicy v1.3: 新增 192.168.0.111:11434 egress,移除 188 的 Ollama port Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -160,7 +160,7 @@ class Settings(BaseSettings):
|
||||
# External Services - Four Host Architecture
|
||||
# ==========================================================================
|
||||
OLLAMA_URL: str = Field(
|
||||
default="http://192.168.0.188:11434",
|
||||
default="http://192.168.0.111:11434", # 2026-04-08 ogt: 切換至 M1 Pro (40+ tok/s vs 0.45 tok/s)
|
||||
description="Ollama LLM service URL",
|
||||
)
|
||||
# Deprecated: use OPENCLAW_URL instead
|
||||
@@ -337,11 +337,11 @@ class Settings(BaseSettings):
|
||||
description="OpenClaw AI Agent service URL",
|
||||
)
|
||||
OPENCLAW_DEFAULT_MODEL: str = Field(
|
||||
default="qwen2.5:7b-instruct",
|
||||
description="Default Ollama model for RCA analysis (7B params, better Chinese)",
|
||||
default="deepseek-r1:14b", # 2026-04-08 ogt: SRE最強推理,M1 Pro實測 13 tok/s
|
||||
description="Default Ollama model for RCA analysis",
|
||||
)
|
||||
OPENCLAW_TIMEOUT: int = Field(
|
||||
default=90,
|
||||
default=120, # 2026-04-08 ogt: deepseek-r1:14b 實測最慢 54s,120s 含 buffer
|
||||
description="Timeout for OpenClaw AI calls (seconds)",
|
||||
)
|
||||
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
# AWOOOI 正式環境零信任網路策略
|
||||
# 負責人: CIO
|
||||
# 版本: v1.2
|
||||
# 日期: 2026-03-26
|
||||
# 版本: v1.3
|
||||
# 日期: 2026-04-08
|
||||
# 變更:
|
||||
# - v1.3: 新增 192.168.0.111 Ollama 主機 (M1 Pro),移除 188 的 Ollama port
|
||||
# - v1.2: 修復 DNS 規則使用 namespaceSelector (ADR-011 Appendix B)
|
||||
# - v1.1: 新增 Langfuse LLMOps (192.168.0.110:3100) - Phase 15.1
|
||||
#
|
||||
@@ -93,9 +94,6 @@ spec:
|
||||
# Redis Stack (Docker)
|
||||
- protocol: TCP
|
||||
port: 6380
|
||||
# Ollama (Docker)
|
||||
- protocol: TCP
|
||||
port: 11434
|
||||
# OpenClaw (clawbot Docker) - 2026-04-01 ogt: 修正為 8088 (clawbot-v5 使用 8088)
|
||||
- protocol: TCP
|
||||
port: 8088
|
||||
@@ -113,6 +111,16 @@ spec:
|
||||
- protocol: TCP
|
||||
port: 8123
|
||||
|
||||
# 允許訪問 192.168.0.111 Ollama 主機 (MacBook Pro M1 Pro)
|
||||
# 2026-04-08 ogt: 新增 — 切換 Ollama 到 M1 Pro,速度從 0.45→40+ tok/s
|
||||
- to:
|
||||
- ipBlock:
|
||||
cidr: 192.168.0.111/32
|
||||
ports:
|
||||
# Ollama LLM API
|
||||
- protocol: TCP
|
||||
port: 11434
|
||||
|
||||
# 允許訪問 192.168.0.110 DevOps 金庫 (Harbor + Sentry + Langfuse)
|
||||
# 2026-03-24 新增: Sentry Self-Hosted
|
||||
# 2026-03-26 新增: Langfuse LLMOps (Phase 15.1)
|
||||
|
||||
Reference in New Issue
Block a user