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

[aws-for-fluent-bit] Support terminationGracePeriodSeconds, fix kinesis_stream parameter in configmap #1051

Closed
wants to merge 5 commits into from
Closed

[aws-for-fluent-bit] Support terminationGracePeriodSeconds, fix kinesis_stream parameter in configmap #1051

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
806e3f8
update readme.md
JeongPope Jan 23, 2024
9168a30
fix: wrong config - kafka_stream output plugin
JeongPope Jan 23, 2024
053ee72
support option - terminationGracePeriodSeconds
JeongPope Jan 23, 2024
eb8a4f2
bump version up - aws-for-fluent-bit v0.1.33
JeongPope Jan 23, 2024
a7d5b87
Merge branch 'master' into master
JeongPope May 27, 2024
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
2 changes: 1 addition & 1 deletion stable/aws-for-fluent-bit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-for-fluent-bit
description: A Helm chart to deploy aws-for-fluent-bit project
version: 0.1.32
version: 0.1.33
appVersion: 2.31.12.20231011
home: https://github.com/aws/eks-charts
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
Expand Down
1 change: 1 addition & 0 deletions stable/aws-for-fluent-bit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ helm delete aws-for-fluent-bit --namespace kube-system
| `tolerations`| Optional deployment tolerations |`[]`|
| `nodeSelector`| Node labels for pod assignment |`{}`|
| `annotations`| Optional pod annotations |`{}`|
| `terminationGracePeriodSeconds`| Optional termination grace period in seconds for fluentbit | |
| `volumes`| Volumes for the pods, provide as a list of volume objects (see values.yaml) | volumes for /var/log and /var/lib/docker/containers are present, along with a fluentbit config volume |
| `volumeMounts`| Volume mounts for the pods, provided as a list of volumeMount objects (see values.yaml) | volumes for /var/log and /var/lib/docker/containers are mounted, along with a fluentbit config volume |
| `dnsPolicy`| Optional dnsPolicy |`ClusterFirst`|
Expand Down
24 changes: 12 additions & 12 deletions stable/aws-for-fluent-bit/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,33 +241,33 @@ data:

{{- if .Values.kinesis_streams.enabled }}
[OUTPUT]
Name kinesis_streams
Match {{ .Values.kinesis_streams.match }}
region {{ .Values.kinesis_streams.region }}
stream {{ .Values.kinesis_streams.stream }}
Name kinesis_streams
Match {{ .Values.kinesis_streams.match }}
region {{ .Values.kinesis_streams.region }}
stream {{ .Values.kinesis_streams.stream }}
{{- if .Values.kinesis_streams.role_arn }}
role_arn {{ .Values.kinesis_streams.role_arn }}
role_arn {{ .Values.kinesis_streams.role_arn }}
{{- end }}
{{- if .Values.kinesis_streams.endpoint }}
endpoint {{ .Values.kinesis_streams.endpoint }}
endpoint {{ .Values.kinesis_streams.endpoint }}
{{- end }}
{{- if .Values.kinesis_streams.sts_endpoint }}
sts_endpoint {{ .Values.kinesis_streams.sts_endpoint }}
sts_endpoint {{ .Values.kinesis_streams.sts_endpoint }}
{{- end }}
{{- if .Values.kinesis_streams.time_key }}
time_key {{ .Values.kinesis_streams.time_key }}
time_key {{ .Values.kinesis_streams.time_key }}
{{- end }}
{{- if .Values.kinesis_streams.time_key_format }}
time_key_format {{ .Values.kinesis_streams.time_key_format }}
time_key_format {{ .Values.kinesis_streams.time_key_format }}
{{- end }}
{{- if .Values.kinesis_streams.external_id }}
time_key_format {{ .Values.kinesis_streams.external_id }}
external_id {{ .Values.kinesis_streams.external_id }}
{{- end }}
{{- if .Values.kinesis_streams.auto_retry_requests }}
time_key_format {{ .Values.kinesis_streams.auto_retry_requests }}
auto_retry_requests {{ .Values.kinesis_streams.auto_retry_requests }}
Copy link
Contributor

Choose a reason for hiding this comment

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

can you please add support for time_key_format as well

Copy link
Author

Choose a reason for hiding this comment

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

It seems that time_key_format is already supported. If I am mistaken, please let me know.

{{- end }}
{{- if .Values.kinesis_streams.log_key }}
log_key {{ .Values.kinesis_streams.log_key }}
log_key {{ .Values.kinesis_streams.log_key }}
{{- end }}
{{- end }}

Expand Down
3 changes: 3 additions & 0 deletions stable/aws-for-fluent-bit/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ spec:
{{- if .Values.dnsPolicy }}
dnsPolicy: {{ .Values.dnsPolicy }}
{{- end }}
{{- if .Values.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down
2 changes: 2 additions & 0 deletions stable/aws-for-fluent-bit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,8 @@ annotations:
{}
# iam.amazonaws.com/role: arn:aws:iam::123456789012:role/role-for-fluent-bit

terminationGracePeriodSeconds:

# Specifies if aws-for-fluent-bit should be started in hostNetwork mode.
#
# This is required if using a custom CNI where the managed control plane nodes are unable to initiate
Expand Down