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

Jump to bottom

Enabled support of luajit for fluent-bit #11846

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Enabled support of luajit for fluent-bit #11846

merged 1 commit into from
Jan 10, 2025

Conversation

kgodara912
Copy link

@kgodara912 kgodara912 commented Jan 10, 2025 •
edited
Loading

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

What does the PR accomplish, why was it needed?
Azure Linux 2.0 doesn't have luajit support built-in for fluent-bit. The rpm version 1.8 which has Lua support is no longer supported. This patch enables Lua support so that fluent-bit can be updated in those environments where luajit support is mandatory.

Change Log
  • Change
  • Change
  • Change
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id:
  • Validated local build compilation and installation of luajit enabled fluent bit binary. Also, verified the fluent bit unit tests which has luajit tests as well.

@kgodara912 kgodara912 requested a review from a team as a code owner January 10, 2025 09:44
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/2.0 PRs Destined for AzureLinux 2.0 labels Jan 10, 2025
mfrw
mfrw approved these changes Jan 10, 2025
View reviewed changes
Copy link
Member

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

LGTM.

Have triggered a test build:

SPECS/fluent-bit/fluent-bit.spec
@@ -132,7 +138,7 @@ Development files for %{name}
- Upgrade version to 1.9.6
- Add build time dependency libyaml-devel

* Thu Feb 19 2022 Sriram Nambakam <[email protected]> - 1.8.12-2
* Sat Feb 19 2022 Sriram Nambakam <[email protected]> - 1.8.12-2
Copy link
Member

Choose a reason for hiding this comment

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

NIce Catch :)

jslobodzian
jslobodzian requested changes Jan 10, 2025
View reviewed changes
Copy link
Contributor

@jslobodzian jslobodzian left a comment

Choose a reason for hiding this comment

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

See comments about linking to system libs.

@jslobodzian jslobodzian merged commit 411398f into microsoft:fasttrack/2.0 Jan 10, 2025
10 checks passed
CBL-Mariner-Bot pushed a commit that referenced this pull request Jan 10, 2025
@kgodara912 @CBL-Mariner-Bot
Enabled support of luajit for fluent-bit (#11846)
57c4cde 
Signed-off-by: Kshitiz Godara <[email protected]>
Co-authored-by: Kshitiz Godara <[email protected]>
(cherry picked from commit 411398f)
@CBL-Mariner-Bot CBL-Mariner-Bot mentioned this pull request Jan 10, 2025
Merged
@CBL-Mariner-Bot
Copy link
Collaborator

Auto cherry-pick results:

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=708936&view=results

@kgodara912 kgodara912 deleted the kgodara/fluent-bit/fluent_bit_lua_support branch January 12, 2025 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jslobodzian jslobodzian jslobodzian approved these changes

@rikenm1 rikenm1 rikenm1 approved these changes

@mfrw mfrw mfrw approved these changes

Assignees
No one assigned
Labels
fasttrack/2.0 PRs Destined for AzureLinux 2.0 Packaging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kgodara912 @CBL-Mariner-Bot @mfrw @jslobodzian @rikenm1