Merge pull request #156 from flowforge/forge-annotations

Allow variable substituion in Ingress Annotations
FlowFuse · Aug 1, 2023 · eecc041 · eecc041
2 parents 3b66d52 + 8e4e0e0
commit eecc041
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md
@@ -16,6 +16,7 @@ If using an external PostgreSQL Database you will need to create the database an
 - `forge.dbPassword`
 - `forge.postgres.host`
 - `forge.postgres.port`
+- `forge.postgres.ssl`
 
 ## Configuration Values
 
@@ -133,6 +134,13 @@ Everything under `forge.rate_limits` is used as input to Fastify Rate Limit plug
  - `ingress.annotations` ingress annotations (default is `{}`). This value is also applied to Editor instances created by FlowForge.
  - `ingress.className` ingress class name (default is `"""`). This value is also applied to Editor instances created by FlowForge. 
 
+ `ingress.annotations` values can contain the following tokens that will be replaced as follows:
+
+  - `{{ instanceHost }}` replaced by the hostname of the instance
+  - `{{ instanceURL }}` replaced by the URL for the instance
+  - `{{ instanceProtocol }}` replaced by either `http` or `https`
+  - `{{ serviceName }}` replaced by the service name of the instance
+
 ### Editors IAM
    Provision default service account for Editors if `editors.serviceAccount.create` is `true`.
 

diff --git a/helm/flowforge/templates/broker.yaml b/helm/flowforge/templates/broker.yaml
@@ -1,4 +1,5 @@
 {{- if .Values.forge.broker.enabled -}}
+{{- $brokerHostname := or (.Values.forge.entryPoint) (printf "%s%s" "mqtt." .Values.forge.domain) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -130,9 +131,11 @@ metadata:
   name: flowforge-broker
   labels:
     app: flowforge-broker
-  annotations:
   {{- if .Values.ingress.annotations }}
-    {{- toYaml .Values.ingress.annotations | nindent 4 }}
+  annotations:
+    {{- range $keys, $values := .Values.ingress.annotations }}
+    {{ $keys }}: {{ $values | replace "{{ instanceHost }}" $brokerHostname | replace "{{ serviceName }}" "flowforge-broker"}}
+    {{- end }}
   {{- end }}
 spec:
   {{- if $.Values.ingress.className }}

diff --git a/helm/flowforge/templates/service-ingress.yaml b/helm/flowforge/templates/service-ingress.yaml
@@ -1,3 +1,4 @@
+{{- $forgeHostname := or (.Values.forge.entryPoint) (printf "%s%s" "forge." .Values.forge.domain) -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,20 +15,18 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: flowforge-ingress
-  annotations:
   {{- if .Values.ingress.annotations }}
-    {{- toYaml .Values.ingress.annotations | nindent 4 }}
+  annotations:
+    {{- range $keys, $values := .Values.ingress.annotations }}
+    {{ $keys }}: {{ $values |  replace "{{ instanceHost }}" $forgeHostname | replace "{{ serviceName }}" "forge"}}
+    {{- end }}
   {{- end }}
 spec:
   {{- if and $.Values.ingress.className (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ $.Values.ingress.className }}
   {{- end }}
   rules:
-  {{- if .Values.forge.entryPoint }}
-  - host: {{ .Values.forge.entryPoint }}
-  {{- else }}
-  - host: forge.{{ .Values.forge.domain}}
-  {{- end }}
+  - host: {{ $forgeHostname}}
     http:
       paths:
       - pathType: Prefix

diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml
@@ -31,7 +31,7 @@ forge:
         type: postgres
         host: flowforge-postgresql
         username: forge
-        password: ""
+        password: Zai1Wied
         database: ff-context
   support:
     enabled: false