From 233f51d90778866b3477a61a64bc4c58af26c140 Mon Sep 17 00:00:00 2001
From: FleetAdmiralButter <ming.quah@protonmail.com>
Date: Thu, 22 Jun 2023 15:33:58 +1000
Subject: [PATCH 1/3] Ability to configure affinity/tolerations on FluentD

---
 charts/lagoon-logging/templates/logging.yaml | 8 ++++++++
 charts/lagoon-logging/values.yaml            | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml
index a037df96..3f73dc6a 100644
--- a/charts/lagoon-logging/templates/logging.yaml
+++ b/charts/lagoon-logging/templates/logging.yaml
@@ -13,6 +13,14 @@ spec:
         fsGroup: 0
     scaling:
       replicas: {{ .Values.fluentdReplicaCount }}
+  {{- with .Values.fluentd.affinity }}
+    affinity:
+      {{- toYaml . | nindent 6 }}
+  {{- end }}
+  {{- with .Values.fluentd.tolerations }}
+    tolerations:
+      {{- toYaml . | nindent 6 }}
+  {{- end }}
   {{- with .Values.fluentdMetrics }}
     metrics:
     {{- toYaml . | nindent 6 }}
diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml
index 7505be41..92c689b4 100644
--- a/charts/lagoon-logging/values.yaml
+++ b/charts/lagoon-logging/values.yaml
@@ -251,6 +251,11 @@ enableDefaultForwarding: true
 # Set how many fluentd pods should be running
 fluentdReplicaCount: 3
 
+fluentd:
+  tolerations: []
+
+  affinity: {}
+
 # Add tolerations to the fluentbit daemonset so that it runs on e.g.
 # load-balancer nodes.
 fluentbitTolerations:

From 64782fa67979ec8d8c1004670d61ed69183a00a2 Mon Sep 17 00:00:00 2001
From: FleetAdmiralButter <ming.quah@protonmail.com>
Date: Thu, 22 Jun 2023 15:39:28 +1000
Subject: [PATCH 2/3] Bump lagoon-logging to 0.79.0

---
 charts/lagoon-logging/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml
index 76cd9361..d6a09344 100644
--- a/charts/lagoon-logging/Chart.yaml
+++ b/charts/lagoon-logging/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.78.0
+version: 0.79.0
 
 dependencies:
 - name: logging-operator

From 3cb44a45afe7d4fe2a68f0676acd114a5209ae95 Mon Sep 17 00:00:00 2001
From: FleetAdmiralButter <ming.quah@protonmail.com>
Date: Thu, 22 Jun 2023 16:42:32 +1000
Subject: [PATCH 3/3] Unnest affinity/toleration and update changelog

---
 charts/lagoon-logging/Chart.yaml             | 6 +++---
 charts/lagoon-logging/templates/logging.yaml | 4 ++--
 charts/lagoon-logging/values.yaml            | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml
index d6a09344..eca21fea 100644
--- a/charts/lagoon-logging/Chart.yaml
+++ b/charts/lagoon-logging/Chart.yaml
@@ -32,8 +32,8 @@ dependencies:
 # Valid supported kinds are added, changed, deprecated, removed, fixed and security
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: bump the logging-operator chart dependency to v4.2.3
+    - kind: added
+      description: ability to configure toleration/affinity on FluentD deployment 
       links:
         - name: Release Notes
-          url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.78.0
+          url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.79.0
diff --git a/charts/lagoon-logging/templates/logging.yaml b/charts/lagoon-logging/templates/logging.yaml
index 3f73dc6a..b5625d75 100644
--- a/charts/lagoon-logging/templates/logging.yaml
+++ b/charts/lagoon-logging/templates/logging.yaml
@@ -13,11 +13,11 @@ spec:
         fsGroup: 0
     scaling:
       replicas: {{ .Values.fluentdReplicaCount }}
-  {{- with .Values.fluentd.affinity }}
+  {{- with .Values.fluentdAffinity }}
     affinity:
       {{- toYaml . | nindent 6 }}
   {{- end }}
-  {{- with .Values.fluentd.tolerations }}
+  {{- with .Values.fluentdTolerations }}
     tolerations:
       {{- toYaml . | nindent 6 }}
   {{- end }}
diff --git a/charts/lagoon-logging/values.yaml b/charts/lagoon-logging/values.yaml
index 92c689b4..57515c0f 100644
--- a/charts/lagoon-logging/values.yaml
+++ b/charts/lagoon-logging/values.yaml
@@ -251,10 +251,9 @@ enableDefaultForwarding: true
 # Set how many fluentd pods should be running
 fluentdReplicaCount: 3
 
-fluentd:
-  tolerations: []
+fluentdTolerations: []
 
-  affinity: {}
+fluentdAffinity: {}
 
 # Add tolerations to the fluentbit daemonset so that it runs on e.g.
 # load-balancer nodes.