From 78faf232bb85d66f2d93fb2650073be57e58e6c9 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 14 Aug 2024 15:52:54 +0100
Subject: [PATCH 1/5] Fix: Ensure default private ca cert cm name

fixes 450
---
 helm/flowforge/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml
index 52bd5a42..ff8ae623 100644
--- a/helm/flowforge/templates/deployment.yaml
+++ b/helm/flowforge/templates/deployment.yaml
@@ -176,7 +176,7 @@ spec:
       {{- if .Values.forge.privateCA }}
       - name: cacert
         configMap:
-          name: {{ .Values.forge.privateCA.configMapName }}
+          name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certts" }}
       {{- end }}
       {{- if .Values.forge.managementSelector }}
       nodeSelector:

From cce0141984b63d77d14e679cebc5875522b2745c Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 14 Aug 2024 15:55:33 +0100
Subject: [PATCH 2/5] Ensure default set in configmap as well

---
 helm/flowforge/templates/configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml
index 77b9fe02..20dc85de 100644
--- a/helm/flowforge/templates/configmap.yaml
+++ b/helm/flowforge/templates/configmap.yaml
@@ -54,7 +54,7 @@ data:
         cloudProvider: {{ .Values.forge.cloudProvider }}
         {{- end }}
         {{- if .Values.forge.privateCA }}
-        privateCA: {{ .Values.forge.privateCA.configMapName }}
+        privateCA: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certts" }}
         {{- end }}
         {{- if .Values.ingress.certManagerIssuer }}
         certManagerIssuer: {{ .Values.ingress.certManagerIssuer }}

From 6d6f718db0253a0c4d05f9819c2fea6672fd65b1 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 15 Aug 2024 09:23:31 +0100
Subject: [PATCH 3/5] Update helm/flowforge/templates/configmap.yaml

---
 helm/flowforge/templates/configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml
index 20dc85de..9dae7dec 100644
--- a/helm/flowforge/templates/configmap.yaml
+++ b/helm/flowforge/templates/configmap.yaml
@@ -54,7 +54,7 @@ data:
         cloudProvider: {{ .Values.forge.cloudProvider }}
         {{- end }}
         {{- if .Values.forge.privateCA }}
-        privateCA: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certts" }}
+        privateCA: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certs" }}
         {{- end }}
         {{- if .Values.ingress.certManagerIssuer }}
         certManagerIssuer: {{ .Values.ingress.certManagerIssuer }}

From 0e52dcd44e58c8510908cfa3a1fcfd05af1ec781 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 15 Aug 2024 09:23:40 +0100
Subject: [PATCH 4/5] Update helm/flowforge/templates/deployment.yaml

---
 helm/flowforge/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml
index ff8ae623..9929877d 100644
--- a/helm/flowforge/templates/deployment.yaml
+++ b/helm/flowforge/templates/deployment.yaml
@@ -176,7 +176,7 @@ spec:
       {{- if .Values.forge.privateCA }}
       - name: cacert
         configMap:
-          name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certts" }}
+          name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certs" }}
       {{- end }}
       {{- if .Values.forge.managementSelector }}
       nodeSelector:

From d8447571ef5e058d2b0f09cdff05008b0060fa72 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 15 Aug 2024 09:34:54 +0100
Subject: [PATCH 5/5] Update private-ca.yaml

---
 helm/flowforge/templates/private-ca.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/flowforge/templates/private-ca.yaml b/helm/flowforge/templates/private-ca.yaml
index 7b058d99..65137c6a 100644
--- a/helm/flowforge/templates/private-ca.yaml
+++ b/helm/flowforge/templates/private-ca.yaml
@@ -12,7 +12,7 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certts" }} 
+  name: {{ .Values.forge.privateCA.configMapName | default "ff-ca-certs" }} 
   namespace: {{ .Values.forge.projectNamespace | default "flowforge" }}
   labels:
   {{- include "forge.labels" . | nindent 4 }}