From dc8b8bdebe7855e1d9d2f3102bd641140311c437 Mon Sep 17 00:00:00 2001
From: "jeremy.hulick" <jeremy.hulick@gmail.com>
Date: Thu, 12 Dec 2024 11:36:47 -0700
Subject: [PATCH] changes per peer review comments

Signed-off-by: jeremy.hulick <jeremy.hulick@gmail.com>
---
 charts/fluent-bit/templates/daemonset.yaml  | 6 +-----
 charts/fluent-bit/templates/deployment.yaml | 6 +-----
 charts/fluent-bit/values.yaml               | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/charts/fluent-bit/templates/daemonset.yaml b/charts/fluent-bit/templates/daemonset.yaml
index 752b8399..3c9b08fa 100644
--- a/charts/fluent-bit/templates/daemonset.yaml
+++ b/charts/fluent-bit/templates/daemonset.yaml
@@ -27,11 +27,7 @@ spec:
   template:
     metadata:
       labels:
-        {{- if .Values.verbosePodLabels.enabled }}
-          {{- include "fluent-bit.verbosePodLabels" . | nindent 8 }}
-        {{- else }}
-          {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
-        {{- end }}
+        {{- include (ternary "fluent-bit.verbosePodLabels" "fluent-bit.selectorLabels" .Values.verbosePodLabels)  . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/charts/fluent-bit/templates/deployment.yaml b/charts/fluent-bit/templates/deployment.yaml
index 990a5d7b..7327060b 100644
--- a/charts/fluent-bit/templates/deployment.yaml
+++ b/charts/fluent-bit/templates/deployment.yaml
@@ -30,11 +30,7 @@ spec:
   template:
     metadata:
       labels:
-      {{- if .Values.verbosePodLabels.enabled }}
-        {{- include "fluent-bit.verbosePodLabels" . | nindent 8 }}
-      {{- else }}
-        {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
-      {{- end }}
+      {{- include (ternary "fluent-bit.verbosePodLabels" "fluent-bit.selectorLabels" .Values.verbosePodLabels)  . | nindent 8 }}
       {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
index 99a8fea0..9c77c265 100644
--- a/charts/fluent-bit/values.yaml
+++ b/charts/fluent-bit/values.yaml
@@ -303,8 +303,7 @@ podAnnotations: {}
 podLabels: {}
 
 # adds app.kubernetes.io/version label to pods for istio required labels
-verbosePodLabels:
-  enabled: false
+verbosePodLabels: false
 
 ## How long (in seconds) a pods needs to be stable before progressing the deployment
 ##