Merge pull request #38 from dshackith/master

Adds podLabels
fluent · Oct 5, 2020 · 8b430b9 · 8b430b9
2 parents d4e6861 + edaaaf0
commit 8b430b9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.7.2
+version: 0.7.3
 appVersion: 1.5.7
 icon: https://fluentbit.io/assets/img/logo1-default.png
 home: https://fluentbit.io/

diff --git a/charts/fluent-bit/templates/daemonset.yaml b/charts/fluent-bit/templates/daemonset.yaml
@@ -18,6 +18,9 @@ spec:
       {{- end }}
       labels:
         {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "fluent-bit.pod" . | nindent 6 }}
 {{- end }}
diff --git a/charts/fluent-bit/templates/deployment.yaml b/charts/fluent-bit/templates/deployment.yaml
@@ -19,6 +19,9 @@ spec:
       {{- end }}
       labels:
         {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "fluent-bit.pod" . | nindent 6 }}
 {{- end }}
diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -75,6 +75,8 @@ affinity: {}
 
 podAnnotations: {}
 
+podLabels: {}
+
 priorityClassName: ""
 
 env: []
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,6 +75,8 @@ affinity: {} @@
     podAnnotations: {}
+    podLabels: {}
     priorityClassName: ""
     env: []
@@ Expand Down @@