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.

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

JeongPope
Copy link

@JeongPope JeongPope commented Jan 23, 2024

Issue

I have confirmed that there is no related Github issue or PR for this.

Description of changes

  1. Fix incorrect parameters in the output plugin for kinesis_stream.
  1. Support for the terminationGracePeriodSeconds option is provided for FluentBit pods. FluentBit supports a property grace in the SERVICE configuration for Graceful Shutdown.

Checklist

  • Added/modified documentation as required (such as the README.md for modified charts)
  • Incremented the chart version in Chart.yaml for the modified chart(s)
  • Manually tested. Describe what testing was done in the testing section below
  • Make sure the title of the PR is a good description that can go into the release notes

Testing

values-test.yaml (based on values.yaml)

# Added
terminationGracePeriodSeconds: 120

# Update
kinesis_streams:
  enabled: true
  time_key_format: test_time_key_format
  external_id: test_external_id
  auto_retry_requests: test_auto_retry_requests

Command

$ cd ./stable/aws-for-fluent-bit
$ helm template . -f values-test.yaml -s templates/daemonset.yaml -s templates/configmap.yaml

Result

# Source: aws-for-fluent-bit/templates/daemonset.yaml
apiVersion: apps/v1
kind: DaemonSet
metadata:
  name: release-name-aws-for-fluent-bit
# ... skip ...
spec:
# ... skip ...
  template:
# ... skip ...
    spec:
      serviceAccountName: release-name-aws-for-fluent-bit
      dnsPolicy: ClusterFirst
      terminationGracePeriodSeconds: 120
---
# Source: aws-for-fluent-bit/templates/configmap.yaml
apiVersion: v1
kind: ConfigMap
# ... skip ...
    [OUTPUT]
        Name                kinesis_streams
        Match               *
        region              us-east-1
        stream              my-kinesis-stream-name
        time_key_format     test_time_key_format
        external_id         test_external_id
        auto_retry_requests test_auto_retry_requests

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

PettitWesley
PettitWesley previously approved these changes Mar 12, 2024
@JeongPope
Copy link
Author

Hello, @PettitWesley.
Thank you for your review. After resolving a conflict(a7d5b87), the approval was removed. Could you please review it again?

Thank you.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants