From a2334ddb973b7d45e9f0bff0edd93b6956405e83 Mon Sep 17 00:00:00 2001
From: Jonny McCullagh <jonny.mccullagh@redbranch.net>
Date: Mon, 9 Jan 2023 12:04:21 +0000
Subject: [PATCH] more generic annotations & pod specific

---
 .../budibase/templates/app-service-deployment.yaml  |  4 ++--
 .../templates/proxy-service-deployment.yaml         |  4 ++--
 .../templates/worker-service-deployment.yaml        |  4 ++--
 charts/budibase/values.yaml                         | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 9abfbe6c06..634e279a46 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -20,8 +20,8 @@ spec:
       annotations:
         kompose.cmd: kompose convert
         kompose.version: 1.21.0 (992df58d8)
-{{ if .Values.globals.logAnnotations }}
-{{ toYaml .Values.globals.logAnnotations | indent 4 }}
+{{ if .Values.globals.appServiceAnnotations }}
+{{ toYaml .Values.globals.appServiceAnnotations | indent 4 }}
 {{ end }}
       creationTimestamp: null
       labels:
diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml
index fee323c443..d6a4a29124 100644
--- a/charts/budibase/templates/proxy-service-deployment.yaml
+++ b/charts/budibase/templates/proxy-service-deployment.yaml
@@ -20,8 +20,8 @@ spec:
       annotations:
         kompose.cmd: kompose convert
         kompose.version: 1.21.0 (992df58d8)
-{{ if .Values.globals.logAnnotations }}
-{{ toYaml .Values.globals.logAnnotations | indent 4 }}
+{{ if .Values.globals.proxyServiceAnnotations }}
+{{ toYaml .Values.globals.proxyServiceAnnotations | indent 4 }}
 {{ end }}
       creationTimestamp: null
       labels:
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 166f1d5e03..7e8dfa09f6 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -21,8 +21,8 @@ spec:
       annotations:
         kompose.cmd: kompose convert
         kompose.version: 1.21.0 (992df58d8)
-{{ if .Values.globals.logAnnotations }}
-{{ toYaml .Values.globals.logAnnotations | indent 4 }}
+{{ if .Values.globals.workerServiceAnnotations }}
+{{ toYaml .Values.globals.workerServiceAnnotations | indent 4 }}
 {{ end }}
       creationTimestamp: null
       labels:
diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml
index 1d49a46d59..c0824c0142 100644
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@@ -22,12 +22,23 @@ serviceAccount:
 
 podAnnotations: {}
 
-# logAnnotations:
+# appServiceAnnotations:
 #   co.elastic.logs/multiline.type: pattern
 #   co.elastic.logs/multiline.pattern: '^[[:space:]]'
 #   co.elastic.logs/multiline.negate: false
 #   co.elastic.logs/multiline.match: after
 
+# workerServiceAnnotations:
+#   co.elastic.logs/multiline.type: pattern
+#   co.elastic.logs/multiline.pattern: '^[[:space:]]'
+#   co.elastic.logs/multiline.negate: false
+#   co.elastic.logs/multiline.match: after
+
+# proxyServiceAnnotations:
+#  co.elastic.logs/module: nginx
+#  co.elastic.logs/fileset.stdout: access
+#  co.elastic.logs/fileset.stderr: error
+
 podSecurityContext:
   {}
   # fsGroup: 2000