Fix stack removal

h2oai · Oct 25, 2024 · db1cfce · db1cfce
1 parent a14ed1c
commit db1cfce
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 30 deletions.
diff --git a/helm/h2ogpt-chart/templates/h2ogpt-deployment.yaml b/helm/h2ogpt-chart/templates/h2ogpt-deployment.yaml
@@ -169,7 +169,6 @@ spec:
             - name: h2ogpt_inference_server
               value: "http://{{ include "h2ogpt.fullname" . }}-lmdeploy-inference:{{ .Values.lmdeploy.service.port }}"
           {{- end }}
-          {{- end }}
           {{- range $key, $value := .Values.h2ogpt.env }}
             - name: "{{ $key }}"
               value: "{{ $value }}"

diff --git a/helm/h2ogpt-chart/templates/lmdeploy-deployment.yaml b/helm/h2ogpt-chart/templates/lmdeploy-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.lmdeploy.enabled) (not .Values.h2ogpt.stack.enabled )}}
+{{- if and .Values.lmdeploy.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/h2ogpt-chart/templates/lmdeploy-service.yaml b/helm/h2ogpt-chart/templates/lmdeploy-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.lmdeploy.enabled) (not .Values.h2ogpt.stack.enabled ) }}
+{{- if .Values.lmdeploy.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/h2ogpt-chart/templates/tgi-deployment.yaml b/helm/h2ogpt-chart/templates/tgi-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.tgi.enabled) (not .Values.h2ogpt.stack.enabled ) }}
+{{- if .Values.tgi.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -123,23 +123,6 @@ spec:
               mountPath: /dev/shm
               subPath: shm
       volumes:
-        {{- if .Values.h2ogpt.stack.enabled }}
-        - name: {{ include "h2ogpt.fullname" . }}-vllm-inference-volume
-          {{- if not .Values.vllm.storage.useEphemeral }}
-          persistentVolumeClaim:
-            claimName: {{ include "h2ogpt.fullname" . }}-vllm-inference-volume
-          {{- else }}
-          ephemeral:
-            volumeClaimTemplate:
-              spec:
-                accessModes:
-                  - ReadWriteOnce
-                resources:
-                  requests:
-                    storage: {{ .Values.vllm.storage.size | quote }}
-                storageClassName: {{ .Values.vllm.storage.class }}
-          {{- end }}
-        {{- end }}
         - name: {{ include "h2ogpt.fullname" . }}-tgi-inference-volume
         {{- if not .Values.tgi.storage.useEphemeral}}
           persistentVolumeClaim:

diff --git a/helm/h2ogpt-chart/templates/tgi-service.yaml b/helm/h2ogpt-chart/templates/tgi-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.tgi.enabled) (not .Values.h2ogpt.stack.enabled ) }}
+{{- if .Values.tgi.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/h2ogpt-chart/templates/validations.yaml b/helm/h2ogpt-chart/templates/validations.yaml
@@ -7,11 +7,6 @@
 {{- if and .Values.lmdeploy.enabled .Values.tgi.enabled }}
   {{- fail "Both TGI and lmdeploy cannot be enabled at the same time. Enable only one and try again" }}
 {{- end }}
-{{- if .Values.h2ogpt.stack.enabled }}
-  {{- if not (and .Values.vllm.enabled .Values.h2ogpt.enabled) }}
-    {{- fail "If h2oGPT stack is enabled, both vLLM and h2oGPT should be enabled" }}
-  {{- end }}
-{{- end }}
 {{- if and ( and .Values.h2ogpt.enabled .Values.h2ogpt.agents.enabled) .Values.agents.enabled }}
-  {{- fail "Agents in both h2oGPT and agents cannot be enabled." }}
+  {{- fail " Both agents in both h2ogpt.agents cannot be enabled. Enably only one and try again" }}
 {{- end }}
diff --git a/helm/h2ogpt-chart/templates/vllm-deployment.yaml b/helm/h2ogpt-chart/templates/vllm-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.vllm.enabled) (not .Values.h2ogpt.stack.enabled )}}
+{{- if .Values.vllm.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/h2ogpt-chart/templates/vllm-service.yaml b/helm/h2ogpt-chart/templates/vllm-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.vllm.enabled) (not .Values.h2ogpt.stack.enabled ) }}
+{{- if .Values.vllm.enabled }}
 apiVersion: v1
 kind: Service
 metadata: