build: add pyxform-http app to chart, bump --> 0.2.1

Author: spwoodcock

chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: xlsform-builder
 description: Share and build XLSForms
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "0.1.3"

chart/README.md

@@ -1,7 +1,8 @@
 # XLSForm Builder Helm Chart
 
 This Helm chart deploys the XLSForm Builder application,
-consisting of a backend API service and a frontend web application.
+consisting of a backend API service, a frontend web application, and
+a pyxform-http service for XLSForm to XForm conversion.
 
 ## Prerequisites
 
@@ -85,11 +86,18 @@ Key configuration values:
 - `ingress.backend.hostname`: Backend API hostname (default: `api.xlsforms.field.hotosm.org`)
 - `image.backend.tag`: Backend image tag
 - `image.frontend.tag`: Frontend image tag
+- `image.pyxform.tag`: Pyxform-http image tag (default: `latest`)
 - `frontend.env.apiUrl`: Backend API URL for frontend to use (default: `https://api.xlsforms.field.hotosm.org`)
 - `frontend.env.metadataUrl`: S3 metadata.json URL (default: `https://xlsforms.s3.amazonaws.com/metadata.json`)
+- `pyxform.healthCheck.enabled`: Enable health checks for pyxform service (default: `false`)
+- `pyxform.healthCheck.path`: Health check path (default: `/`)
 
 **Note:** The frontend uses runtime configuration injected via environment variables.
 These are used to generate a `config.js` file at container startup, allowing the
 frontend to work with different API URLs without rebuilding the image.
 
+**Note:** The backend automatically connects to the pyxform service via the
+`PYXFORM_URL` environment variable, which is set to the pyxform service URL
+based on the Helm release name.
+
 See `values.yaml` for all available options.

chart/templates/_helpers.tpl

@@ -22,3 +22,7 @@
 {{- define "xlsform-builder.frontendFullname" -}}
 {{- printf "%s-frontend" (include "xlsform-builder.fullname" .) -}}
 {{- end -}}
+
+{{- define "xlsform-builder.pyxformFullname" -}}
+{{- printf "%s-pyxform" (include "xlsform-builder.fullname" .) -}}
+{{- end -}}

chart/templates/backend-deployment.yaml

@@ -72,6 +72,8 @@ spec:
             {{- end }}
             - name: USE_PATH_STYLE
               value: {{ .Values.backend.env.usePathStyle | quote }}
+            - name: PYXFORM_URL
+              value: "http://{{ include "xlsform-builder.pyxformFullname" . }}:{{ .Values.service.pyxform.port }}/api/v1/convert"
           ports:
             - name: http
               containerPort: 3001

chart/templates/pyxform-deployment.yaml

@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "xlsform-builder.pyxformFullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "xlsform-builder.name" . }}
+    app.kubernetes.io/component: pyxform
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  replicas: {{ .Values.replicaCount.pyxform }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "xlsform-builder.name" . }}
+      app.kubernetes.io/component: pyxform
+      app.kubernetes.io/instance: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ include "xlsform-builder.name" . }}
+        app.kubernetes.io/component: pyxform
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: pyxform
+          image: "{{ .Values.image.pyxform.repository }}:{{ .Values.image.pyxform.tag }}"
+          imagePullPolicy: {{ .Values.image.pyxform.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.pyxform.port }}
+          {{- if .Values.pyxform.healthCheck.enabled }}
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.pyxform.healthCheck.path }}
+              port: http
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.pyxform.healthCheck.path }}
+              port: http
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources.pyxform | nindent 12 }}

chart/templates/pyxform-service.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "xlsform-builder.pyxformFullname" . }}
+  labels:
+    app.kubernetes.io/name: {{ include "xlsform-builder.name" . }}
+    app.kubernetes.io/component: pyxform
+    app.kubernetes.io/instance: {{ .Release.Name }}
+spec:
+  type: {{ .Values.service.pyxform.type }}
+  selector:
+    app.kubernetes.io/name: {{ include "xlsform-builder.name" . }}
+    app.kubernetes.io/component: pyxform
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  ports:
+    - name: http
+      port: {{ .Values.service.pyxform.port }}
+      targetPort: http

chart/values.yaml

@@ -1,6 +1,7 @@
 replicaCount:
   backend: 1
   frontend: 1
+  pyxform: 1
 
 image:
   backend:
@@ -13,6 +14,10 @@ image:
     # Override tag version; default Chart.AppVersion
     tag: ""
     pullPolicy: IfNotPresent
+  pyxform:
+    repository: ghcr.io/getodk/pyxform-http
+    tag: "latest"
+    pullPolicy: IfNotPresent
 
 frontend:
   env:
@@ -26,6 +31,9 @@ service:
   frontend:
     type: ClusterIP
     port: 80
+  pyxform:
+    type: ClusterIP
+    port: 80
 
 ingress:
   enabled: true
@@ -58,6 +66,12 @@ backend:
 resources:
   backend: {}
   frontend: {}
+  pyxform: {}
+
+pyxform:
+  healthCheck:
+    enabled: false
+    path: /
 
 nodeSelector: {}