Repository navigation
fix(ci): build fluent-bit image from a configurable upstream base tag - #2104
Draft
joshuabaird wants to merge 2 commits into
Draft
joshuabaird wants to merge 2 commits into
joshuabaird wants to merge 2 commits into
Conversation
Adds hack/sync-helm-charts.sh and a sync-helm-charts workflow that release-please dispatches after each release. It opens a PR in fluent/helm-charts with the synced charts, bumped versions, generated CHANGELOG entries and regenerated READMEs. Removes the stale chart CHANGELOGs here; fluent/helm-charts owns them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Josh Baird <jbaird@galileo.io>
Add cmd/fluent-watcher/fluentbit/BASE_VERSION so the upstream fluent/fluent-bit base tag can differ from our VERSION. Upstream published 5.1.5-2 with the libbrotli1 fix for CVE-2026-111497 but did not update the 5.1.5 tag. The debug image falls back to ${VERSION}-debug when no matching upstream debug tag exists. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Josh Baird <jbaird@galileo.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Upstream published
fluent/fluent-bit:5.1.5-2with the patchedlibbrotli1(1.1.0-2+deb13u1), but the5.1.5tag still has the vulnerable1.1.0-2+b7. Our build always usesVERSIONas the base tag, so rebuilding (v5.1.5-1) didn't pick up the fix.This adds
cmd/fluent-watcher/fluentbit/BASE_VERSIONto set the upstream base tag separately fromVERSION. If the file is missing, the build falls back toVERSION. Our image tags still come fromVERSION, so merging this producesv5.1.5-2through the existing patch-release logic.Upstream has no
5.1.5-2-debugtag yet. Until a matching debug tag exists, the debug image falls back to${VERSION}-debug, which means the debug image still has the vulnerable library.Which issue(s) this PR fixes:
Fixes #2082
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.:
🤖 Generated with Claude Code