Release Helm chart for branch 2024-0

safesoftware · Feb 26, 2024 · 62e96a0 · 62e96a0
1 parent 4d98af8
commit 62e96a0
Show file tree

Hide file tree

Showing 5 changed files with 247 additions and 183 deletions.
diff --git a/chart-source/fmeflow/Chart.yaml b/chart-source/fmeflow/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: FME Flow Helm chart
 name: fmeflow
-version: 1.0.6
+version: 2.0.0
diff --git a/chart-source/fmeflow/templates/core-statefulset.yaml b/chart-source/fmeflow/templates/core-statefulset.yaml
@@ -208,6 +208,55 @@ spec:
             timeoutSeconds: {{ .Values.fmeflow.healthcheck.startup.timeoutSeconds }}
             periodSeconds: {{ .Values.fmeflow.healthcheck.startup.periodSeconds }}
           {{- end }}
+        {{- if .Values.fmeflow.utilityengine.enabled }}
+        - image: {{ template "fmeflow.image.registry" . }}/{{ template "fmeflow.image.namespace" . }}/fmeflow-engine:{{ template "fmeflow.image.tag" . }}
+          name: utilityengine
+          imagePullPolicy: {{ template "fmeflow.image.pullPolicy" . }}
+          volumeMounts:
+            - mountPath: /data/fmeflowdata
+              name: fmeflowdata
+          env:
+            - name: EXTERNALHOSTNAME
+              value: {{ .Values.deployment.hostname }}
+            - name: WEBPROTOCOL
+              value: {{ template "fmeflow.deployment.protocol" $ }}
+            - name: EXTERNALPORT
+              value: "{{ $.Values.deployment.port }}"
+            - name: COREHOSTNAME
+              value: localhost
+            - name: NODENAME
+              value: localhost
+            - name: ENGINETYPE
+              value: UTILITY
+            - name: NODEMANAGED
+              value: "{{ .Values.fmeflow.engines.enginesNodeManaged }}"
+            - name: PGSQLHOSTNAME
+              value: "{{ template "fmeflow.database.host" $ }}"
+            - name: PGSQLPORT
+              value: "{{ $.Values.fmeflow.database.port }}"
+            - name: PGSQLDATABASENAME
+              value: "{{ $.Values.fmeflow.database.name }}"
+            {{- if $.Values.fmeflow.database.azure}}
+            - name: PGSQLUSERNAME
+              value: "{{ $.Values.fmeflow.database.user }}@{{ template "fmeflow.database.host" $ }}"
+            {{- else }}
+            - name: PGSQLUSERNAME
+              value: "{{ $.Values.fmeflow.database.user }}"
+            {{- end }}
+            - name: PGSQLPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "fmeflow.database.secretName" $ }}
+                  key: {{ $.Values.fmeflow.database.passwordSecretKey }}
+            {{- if $.Values.fmeflow.database.ssl }}
+            - name: POSTGRESQLSSL
+              value: 'true'
+            {{- end }}
+            {{- if not $.Values.fmeflow.waitForDatabase }}
+            - name: WAITFORDATABASE
+              value: 'false'
+            {{- end }}
+        {{- end }}
       initContainers:
         - image: {{ template "fmeflow.image.registry" . }}/{{ template "fmeflow.image.namespace" . }}/fmeflow-core:{{ template "fmeflow.image.tag" . }}
           name: dbinit

diff --git a/chart-source/fmeflow/values.yaml b/chart-source/fmeflow/values.yaml
@@ -27,6 +27,8 @@ fmeflow:
     maxThreads: 200
     experimentalJavaFlags: false
     hikariDBMaxConnections: 30
+  utilityengine:
+    enabled: true
   forcePasswordChange: true
   debugLevel: "NONE"
   enableTransactionQueueTimeout: false

diff --git a/docs/fmeflow-2.0.0.tgz b/docs/fmeflow-2.0.0.tgz