07070100000000000081a4000000000000000000000001691b68ae0000020f000000000000000000000000000000000000002d00000000patches/0001-Standardize-global-values.patchdiff --git a/packages/vllm/0.9/values.yaml b/packages/vllm/0.9/values.yaml index b486274..fa06b88 100644 --- a/packages/vllm/0.9/values.yaml +++ b/packages/vllm/0.9/values.yaml @@ -1,5 +1,10 @@ # -- Default values for llmstack helm chart # -- Declare variables to be passed into your templates. +global: + # -- Global override for container image registry + imageRegistry: "" + # -- Global override for container image registry pull secrets + imagePullSecrets: [] # -- Serving engine configuratoon servingEngineSpec: 07070100000001000081a4000000000000000000000001691b68ae00001c26000000000000000000000000000000000000003000000000patches/0002-Standardize-imagePullSecrets.patchdiff --git a/packages/vllm/0.9/templates/deployment-lora-controller.yaml b/packages/vllm/0.9/templates/deployment-lora-controller.yaml index 340cc6c..a2625c4 100644 --- a/packages/vllm/0.9/templates/deployment-lora-controller.yaml +++ b/packages/vllm/0.9/templates/deployment-lora-controller.yaml @@ -23,9 +23,17 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: - {{- with .Values.loraController.imagePullSecrets }} + {{- with (coalesce .Values.global.imagePullSecrets .Values.loraController.imagePullSecrets )}} imagePullSecrets: - {{- toYaml . | nindent 8 }} + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} {{- end }} serviceAccountName: {{ .Release.Name }}-lora-controller securityContext: diff --git a/packages/vllm/0.9/templates/deployment-vllm-multi.yaml b/packages/vllm/0.9/templates/deployment-vllm-multi.yaml index 1a1119e..736026c 100644 --- a/packages/vllm/0.9/templates/deployment-vllm-multi.yaml +++ b/packages/vllm/0.9/templates/deployment-vllm-multi.yaml @@ -367,9 +367,17 @@ spec: - name: {{ .Release.Name }}-shared-pvc-storage mountPath: /data/shared-pvc-storage {{- end }} - {{- if $modelSpec.imagePullSecret }} + {{- with (coalesce .Values.global.imagePullSecrets $modelSpec.imagePullSecret )}} imagePullSecrets: - - name: {{ $modelSpec.imagePullSecret }} + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} {{- end }} {{- if or (hasKey $modelSpec "pvcStorage") (and $modelSpec.vllmConfig (hasKey $modelSpec.vllmConfig "tensorParallelSize")) (hasKey $modelSpec "chatTemplate") (hasKey $modelSpec "extraVolumes") (hasKey $.Values "sharedPvcStorage") }} volumes: diff --git a/packages/vllm/0.9/templates/ray-cluster.yaml b/packages/vllm/0.9/templates/ray-cluster.yaml index ca7b78e..3856e27 100644 --- a/packages/vllm/0.9/templates/ray-cluster.yaml +++ b/packages/vllm/0.9/templates/ray-cluster.yaml @@ -226,9 +226,17 @@ spec: {{- toYaml $modelSpec.extraVolumes | nindent 10 }} {{- end}} {{- end}} - {{- if $modelSpec.imagePullSecret }} + {{- with (coalesce .Values.global.imagePullSecrets $modelSpec.imagePullSecret )}} imagePullSecrets: - - name: {{ $modelSpec.imagePullSecret }} + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} {{- end }} {{- if .Values.servingEngineSpec.tolerations }} {{- with .Values.servingEngineSpec.tolerations }} @@ -434,9 +442,17 @@ spec: {{- toYaml $modelSpec.extraVolumes | nindent 12 }} {{- end}} {{- end}} - {{- if $modelSpec.imagePullSecret }} + {{- with (coalesce .Values.global.imagePullSecrets $modelSpec.imagePullSecret )}} imagePullSecrets: - - name: {{ $modelSpec.imagePullSecret }} + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} {{- end }} {{- if .Values.servingEngineSpec.tolerations }} {{- with .Values.servingEngineSpec.tolerations }} diff --git a/packages/vllm/0.9/templates/deployment-cache-server.yaml b/packages/vllm/0.9/templates/deployment-cache-server.yaml index acc5c54..2e4a8ea 100644 --- a/packages/vllm/0.9/templates/deployment-cache-server.yaml +++ b/packages/vllm/0.9/templates/deployment-cache-server.yaml @@ -25,6 +25,18 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + {{- with (coalesce .Values.global.imagePullSecrets .Values.cacheserverSpec.imagePullSecrets )}} + imagePullSecrets: + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: "lmcache-server" image: "{{- $repo := required "Required value 'cacheserverSpec.repository' must be defined!" .Values.cacheserverSpec.repository -}}{{- $tag := required "Required value 'cacheserverSpec.tag' must be defined!" .Values.cacheserverSpec.tag -}}{{- $registry := coalesce .Values.global.imageRegistry .Values.cacheserverSpec.registry -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" diff --git a/packages/vllm/0.9/templates/deployment-router.yaml b/packages/vllm/0.9/templates/deployment-router.yaml index be1fb3a..b841d99 100644 --- a/packages/vllm/0.9/templates/deployment-router.yaml +++ b/packages/vllm/0.9/templates/deployment-router.yaml @@ -27,6 +27,18 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} {{- end }} + {{- with (coalesce .Values.global.imagePullSecrets .Values.routerSpec.imagePullSecrets )}} + imagePullSecrets: + {{- $imagePullSecrets := list }} + {{- range . }} + {{- if kindIs "string" . }} + {{- $imagePullSecrets = append $imagePullSecrets (dict "name" .) }} + {{- else }} + {{- $imagePullSecrets = append $imagePullSecrets . }} + {{- end }} + {{- end }} + {{- toYaml $imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: router-container image: "{{- $repo := .Values.routerSpec.repository | default "lmcache/lmstack-router" -}}{{- $tag := .Values.routerSpec.tag | default "latest" -}}{{- $registry := coalesce .Values.global.registry .Values.routerSpec.registry -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" 07070100000002000081a4000000000000000000000001691b68ae00001842000000000000000000000000000000000000002d00000000patches/0003-Standardize-imageRegistry.patchdiff --git a/packages/vllm/0.9/templates/deployment-cache-server.yaml b/packages/vllm/0.9/templates/deployment-cache-server.yaml index cac0f49..752bb96 100644 --- a/packages/vllm/0.9/templates/deployment-cache-server.yaml +++ b/packages/vllm/0.9/templates/deployment-cache-server.yaml @@ -27,7 +27,7 @@ spec: {{- end }} containers: - name: "lmcache-server" - image: "{{ required "Required value 'cacheserverSpec.repository' must be defined !" .Values.cacheserverSpec.repository }}:{{ required "Required value 'cacheserverSpec.tag' must be defined !" .Values.cacheserverSpec.tag }}" + image: "{{- $repo := required "Required value 'cacheserverSpec.repository' must be defined!" .Values.cacheserverSpec.repository -}}{{- $tag := required "Required value 'cacheserverSpec.tag' must be defined!" .Values.cacheserverSpec.tag -}}{{- $registry := coalesce .Values.global.imageRegistry .Values.cacheserverSpec.registry -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" command: {{- if eq .Values.cacheserverSpec.tag "latest-nightly" }} - "/opt/venv/bin/lmcache_server" diff --git a/packages/vllm/0.9/templates/deployment-lora-controller.yaml b/packages/vllm/0.9/templates/deployment-lora-controller.yaml index a2625c4..47b7f2b 100644 --- a/packages/vllm/0.9/templates/deployment-lora-controller.yaml +++ b/packages/vllm/0.9/templates/deployment-lora-controller.yaml @@ -41,7 +41,7 @@ spec: {{- if hasKey $.Values "sharedPvcStorage" }} initContainers: - name: fix-perms - image: busybox:1.37 + image: dp.apps.rancher.io/containers/bci-busybox:15.6 command: ["sh", "-c", "chown -R 65532:65532 /data/shared-pvc-storage"] securityContext: runAsUser: 0 @@ -53,7 +53,7 @@ spec: {{- end }} containers: - name: manager - image: "{{ .Values.loraController.image.repository }}:{{ .Values.loraController.image.tag | default "latest" }}" + image: "{{ with (coalesce .Values.global.imageRegistry .Values.loraController.image.registry) }}{{ . }}/{{ end }}{{ .Values.loraController.image.repository }}:{{ .Values.loraController.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.loraController.image.pullPolicy }} args: - --leader-elect diff --git a/packages/vllm/0.9/templates/deployment-router.yaml b/packages/vllm/0.9/templates/deployment-router.yaml index 64711b3..be1fb3a 100644 --- a/packages/vllm/0.9/templates/deployment-router.yaml +++ b/packages/vllm/0.9/templates/deployment-router.yaml @@ -29,7 +29,7 @@ spec: {{- end }} containers: - name: router-container - image: "{{ .Values.routerSpec.repository | default "lmcache/lmstack-router" }}:{{ .Values.routerSpec.tag | default "latest" }}" + image: "{{- $repo := .Values.routerSpec.repository | default "lmcache/lmstack-router" -}}{{- $tag := .Values.routerSpec.tag | default "latest" -}}{{- $registry := coalesce .Values.global.registry .Values.routerSpec.registry -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" imagePullPolicy: "{{ .Values.routerSpec.imagePullPolicy | default "Always" }}" env: {{- if .Values.routerSpec.hf_token }} diff --git a/packages/vllm/0.9/templates/deployment-vllm-multi.yaml b/packages/vllm/0.9/templates/deployment-vllm-multi.yaml index 736026c..ec09679 100644 --- a/packages/vllm/0.9/templates/deployment-vllm-multi.yaml +++ b/packages/vllm/0.9/templates/deployment-vllm-multi.yaml @@ -88,7 +88,7 @@ spec: subdomain: "{{ $.Release.Name }}-{{ $modelSpec.name }}-engine-service" containers: - name: "vllm" - image: "{{ required "Required value 'modelSpec.repository' must be defined !" $modelSpec.repository }}:{{ required "Required value 'modelSpec.tag' must be defined !" $modelSpec.tag }}" + image: "{{- $repo := required "Required value 'modelSpec.repository' must be defined!" $modelSpec.repository -}}{{- $tag := required "Required value 'modelSpec.tag' must be defined!" $modelSpec.tag -}}{{- $registry := coalesce .Values.global.imageRegistry (and $modelSpec $modelSpec.registry) -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" securityContext: {{- toYaml .Values.servingEngineSpec.containerSecurityContext | nindent 12 }} command: diff --git a/packages/vllm/0.9/templates/ray-cluster.yaml b/packages/vllm/0.9/templates/ray-cluster.yaml index 3856e27..1c4e254 100644 --- a/packages/vllm/0.9/templates/ray-cluster.yaml +++ b/packages/vllm/0.9/templates/ray-cluster.yaml @@ -30,7 +30,7 @@ spec: {{- end }} containers: - name: vllm-ray-head - image: "{{ required "Required value 'modelSpec.repository' must be defined !" $modelSpec.repository }}:{{ required "Required value 'modelSpec.tag' must be defined !" $modelSpec.tag }}" + image: "{{- $repo := required "Required value 'modelSpec.repository' must be defined!" $modelSpec.repository -}}{{- $tag := required "Required value 'modelSpec.tag' must be defined!" $modelSpec.tag -}}{{- $registry := coalesce .Values.global.imageRegistry (and $modelSpec $modelSpec.registry) -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" command: - >- /bin/bash -c " @@ -277,7 +277,7 @@ spec: spec: containers: - name: vllm-ray-worker - image: "{{ required "Required value 'modelSpec.repository' must be defined !" $modelSpec.repository }}:{{ required "Required value 'modelSpec.tag' must be defined !" $modelSpec.tag }}" + image: "{{- $repo := required "Required value 'modelSpec.repository' must be defined!" $modelSpec.repository -}}{{- $tag := required "Required value 'modelSpec.tag' must be defined!" $modelSpec.tag -}}{{- $registry := coalesce .Values.global.imageRegistry (and $modelSpec $modelSpec.registry) -}}{{- if $registry }}{{ $registry }}/{{ end }}{{ $repo }}:{{ $tag }}" env: - name: VLLM_HOST_IP valueFrom: 07070100000003000081a4000000000000000000000001691b68ae0000034e000000000000000000000000000000000000002e00000000patches/0004-Fix-entrypoint-CacheServer.patchdiff --git a/packages/vllm/0.9/templates/deployment-cache-server.yaml b/packages/vllm/0.9/templates/deployment-cache-server.yaml index 752bb96..cc7862c 100644 --- a/packages/vllm/0.9/templates/deployment-cache-server.yaml +++ b/packages/vllm/0.9/templates/deployment-cache-server.yaml @@ -32,9 +32,9 @@ spec: {{- if eq .Values.cacheserverSpec.tag "latest-nightly" }} - "/opt/venv/bin/lmcache_server" {{- else if eq .Values.cacheserverSpec.tag "latest" }} - - "/opt/venv/bin/lmcache_experimental_server" + - "/opt/venv/bin/lmcache_v0_server" {{- else }} - - "lmcache_experimental_server" + - "{{ .Values.cacheserverSpec.binaryPath | default "lmcache_server" }}" {{- end }} - "0.0.0.0" - "{{ .Values.cacheserverSpec.containerPort }}" 07070100000004000081a4000000000000000000000001691b68ae0000030a000000000000000000000000000000000000003300000000patches/0006-Fix-imagePullPolicy-cacheserver.patchdiff --git a/packages/vllm/0.9/templates/deployment-cache-server.yaml b/packages/vllm/0.9/templates/deployment-cache-server.yaml index 0ff9b99..9e1b84d 100644 --- a/packages/vllm/0.9/templates/deployment-cache-server.yaml +++ b/packages/vllm/0.9/templates/deployment-cache-server.yaml @@ -66,7 +66,7 @@ spec: ports: - name: "caserver-cport" containerPort: {{ .Values.cacheserverSpec.containerPort }} - imagePullPolicy: IfNotPresent + imagePullPolicy: "{{ .Values.cacheserverSpec.imagePullPolicy | default "IfNotPresent" }}" {{- if .Values.cacheserverSpec.livenessProbe }} livenessProbe: initialDelaySeconds: {{ .Values.cacheserverSpec.livenessProbe.initialDelaySeconds | default 30 }} 07070100000005000081a4000000000000000000000001691b68ae000003da000000000000000000000000000000000000001700000000patches/Chart.yaml.tpl# SPDX-License-Identifier: APACHE-2.0 #!BuildTag: charts/vllm:${VERSION}-%RELEASE% #!BuildTag: charts/vllm:${VERSION} annotations: helm.sh/images: | - image: ${CONTAINER_REGISTRY}/containers/vllm-openai:${APP_VERSION} name: vllm-openai - image: ${CONTAINER_REGISTRY}/containers/lmcache-vllm-openai:0.3.2 name: lmcache-vllm-openai - image: ${CONTAINER_REGISTRY}/containers/lmcache-lmstack-router:0.1.6 name: lmcache-lmstack-router - image: ${CONTAINER_REGISTRY}/containers/bci-busybox:15.6 name: bci-busybox license: Apache-2.0 apiVersion: v2 description: 'A high-throughput and memory-efficient inference and serving engine for LLMs.' home: https://apps.rancher.io/applications/vllm icon: https://apps.rancher.io/logos/vllm.png keywords: - ai - llm sources: - https://github.com/vllm-project/vllm name: vllm type: application version: ${VERSION} appVersion: ${APP_VERSION} maintainers: - url: https://www.suse.com/ name: SUSE LLC 07070100000006000081a4000000000000000000000001691b68ae0000006b000000000000000000000000000000000000001d00000000patches/values-suse.yaml.tplrouterSpec: registry: ${CONTAINER_REGISTRY} repository: containers/lmcache-lmstack-router tag: 0.1.6 07070100000007000041ed000000000000000000000001691b68ae00000000000000000000000000000000000000000000000800000000patches07070100000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000b00000000TRAILER!!!