From 1253cd5d203c3c70bf2e8d261f2aa2ae1fec50f5 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 23 May 2024 15:40:29 +0100 Subject: [PATCH 1/3] Add Custom Hostname config --- helm/flowforge/templates/configmap.yaml | 8 ++++++++ helm/flowforge/values.schema.json | 11 +++++++++++ helm/flowforge/values.yaml | 2 ++ 3 files changed, 21 insertions(+) diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml index d65187b0..a7ec572e 100644 --- a/helm/flowforge/templates/configmap.yaml +++ b/helm/flowforge/templates/configmap.yaml @@ -62,6 +62,14 @@ data: {{- if .Values.forge.logPassthrough }} logPassthrough: {{ .Values.forge.logPassthrough }} {{- end }} + {{- if .Values.customHostname }} + customHostname: + {{- if .Values.customHostname.enabled }} + enabled: {{ .Values.customHostname.enabled }} + {{- end }} + {{- if .Values.customHostname.certManagerIssuer }} + certManagerIssuer: {{ .Values.customHostname.certManagerIssuer }} + {{- end }} {{- if .Values.forge.email }} email: enabled: true diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json index f06ae04b..4f6b602c 100644 --- a/helm/flowforge/values.schema.json +++ b/helm/flowforge/values.schema.json @@ -772,6 +772,17 @@ }, "logPassthrough": { "type": "boolean" + }, + "customeHostname": { + "type": "object", + "properties": { + "enabled" { + "type": "boolean" + }, + "certManagerIssuer": { + "type": "string" + } + } } }, "required": [ diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml index 8e685b5f..8a9583b9 100644 --- a/helm/flowforge/values.yaml +++ b/helm/flowforge/values.yaml @@ -114,6 +114,8 @@ forge: failureThreshold: 3 logPassthrough: false + customHostname: + enabled: false postgresql: image: From b87efe65099db066f38025ac991e7f5b2c959759 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 23 May 2024 15:52:24 +0100 Subject: [PATCH 2/3] Fix typos --- helm/flowforge/README.md | 5 +++++ helm/flowforge/templates/configmap.yaml | 1 + helm/flowforge/values.schema.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md index 4a572c56..d7a7f475 100644 --- a/helm/flowforge/README.md +++ b/helm/flowforge/README.md @@ -166,6 +166,11 @@ Enables FlowForge Telemetry - `forge.privateCA.configMapName` name of ConfigMap to store the CA Cert bundle (default `ff-ca-certs`) - `forge.privateCA.certs` base64 encoded CA certificate PEM bundle of trusted certificates. This needs to be generated without line breaks e.g. `base64 -w 0 certs.pem` (default not set) + + ### Instance Custom Hostnames + + - `forge.customHostname.enabled` activates the custom hostname feature (default `false`) + - `forge.customHostname.certManagerIssuer` name of CertManager ClusterIssuer to use to request HTTPS certificates for custom hostnames (default is not set) ### Rate Limiting diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml index a7ec572e..ecfc967f 100644 --- a/helm/flowforge/templates/configmap.yaml +++ b/helm/flowforge/templates/configmap.yaml @@ -70,6 +70,7 @@ data: {{- if .Values.customHostname.certManagerIssuer }} certManagerIssuer: {{ .Values.customHostname.certManagerIssuer }} {{- end }} + {{- end }} {{- if .Values.forge.email }} email: enabled: true diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json index 4f6b602c..d2c7f98b 100644 --- a/helm/flowforge/values.schema.json +++ b/helm/flowforge/values.schema.json @@ -776,7 +776,7 @@ "customeHostname": { "type": "object", "properties": { - "enabled" { + "enabled": { "type": "boolean" }, "certManagerIssuer": { From 5e9ab2a3b1f054a8c76c28659925c1639379e90b Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Tue, 4 Jun 2024 10:10:25 +0100 Subject: [PATCH 3/3] Fix helm chart --- helm/flowforge/README.md | 1 + helm/flowforge/templates/configmap.yaml | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md index d7a7f475..ba43a097 100644 --- a/helm/flowforge/README.md +++ b/helm/flowforge/README.md @@ -171,6 +171,7 @@ Enables FlowForge Telemetry - `forge.customHostname.enabled` activates the custom hostname feature (default `false`) - `forge.customHostname.certManagerIssuer` name of CertManager ClusterIssuer to use to request HTTPS certificates for custom hostnames (default is not set) + - `forge.customHostname.ingressClass` name of the IngressClass to use for exposing the custom hostname (default is not set) ### Rate Limiting diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml index ecfc967f..de9890fe 100644 --- a/helm/flowforge/templates/configmap.yaml +++ b/helm/flowforge/templates/configmap.yaml @@ -62,13 +62,14 @@ data: {{- if .Values.forge.logPassthrough }} logPassthrough: {{ .Values.forge.logPassthrough }} {{- end }} - {{- if .Values.customHostname }} + {{- if .Values.forge.customHostname }} customHostname: - {{- if .Values.customHostname.enabled }} - enabled: {{ .Values.customHostname.enabled }} + enabled: {{ .Values.forge.customHostname.enabled }} + {{- if .Values.forge.customHostname.certManagerIssuer }} + certManagerIssuer: {{ .Values.forge.customHostname.certManagerIssuer }} {{- end }} - {{- if .Values.customHostname.certManagerIssuer }} - certManagerIssuer: {{ .Values.customHostname.certManagerIssuer }} + {{- if .Values.forge.customHostname.ingressClass }} + ingressClass: {{ .Values.forge.customHostname.ingressClass }} {{- end }} {{- end }} {{- if .Values.forge.email }}