From 09a63bd282ac14749db45de42727d9f122092f67 Mon Sep 17 00:00:00 2001
From: mortega <mortega@brightcove.com>
Date: Mon, 12 Apr 2021 11:10:31 -0500
Subject: [PATCH 1/4] enabling custom labes for event, metrics and logs
 services

---
 deploy/helm/sumologic/templates/events-service-headless.yaml  | 3 +++
 deploy/helm/sumologic/templates/events-service.yaml           | 3 +++
 deploy/helm/sumologic/templates/metrics-service-headless.yaml | 3 +++
 deploy/helm/sumologic/templates/metrics-service.yaml          | 3 +++
 deploy/helm/sumologic/templates/service-headless.yaml         | 3 +++
 deploy/helm/sumologic/templates/service.yaml                  | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/deploy/helm/sumologic/templates/events-service-headless.yaml b/deploy/helm/sumologic/templates/events-service-headless.yaml
index fdcaa3f97e..c87b18b234 100644
--- a/deploy/helm/sumologic/templates/events-service-headless.yaml
+++ b/deploy/helm/sumologic/templates/events-service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.events.service-headless" . }}
     {{- include "sumologic.labels.events" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/events-service.yaml b/deploy/helm/sumologic/templates/events-service.yaml
index b3362f53c6..d893c5bcf1 100644
--- a/deploy/helm/sumologic/templates/events-service.yaml
+++ b/deploy/helm/sumologic/templates/events-service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.events.service" . }}
     {{- include "sumologic.labels.scrape.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics-service-headless.yaml b/deploy/helm/sumologic/templates/metrics-service-headless.yaml
index aff805086c..ae81b27c6d 100644
--- a/deploy/helm/sumologic/templates/metrics-service-headless.yaml
+++ b/deploy/helm/sumologic/templates/metrics-service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.metrics.service-headless" . }}
     {{- include "sumologic.labels.metrics" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics-service.yaml b/deploy/helm/sumologic/templates/metrics-service.yaml
index 9cb15decf4..873f348c96 100644
--- a/deploy/helm/sumologic/templates/metrics-service.yaml
+++ b/deploy/helm/sumologic/templates/metrics-service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.metrics.service" . }}
     {{- include "sumologic.labels.scrape.metrics" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}
diff --git a/deploy/helm/sumologic/templates/service-headless.yaml b/deploy/helm/sumologic/templates/service-headless.yaml
index e5124e3385..ae0271ddd7 100644
--- a/deploy/helm/sumologic/templates/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.logs.service-headless" . }}
     {{- include "sumologic.labels.logs" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}
diff --git a/deploy/helm/sumologic/templates/service.yaml b/deploy/helm/sumologic/templates/service.yaml
index 20946935fb..90957238e0 100644
--- a/deploy/helm/sumologic/templates/service.yaml
+++ b/deploy/helm/sumologic/templates/service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.logs.service" . }}
     {{- include "sumologic.labels.scrape.logs" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}

From df5518a798086de485ce6283f8e400884eb81a13 Mon Sep 17 00:00:00 2001
From: mortega <mortega@brightcove.com>
Date: Tue, 13 Apr 2021 09:58:17 -0500
Subject: [PATCH 2/4] Revert "enabling custom labes for event, metrics and logs
 services"

This reverts commit 09a63bd282ac14749db45de42727d9f122092f67.
---
 deploy/helm/sumologic/templates/events-service-headless.yaml  | 3 ---
 deploy/helm/sumologic/templates/events-service.yaml           | 3 ---
 deploy/helm/sumologic/templates/metrics-service-headless.yaml | 3 ---
 deploy/helm/sumologic/templates/metrics-service.yaml          | 3 ---
 deploy/helm/sumologic/templates/service-headless.yaml         | 3 ---
 deploy/helm/sumologic/templates/service.yaml                  | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/deploy/helm/sumologic/templates/events-service-headless.yaml b/deploy/helm/sumologic/templates/events-service-headless.yaml
index c87b18b234..fdcaa3f97e 100644
--- a/deploy/helm/sumologic/templates/events-service-headless.yaml
+++ b/deploy/helm/sumologic/templates/events-service-headless.yaml
@@ -6,9 +6,6 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.events.service-headless" . }}
     {{- include "sumologic.labels.events" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/events-service.yaml b/deploy/helm/sumologic/templates/events-service.yaml
index d893c5bcf1..b3362f53c6 100644
--- a/deploy/helm/sumologic/templates/events-service.yaml
+++ b/deploy/helm/sumologic/templates/events-service.yaml
@@ -7,9 +7,6 @@ metadata:
     app: {{ template "sumologic.labels.app.events.service" . }}
     {{- include "sumologic.labels.scrape.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics-service-headless.yaml b/deploy/helm/sumologic/templates/metrics-service-headless.yaml
index ae81b27c6d..aff805086c 100644
--- a/deploy/helm/sumologic/templates/metrics-service-headless.yaml
+++ b/deploy/helm/sumologic/templates/metrics-service-headless.yaml
@@ -6,9 +6,6 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.metrics.service-headless" . }}
     {{- include "sumologic.labels.metrics" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics-service.yaml b/deploy/helm/sumologic/templates/metrics-service.yaml
index 873f348c96..9cb15decf4 100644
--- a/deploy/helm/sumologic/templates/metrics-service.yaml
+++ b/deploy/helm/sumologic/templates/metrics-service.yaml
@@ -7,9 +7,6 @@ metadata:
     app: {{ template "sumologic.labels.app.metrics.service" . }}
     {{- include "sumologic.labels.scrape.metrics" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}
diff --git a/deploy/helm/sumologic/templates/service-headless.yaml b/deploy/helm/sumologic/templates/service-headless.yaml
index ae0271ddd7..e5124e3385 100644
--- a/deploy/helm/sumologic/templates/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/service-headless.yaml
@@ -6,9 +6,6 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.logs.service-headless" . }}
     {{- include "sumologic.labels.logs" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}
diff --git a/deploy/helm/sumologic/templates/service.yaml b/deploy/helm/sumologic/templates/service.yaml
index 90957238e0..20946935fb 100644
--- a/deploy/helm/sumologic/templates/service.yaml
+++ b/deploy/helm/sumologic/templates/service.yaml
@@ -7,9 +7,6 @@ metadata:
     app: {{ template "sumologic.labels.app.logs.service" . }}
     {{- include "sumologic.labels.scrape.logs" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
-{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}

From 14139c045c2f0b47ecda2fe4cd154c1c6fd5aca0 Mon Sep 17 00:00:00 2001
From: mortega <mortega@brightcove.com>
Date: Tue, 13 Apr 2021 10:11:49 -0500
Subject: [PATCH 3/4] fixing conflicts with chart: refactor templates structure

---
 .../sumologic/templates/events/fluentd/service-headless.yaml   | 3 +++
 deploy/helm/sumologic/templates/events/fluentd/service.yaml    | 3 +++
 .../sumologic/templates/logs/fluentd/service-headless.yaml     | 3 +++
 deploy/helm/sumologic/templates/logs/fluentd/service.yaml      | 3 +++
 .../sumologic/templates/metrics/fluentd/service-headless.yaml  | 3 +++
 deploy/helm/sumologic/templates/metrics/fluentd/service.yaml   | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
index fdcaa3f97e..c87b18b234 100644
--- a/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.events.service-headless" . }}
     {{- include "sumologic.labels.events" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/events/fluentd/service.yaml b/deploy/helm/sumologic/templates/events/fluentd/service.yaml
index b3362f53c6..d893c5bcf1 100644
--- a/deploy/helm/sumologic/templates/events/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/events/fluentd/service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.events.service" . }}
     {{- include "sumologic.labels.scrape.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.events.pod" . }}
diff --git a/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
index e5124e3385..ae0271ddd7 100644
--- a/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.logs.service-headless" . }}
     {{- include "sumologic.labels.logs" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}
diff --git a/deploy/helm/sumologic/templates/logs/fluentd/service.yaml b/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
index 20946935fb..90957238e0 100644
--- a/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.logs.service" . }}
     {{- include "sumologic.labels.scrape.logs" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.logs.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
index aff805086c..ae81b27c6d 100644
--- a/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.metrics.service-headless" . }}
     {{- include "sumologic.labels.metrics" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}
diff --git a/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml b/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
index 9cb15decf4..873f348c96 100644
--- a/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
@@ -7,6 +7,9 @@ metadata:
     app: {{ template "sumologic.labels.app.metrics.service" . }}
     {{- include "sumologic.labels.scrape.metrics" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
+{{- if .Values.fluentd.podLabels }}
+{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- end }}
 spec:
   selector:
     app: {{ template "sumologic.labels.app.metrics.pod" . }}

From 848703551617c94733fce3ee39a90b7b2bcabcc2 Mon Sep 17 00:00:00 2001
From: mortega <mortega@brightcove.com>
Date: Mon, 19 Apr 2021 11:51:40 -0500
Subject: [PATCH 4/4] Added serviceLabels values

---
 .../sumologic/templates/events/fluentd/service-headless.yaml  | 4 ++--
 deploy/helm/sumologic/templates/events/fluentd/service.yaml   | 4 ++--
 .../sumologic/templates/logs/fluentd/service-headless.yaml    | 4 ++--
 deploy/helm/sumologic/templates/logs/fluentd/service.yaml     | 4 ++--
 .../sumologic/templates/metrics/fluentd/service-headless.yaml | 4 ++--
 deploy/helm/sumologic/templates/metrics/fluentd/service.yaml  | 4 ++--
 deploy/helm/sumologic/values.yaml                             | 3 +++
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
index c87b18b234..47d37f72d8 100644
--- a/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/events/fluentd/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.events.service-headless" . }}
     {{- include "sumologic.labels.events" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/templates/events/fluentd/service.yaml b/deploy/helm/sumologic/templates/events/fluentd/service.yaml
index d893c5bcf1..17aafc0ea2 100644
--- a/deploy/helm/sumologic/templates/events/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/events/fluentd/service.yaml
@@ -7,8 +7,8 @@ metadata:
     app: {{ template "sumologic.labels.app.events.service" . }}
     {{- include "sumologic.labels.scrape.events" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
index ae0271ddd7..d24ae81c85 100644
--- a/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/logs/fluentd/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.logs.service-headless" . }}
     {{- include "sumologic.labels.logs" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/templates/logs/fluentd/service.yaml b/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
index 90957238e0..e523fd92e5 100644
--- a/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/logs/fluentd/service.yaml
@@ -7,8 +7,8 @@ metadata:
     app: {{ template "sumologic.labels.app.logs.service" . }}
     {{- include "sumologic.labels.scrape.logs" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml b/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
index ae81b27c6d..1737d3ec10 100644
--- a/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
+++ b/deploy/helm/sumologic/templates/metrics/fluentd/service-headless.yaml
@@ -6,8 +6,8 @@ metadata:
   labels:
     app: {{ template "sumologic.labels.app.metrics.service-headless" . }}
     {{- include "sumologic.labels.metrics" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml b/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
index 873f348c96..7af4bd1e09 100644
--- a/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
+++ b/deploy/helm/sumologic/templates/metrics/fluentd/service.yaml
@@ -7,8 +7,8 @@ metadata:
     app: {{ template "sumologic.labels.app.metrics.service" . }}
     {{- include "sumologic.labels.scrape.metrics" . | nindent 4 }}
     {{- include "sumologic.labels.common" . | nindent 4 }}
-{{- if .Values.fluentd.podLabels }}
-{{ toYaml .Values.fluentd.podLabels | indent 4 }}
+{{- if .Values.fluentd.serviceLabels }}
+{{ toYaml .Values.fluentd.serviceLabels | indent 4 }}
 {{- end }}
 spec:
   selector:
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
index 41b972c879..331634f86e 100644
--- a/deploy/helm/sumologic/values.yaml
+++ b/deploy/helm/sumologic/values.yaml
@@ -234,6 +234,9 @@ fluentd:
   ## Add custom annotations to all fluentd sts pods(logs, metrics, events)
   podAnnotations: {}
 
+  ## Add custom labels to all fluentd svc (logs, metrics, events)
+  serviceLabels: {}
+
   ## Persist data to a persistent volume; When enabled, fluentd uses the file buffer instead of memory buffer.
   persistence:
     ## After changing this value please follow steps described in: