Updated charts.

Author: vladd-bit

.github/workflows/helm_smoke.yml

@@ -37,6 +37,15 @@ jobs:
             >/tmp/ocr-service-rendered-hpa.yaml
           test -s /tmp/ocr-service-rendered-hpa.yaml
 
+      - name: Helm template (env files enabled)
+        run: |
+          helm template ocr-service charts/ocr-service \
+            --set envFiles.enabled=true \
+            --set-file 'envFiles.contents[0]=env/ocr_service.env' \
+            --set-file 'envFiles.contents[1]=env/general.env' \
+            >/tmp/ocr-service-rendered-envfiles.yaml
+          test -s /tmp/ocr-service-rendered-envfiles.yaml
+
   smoke:
     needs: lint
     runs-on: ubuntu-24.04

charts/ocr-service/README.md

@@ -8,6 +8,30 @@ Deploys the CogStack OCR service as a Kubernetes `Deployment` + `Service`, with
 helm install ocr-service ./charts/ocr-service
 ```
 
+### Install with repo env files (dynamic)
+
+```bash
+helm upgrade --install ocr-service ./charts/ocr-service \
+  --set envFiles.enabled=true \
+  --set-file envFiles.contents[0]=./env/ocr_service.env \
+  --set-file envFiles.contents[1]=./env/general.env
+```
+
+Text-only profile (overlay on top of base):
+
+```bash
+helm upgrade --install ocr-service ./charts/ocr-service \
+  --set envFiles.enabled=true \
+  --set-file envFiles.contents[0]=./env/ocr_service.env \
+  --set-file envFiles.contents[1]=./env/ocr_service_text_only.env \
+  --set-file envFiles.contents[2]=./env/general.env
+```
+
+Notes:
+- Env files are applied in order; later files override earlier ones.
+- Parsed env-file values override `values.yaml` `env` keys when `envFiles.enabled=true`.
+- Values are treated as literal strings (shell substitutions like `${VAR:-default}` are not expanded by Helm).
+
 ## Upgrade
 
 ```bash
@@ -18,6 +42,7 @@ helm upgrade ocr-service ./charts/ocr-service
 
 - `image.repository` / `image.tag`: container image to run.
 - `env`: OCR service environment variables.
+- `envFiles.enabled` + `envFiles.contents`: parse one or more `.env` files at deploy time. Later files override earlier files.
 - `tmp.*`: writable `emptyDir` mount for `/ocr_service/tmp`.
 - `probes.*`: startup/readiness/liveness probe settings.
 - `autoscaling.enabled`: enable/disable HPA.

charts/ocr-service/templates/_helpers.tpl

@@ -58,3 +58,54 @@ Create the name of the service account to use.
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Parse KEY=VALUE lines from env files passed through `.Values.envFiles.contents`.
+Supports comments, blank lines, and optional `export ` prefix.
+*/}}
+{{- define "ocr-service.envFromFilesMap" -}}
+{{- $env := dict -}}
+{{- if and .Values.envFiles.enabled .Values.envFiles.contents }}
+{{- range $content := .Values.envFiles.contents }}
+{{- range $line := splitList "\n" (toString $content) }}
+{{- $trimmed := trim $line -}}
+{{- if and $trimmed (not (hasPrefix "#" $trimmed)) (contains "=" $trimmed) }}
+{{- $parts := regexSplit "=" $trimmed 2 -}}
+{{- if eq (len $parts) 2 }}
+{{- $rawKey := trim (index $parts 0) -}}
+{{- $key := $rawKey -}}
+{{- if hasPrefix "export " $rawKey }}
+{{- $key = trim (trimPrefix "export " $rawKey) -}}
+{{- end }}
+{{- if regexMatch "^[A-Za-z_][A-Za-z0-9_]*$" $key }}
+{{- $value := trim (index $parts 1) -}}
+{{- if and (hasPrefix "\"" $value) (hasSuffix "\"" $value) }}
+{{- $value = trimSuffix "\"" (trimPrefix "\"" $value) -}}
+{{- else if and (hasPrefix "'" $value) (hasSuffix "'" $value) }}
+{{- $value = trimSuffix "'" (trimPrefix "'" $value) -}}
+{{- end }}
+{{- $_ := set $env $key $value -}}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- toYaml $env -}}
+{{- end }}
+
+{{/*
+Merge chart env values with optional parsed env-file values.
+When env files are enabled, env-file values override `.Values.env`.
+*/}}
+{{- define "ocr-service.mergedEnvMap" -}}
+{{- $baseEnv := .Values.env | default dict -}}
+{{- $envFromFiles := include "ocr-service.envFromFilesMap" . | fromYaml | default dict -}}
+{{- $merged := dict -}}
+{{- if .Values.envFiles.enabled }}
+{{- $merged = mergeOverwrite $merged $baseEnv $envFromFiles -}}
+{{- else }}
+{{- $merged = mergeOverwrite $merged $baseEnv -}}
+{{- end }}
+{{- toYaml $merged -}}
+{{- end }}

charts/ocr-service/templates/deployment.yaml

@@ -1,5 +1,6 @@
 apiVersion: apps/v1
 kind: Deployment
+{{- $mergedEnv := include "ocr-service.mergedEnvMap" . | fromYaml | default dict }}
 metadata:
   name: {{ include "ocr-service.fullname" . }}
   labels:
@@ -42,7 +43,7 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           env:
-            {{- range $key, $value := .Values.env }}
+            {{- range $key, $value := $mergedEnv }}
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}

charts/ocr-service/values.yaml

@@ -106,6 +106,18 @@ env:
   OCR_TMP_DIR: "/ocr_service/tmp"
   OMP_THREAD_LIMIT: "1"
 
+# Dynamic env-file ingestion (for repo-local ./env/*.env files).
+# Example:
+#   helm upgrade --install ocr-service ./charts/ocr-service \
+#     --set envFiles.enabled=true \
+#     --set-file envFiles.contents[0]=./env/ocr_service.env \
+#     --set-file envFiles.contents[1]=./env/general.env
+#
+# Values from env files override keys in `env` when `enabled=true`.
+envFiles:
+  enabled: false
+  contents: []
+
 extraEnv: []
 extraEnvFrom: []