nelm-ready: public images overlays, nodeSelector fix, secrets

This commit is contained in:
ci 2026-09-11 14:28:17 +03:00
parent 6bcd34e836
commit ef19ab4474
6 changed files with 54 additions and 15 deletions

6
.helm/Chart.yaml Normal file
View File

@ -0,0 +1,6 @@
apiVersion: v2
name: ollama
description: Ollama for nelm deploy
type: application
version: 1.0.0
appVersion: "0.30.11"

View File

@ -13,9 +13,9 @@ metadata:
nginx.ingress.kubernetes.io/proxy-read-timeout: "10000" nginx.ingress.kubernetes.io/proxy-read-timeout: "10000"
nginx.ingress.kubernetes.io/upstream-keepalive-timeout: "10000" nginx.ingress.kubernetes.io/upstream-keepalive-timeout: "10000"
spec: spec:
ingressClassName: {{ dig .Values.werf.env .Values.ingress.className._default .Values.ingress.className | quote }} ingressClassName: {{ dig .Values.env .Values.ingress.className._default .Values.ingress.className | quote }}
rules: rules:
- host: {{ dig .Values.werf.env .Values.ingress.host._default .Values.ingress.host | quote }} - host: {{ dig .Values.env .Values.ingress.host._default .Values.ingress.host | quote }}
http: http:
paths: paths:
- path: / - path: /

View File

@ -34,11 +34,13 @@ spec:
{{- if and .Values.gpu.enabled .Values.gpu.tolerations }} {{- if and .Values.gpu.enabled .Values.gpu.tolerations }}
tolerations: {{ toYaml .Values.gpu.tolerations | nindent 6 }} tolerations: {{ toYaml .Values.gpu.tolerations | nindent 6 }}
{{- end }} {{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
- name: registrysecret {{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: {{ .Values.werf.image.ollama }} image: {{ .Values.image.ollama }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: data - name: data
@ -50,7 +52,7 @@ spec:
env: env:
- name: OLLAMA_HOST - name: OLLAMA_HOST
value: "0.0.0.0:{{ .Values.port }}" value: "0.0.0.0:{{ .Values.port }}"
{{- range $n, $v := .Values.env }} {{- range $n, $v := .Values.envVars }}
- name: {{ $n }} - name: {{ $n }}
value: {{ $v | quote }} value: {{ $v | quote }}
{{- end }} {{- end }}
@ -70,7 +72,7 @@ spec:
periodSeconds: 5 periodSeconds: 5
timeoutSeconds: 6 timeoutSeconds: 6
failureThreshold: 3 failureThreshold: 3
resources: {{ dig .Values.werf.env .Values.resources._default .Values.resources | toYaml | nindent 12 }} resources: {{ dig .Values.env .Values.resources._default .Values.resources | toYaml | nindent 12 }}
{{- if or .Values.models.pull .Values.models.run }} {{- if or .Values.models.pull .Values.models.run }}
lifecycle: lifecycle:
postStart: postStart:
@ -122,10 +124,10 @@ spec:
name: data name: data
spec: spec:
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
storageClassName: {{ dig .Values.werf.env .Values.storage.class._default .Values.storage.class | quote }} storageClassName: {{ dig .Values.env .Values.storage.class._default .Values.storage.class | quote }}
resources: resources:
requests: requests:
storage: {{ dig .Values.werf.env .Values.storage.size._default .Values.storage.size | quote }} storage: {{ dig .Values.env .Values.storage.size._default .Values.storage.size | quote }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service

21
.helm/values-public.yaml Normal file
View File

@ -0,0 +1,21 @@
image:
ollama: docker.io/ollama/ollama:0.30.11
imagePullSecrets: []
gpu:
enabled: false
models:
run: []
resources:
_default:
requests:
memory: "512Mi"
cpu: "100m"
limits:
memory: "1Gi"
nodeSelector: {}
tolerations: []
gpu:
enabled: false
nodeSelector: {}
tolerations: []

View File

@ -1,3 +1,14 @@
global:
cluster: ""
env: dev
imagePullSecrets:
- name: registrysecret
image:
ollama: 192.168.10.68:5000/ollama/ollama:0.30.11
port: 11434 port: 11434
gpu: gpu:
@ -11,7 +22,7 @@ gpu:
effect: NoExecute effect: NoExecute
nvidiaResource: "nvidia.com/gpu" nvidiaResource: "nvidia.com/gpu"
env: envVars:
OLLAMA_MULTIUSER_CACHE: true OLLAMA_MULTIUSER_CACHE: true
OLLAMA_FLASH_ATTENTION: true OLLAMA_FLASH_ATTENTION: true
OLLAMA_NOHISTORY: true OLLAMA_NOHISTORY: true
@ -22,8 +33,6 @@ env:
OLLAMA_CONTEXT_LENGTH: "32000" OLLAMA_CONTEXT_LENGTH: "32000"
models: models:
#pull:
#- gemma3:12b
run: run:
- alibayram/Qwen3-30B-A3B-Instruct-2507:latest - alibayram/Qwen3-30B-A3B-Instruct-2507:latest
clean: false clean: false
@ -56,12 +65,12 @@ storage:
size: size:
_default: 10Gi _default: 10Gi
class: class:
_default: local-storage-class-cuda-worker _default: localpath
ingress: ingress:
className: className:
_default: nginx _default: nginx
host: host:
_default: ollama.pro.lukoil.com _default: ollama.valdemorte.online
preprod: ollama.preprod.pro.lukoil.com preprod: ollama.preprod.valdemorte.online
prod: ollama.prod.pro.lukoil.com prod: ollama.prod.valdemorte.online

1
Dockerfile Normal file
View File

@ -0,0 +1 @@
FROM docker.io/ollama/ollama:0.30.11