diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml index f97e1a12..d16e77c1 100644 --- a/charts/fluent-bit/Chart.yaml +++ b/charts/fluent-bit/Chart.yaml @@ -5,8 +5,8 @@ keywords: - logging - fluent-bit - fluentd -version: 0.48.3 -appVersion: 3.2.2 +version: 0.48.5 +appVersion: 3.2.4 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg home: https://fluentbit.io/ sources: diff --git a/charts/fluent-bit/templates/_helpers.tpl b/charts/fluent-bit/templates/_helpers.tpl index 84a30563..b0b628c0 100644 --- a/charts/fluent-bit/templates/_helpers.tpl +++ b/charts/fluent-bit/templates/_helpers.tpl @@ -51,6 +51,16 @@ app.kubernetes.io/name: {{ include "fluent-bit.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} +{{/* +Verbose Pod labels +*/}} +{{- define "fluent-bit.podVersionLabel" -}} +{{ include "fluent-bit.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +{{- end -}} + {{/* Create the name of the service account to use */}} diff --git a/charts/fluent-bit/templates/daemonset.yaml b/charts/fluent-bit/templates/daemonset.yaml index 12570954..e77168e6 100644 --- a/charts/fluent-bit/templates/daemonset.yaml +++ b/charts/fluent-bit/templates/daemonset.yaml @@ -27,7 +27,7 @@ spec: template: metadata: labels: - {{- include "fluent-bit.selectorLabels" . | nindent 8 }} + {{- include (ternary "fluent-bit.podVersionLabel" "fluent-bit.selectorLabels" .Values.podVersionLabel) . | 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 7ba61b5f..7e77ad4c 100644 --- a/charts/fluent-bit/templates/deployment.yaml +++ b/charts/fluent-bit/templates/deployment.yaml @@ -30,7 +30,7 @@ spec: template: metadata: labels: - {{- include "fluent-bit.selectorLabels" . | nindent 8 }} + {{- include (ternary "fluent-bit.podVersionLabel" "fluent-bit.selectorLabels" .Values.podVersionLabel) . | nindent 8 }} {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml index df4e47f1..5f49d0a5 100644 --- a/charts/fluent-bit/values.yaml +++ b/charts/fluent-bit/values.yaml @@ -302,6 +302,9 @@ podAnnotations: {} podLabels: {} +# adds app.kubernetes.io/version label to pods for istio required labels +podVersionLabel: false + ## How long (in seconds) a pods needs to be stable before progressing the deployment ## minReadySeconds: