update optional pod labels for use of version, via verbosePodLabels.enabled in values

Signed-off-by: jeremy.hulick <[email protected]>

Author: jhulick

charts/fluent-bit/templates/_helpers.tpl

@@ -52,9 +52,9 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
-Pod labels
+Verbose Pod labels
 */}}
-{{- define "fluent-bit.podLabels" -}}
+{{- define "fluent-bit.verbosePodLabels" -}}
 {{ include "fluent-bit.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}

charts/fluent-bit/templates/daemonset.yaml

@@ -27,7 +27,11 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "fluent-bit.podLabels" . | nindent 8 }}
+        {{- if .Values.verbosePodLabels.enabled }}
+          {{- include "fluent-bit.verbosePodLabels" . | nindent 8 }}
+        {{- else }}
+          {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
+        {{- end }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

charts/fluent-bit/templates/deployment.yaml

@@ -30,7 +30,11 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "fluent-bit.podLabels" . | nindent 8 }}
+      {{- if .Values.verbosePodLabels.enabled }}
+        {{- include "fluent-bit.verbosePodLabels" . | nindent 8 }}
+      {{- else }}
+        {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
+      {{- end }}
       {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/fluent-bit/values.yaml

@@ -302,6 +302,10 @@ podAnnotations: {}
 
 podLabels: {}
 
+# adds app.kubernetes.io/version label to pods for istio required labels
+verbosePodLabels:
+  enabled: false
+
 ## How long (in seconds) a pods needs to be stable before progressing the deployment
 ##
 minReadySeconds: