[HELM] Refactor Chart

helm/h2ogpt-chart/templates/NOTES.txt

@@ -0,0 +1,8 @@
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
+
+To learn more about the release, try:
+
+  $ helm status {{ .Release.Name }}
+  $ helm get all {{ .Release.Name }}

helm/h2ogpt-chart/templates/_helpers.tpl

@@ -68,3 +68,28 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Configs for agents server
+*/}}
+
+{{- define "agents.overrideConfig" -}}
+agent_server: True
+agent_port: "5004"
+{{- end }}
+
+{{/*
+Configs for agents with h2ogpt
+*/}}
+
+{{- define "h2ogpt.overrideConfig" -}}
+{{- if .Values.h2ogpt.agents.enabled }}
+agent_server: True
+agent_port: "5004"
+multiple_workers_gunicorn: True
+agent_workers: {{ .Values.h2ogpt.agents.agent_workers}}
+{{- else }}
+agents_server: False
+{{- end }}
+
+{{- end }}

helm/h2ogpt-chart/templates/agents-configmap.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.agents.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "h2ogpt.fullname" . }}-agents-config
+  namespace: {{ include "h2ogpt.namespace" . | quote }}
+  labels:
+    {{- include "h2ogpt.labels" . | nindent 4 }}
+data:
+{{- range $key, $value := ( include "agents.overrideConfig" . | fromYaml ) }}
+  {{ printf "H2OGPT_%s" $key | upper }}: {{ $value | quote }}
+{{- end }}
+{{- range $key, $value := .Values.agents.overrideConfig }}
+  {{ printf "H2OGPT_%s" $key | upper }}: {{ $value | quote }}
+{{- end }}
+{{- end }}

helm/h2ogpt-chart/templates/agents-deployment.yaml

@@ -0,0 +1,189 @@
+{{- if .Values.agents.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "h2ogpt.fullname" . }}-agents
+  namespace: {{ include "h2ogpt.namespace" . | quote }}
+  labels:
+    app: {{ include "h2ogpt.fullname" . }}-agents
+spec:
+  replicas: {{ .Values.agents.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "h2ogpt.fullname" . }}-agents
+  {{- if .Values.agents.updateStrategy }}
+  strategy: {{- toYaml .Values.agents.updateStrategy | nindent 4 }}
+  {{- end }}
+  template:
+    metadata:
+      {{- with .Values.agents.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: {{ include "h2ogpt.fullname" . }}-agents
+        {{- with .Values.agents.podLabels }}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.agents.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.agents.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.agents.podSecurityContext | nindent 8 }}
+      affinity:
+        {{- if .Values.agents.podAffinity }}
+        podAntiAffinity:
+          {{- if .Values.agents.podAffinity.hostname }}
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - {{ include "h2ogpt.fullname" . }}
+              topologyKey: kubernetes.io/hostname
+          {{- end }}
+          {{- if .Values.agents.podAffinity.zone }}
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - {{ include "h2ogpt.fullname" . }}
+                topologyKey: failure-domain.beta.kubernetes.io/zone
+          {{- end }}
+        {{- end }}
+      {{- with .Values.agents.extraAffinity }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.agents.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ include "h2ogpt.fullname" . }}-agents
+          securityContext:
+            {{- toYaml .Values.agents.securityContext | nindent 12 }}
+          image: "{{ .Values.agents.image.repository }}:{{ .Values.agents.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.agents.image.pullPolicy }}
+          command: ["/bin/bash", "-c"]
+          args:
+            - >
+              python3 /workspace/generate.py
+          ports:
+            - name: agent
+              containerPort: 5004
+              protocol: TCP
+          {{- if .Values.agents.livenessProbe }}
+          livenessProbe:
+            httpGet:
+              path:  /
+              scheme: HTTP
+              port: http
+            {{- toYaml .Values.agents.livenessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.agents.readinessProbe }}
+          readinessProbe:
+            httpGet:
+              path:  /
+              scheme: HTTP
+              port: http
+            {{- toYaml .Values.agents.readinessProbe | nindent 12 }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.agents.resources | nindent 12 }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "h2ogpt.fullname" . }}-agents-config
+          env:
+          {{- range $key, $value := .Values.agents.env }}
+            - name: "{{ $key }}"
+              value: "{{ $value }}"
+          {{- end }}
+          {{- if and .Values.global.externalLLM.openAIAzure.enabled .Values.global.externalLLM.enabled }}
+            - name: OPENAI_AZURE_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.externalLLM.secret }}
+                  key: OPENAI_AZURE_KEY
+            - name: OPENAI_AZURE_API_BASE
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.externalLLM.secret }}
+                  key: OPENAI_AZURE_API_BASE
+          {{- end }}
+          {{- if and .Values.global.externalLLM.openAI.enabled .Values.global.externalLLM.enabled }}
+            - name: OPENAI_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.externalLLM.secret }}
+                  key: OPENAI_API_KEY
+          {{- end }}
+          {{- if and .Values.global.externalLLM.replicate.enabled .Values.global.externalLLM.enabled }}
+            - name: REPLICATE_API_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.externalLLM.secret }}
+                  key: REPLICATE_API_TOKEN
+          {{- end }}
+          {{- if .Values.global.externalLLM.enabled }}
+            - name: H2OGPT_MODEL_LOCK
+              value: {{ toJson .Values.global.externalLLM.modelLock | quote }}
+            - name: H2OGPT_SCORE_MODEL
+              value: None
+          {{- end }}
+          {{- if .Values.global.visionModels.enabled }}
+            - name: H2OGPT_VISIBLE_VISION_MODELS
+              value: {{ .Values.global.visionModels.visibleModels | quote }}
+            - name: H2OGPT_ROTATE_ALIGN_RESIZE_IMAGE
+              value: {{ .Values.global.visionModels.rotateAlignResizeImage | quote }}
+          {{- end }}
+          volumeMounts:
+            - name: {{ include "h2ogpt.fullname" . }}-agents-volume
+              mountPath: /workspace/.cache
+              subPath: cache
+            - name: {{ include "h2ogpt.fullname" . }}-volume
+              mountPath: /workspace/save
+              subPath: save
+            {{- if .Values.caCertificates }}
+            - name: ca-certificates
+              mountPath: /etc/ssl/certs/root-ca-bundle.crt
+              subPath: root-ca-bundle.crt
+            {{- end }}
+            {{ with .Values.agents.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+      volumes:
+        - name: {{ include "h2ogpt.fullname" . }}-agents-volume
+          {{- if not .Values.agents.storage.useEphemeral }}
+          persistentVolumeClaim:
+            claimName:  {{ include "h2ogpt.fullname" . }}-volume
+          {{- else}}
+          ephemeral:
+            volumeClaimTemplate:
+              spec:
+                accessModes:
+                  - ReadWriteOnce
+                resources:
+                  requests:
+                    storage: {{ .Values.agents.storage.size | quote }}
+                storageClassName: {{ .Values.agents.storage.class }}
+          {{- end }}
+        {{- if .Values.caCertificates }}
+        - name: ca-certificates
+          configMap:
+            name: {{ include "h2ogpt.fullname" . }}-ca-certificates
+        {{- end }}
+        {{- with .Values.agents.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+{{- end }}

helm/h2ogpt-chart/templates/agents-pvc.yaml

@@ -0,0 +1,14 @@
+{{- if and (.Values.agents.enabled) (not .Values.agents.storage.useEphemeral) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "h2ogpt.fullname" . }}-agents-volume
+  namespace: {{ include "h2ogpt.namespace" . | quote }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: {{ .Values.agents.storage.class }}
+  resources:
+    requests:
+      storage: {{ .Values.agents.storage.size | quote }}
+{{- end }}

helm/h2ogpt-chart/templates/agents-service.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.agents.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "h2ogpt.fullname" . }}-agents
+  namespace: {{ include "h2ogpt.namespace" . | quote }}
+
+  {{- with .Values.agents.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  selector:
+    app: {{ include "h2ogpt.fullname" . }}-agents
+  ports:
+    - name: agent
+      protocol: TCP
+      port: {{ .Values.agents.service.agentsPort }}
+      targetPort: 5004
+  type: {{ .Values.agents.service.type }}
+{{- end }}

helm/h2ogpt-chart/templates/ca-certs-configmap.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.caCertificates}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "h2ogpt.fullname" . }}-ca-certificates
+  namespace: {{ include "h2ogpt.namespace" . | quote }}
+  labels:
+    {{- include "h2ogpt.labels" . | nindent 4 }}
+data:
+  root-ca-bundle.crt:  |
+    {{ .Values.caCertificates | nindent 4 | trim }}
+{{- end }}