From 1924e56ad7ccdaba4b448e7f0eafacf54f7905d3 Mon Sep 17 00:00:00 2001
From: Masaki Yatsu <yatsu@yatsu.info>
Date: Wed, 10 Dec 2025 10:16:05 +0900
Subject: [PATCH] chore(ollama): set ollama resource by env-vars

---
 ollama/justfile             | 6 +++++-
 ollama/values.gomplate.yaml | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ollama/justfile b/ollama/justfile
index d016fd8..0136c30 100644
--- a/ollama/justfile
+++ b/ollama/justfile
@@ -8,7 +8,11 @@ export OLLAMA_GPU_TYPE := env("OLLAMA_GPU_TYPE", "nvidia")
 export OLLAMA_GPU_COUNT := env("OLLAMA_GPU_COUNT", "1")
 export OLLAMA_MODELS := env("OLLAMA_MODELS", "")
 export OLLAMA_STORAGE_SIZE := env("OLLAMA_STORAGE_SIZE", "30Gi")
-export OLLAMA_HELM_TIMEOUT := env("OLLAMA_HELM_TIMEOUT", "10m")
+export OLLAMA_HELM_TIMEOUT := env("OLLAMA_HELM_TIMEOUT", "60m")
+export OLLAMA_MEMORY_REQUEST := env("OLLAMA_MEMORY_REQUEST", "2Gi")
+export OLLAMA_MEMORY_LIMIT := env("OLLAMA_MEMORY_LIMIT", "12Gi")
+export OLLAMA_CPU_REQUEST := env("OLLAMA_CPU_REQUEST", "25m")
+export OLLAMA_CPU_LIMIT := env("OLLAMA_CPU_LIMIT", "100m")
 
 [private]
 default:
diff --git a/ollama/values.gomplate.yaml b/ollama/values.gomplate.yaml
index b45b66f..1bb52aa 100644
--- a/ollama/values.gomplate.yaml
+++ b/ollama/values.gomplate.yaml
@@ -36,11 +36,11 @@ securityContext:
 
 resources:
   requests:
-    cpu: 25m
-    memory: 2Gi
+    cpu: {{ .Env.OLLAMA_CPU_REQUEST }}
+    memory: {{ .Env.OLLAMA_MEMORY_REQUEST }}
   limits:
-    cpu: 100m
-    memory: 8Gi
+    cpu: {{ .Env.OLLAMA_CPU_LIMIT }}
+    memory: {{ .Env.OLLAMA_MEMORY_LIMIT }}
 
 persistentVolume:
   enabled: true