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

[fluent-bit] Add support for additional watch paths in hot reload #578

Merged
merged 13 commits into from
Jan 16, 2025

Conversation

danielkalotai
Copy link
Contributor

fluent/fluent-bit#9718

It would be good to be able to define more paths which should be watched from the hot reload functionality.

Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
@danielkalotai danielkalotai marked this pull request as ready for review December 16, 2024 11:22
Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @danielkalotai. I think a better API for this would be to add hotReload.extraWatchVolumes as a list of strings mapping to the extraVolumes. Then the hot reload could use a range $i $v : .Values.hotReload.extraWatchVolumes pattern to set the container args and volume mounts (mount to /watch/extra-<index>).

@stevehipwell
Copy link
Collaborator

REF: fluent/fluent-bit#8918

@danielkalotai danielkalotai marked this pull request as draft January 9, 2025 13:23
@danielkalotai danielkalotai marked this pull request as ready for review January 9, 2025 13:39
Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

@danielkalotai thanks for the changes, please could you use this functionality in _ci/test-values.yaml` (it could just be an empty volume). Also please make sure you don't break the file line endings as has happened to Chart.yaml. And finally you'll need to bump the chart version of the tests will fail.

charts/fluent-bit/templates/_pod.tpl Outdated Show resolved Hide resolved
charts/fluent-bit/templates/_pod.tpl Outdated Show resolved Hide resolved
charts/fluent-bit/templates/_pod.tpl Outdated Show resolved Hide resolved
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

Please could you address the EOF and testing comments from the last review.

charts/fluent-bit/Chart.yaml Outdated Show resolved Hide resolved
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
@danielkalotai
Copy link
Contributor Author

Not sure if I understood the eof correctly.
Regarding the testing, the ct tool didn't show any issue on my side, after I bumped the version.

Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
@stevehipwell
Copy link
Collaborator

@danielkalotai your file should have a new line and use lf, you can see that it's currently incorrect via the files changed tab.

RE ct, you need to change ci/test-values.yaml to add an extra volume and mount it in FB and add it to the watched volumes in the config reloader.

Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

Just a final couple of nits.

Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Signed-off-by: Daniel Kalotai <daniel.kalotai@sap.com>
Copy link
Collaborator

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

LGTM

@stevehipwell stevehipwell merged commit 8440ebf into fluent:main Jan 16, 2025
2 checks passed
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