Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fluent-bit] optional podVersionLabel feature flag to include app.kubernetes.io/version applied to all pods #576

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+17 −4
Open

[fluent-bit] optional podVersionLabel feature flag to include app.kubernetes.io/version applied to all pods #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a77cb35
add kubernetes version label to pods
jhulick Dec 9, 2024
170efdc
bump semver for kubernetes version label
jhulick Dec 9, 2024
2e1fefb
update optional pod labels for use of version, via verbosePodLabels.e…
jhulick Dec 11, 2024
203d366
changes per peer review comments
jhulick Dec 12, 2024
b7f8144
rename value to podVersionLabel
jhulick Jan 8, 2025
3f3366f
update chart version
jhulick Jan 8, 2025
eb35d7d
bump chart version
jhulick Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/fluent-bit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions charts/fluent-bit/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}

Comment on lines +54 to +63
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be removed?

{{/*
Create the name of the service account to use
*/}}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-bit/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would make more sense being below the standard labels and implemented with the following pattern.

      {{- if and .Values.podVersionLabel .Chart.AppVersion }}
        app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
      {{- end }}

{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluent-bit/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
3 changes: 3 additions & 0 deletions charts/fluent-bit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down