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

fix: Stream OTel plugin with ingress nginx #39689

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

EyeCantCU
Copy link
Member

The plugin needs to be built with the version set to the exact version of nginx shipped with the controller. Get rid of the standalone package and build inline with ingress nginx

Copy link
Contributor

octo-sts bot commented Jan 15, 2025

⚠️ EXPERIMENTAL

Please use 👍 or 👎 on this comment to indicate if you agree or disagree with the recommendation.

To provide more detailed feedback please comment on the recommendation prefixed with /ai-verify:

e.g. /ai-verify partially helpful but I also added bash to the build environment

Gen AI suggestions to solve the build error:

• Detected Error: "FAIL expected commit ef64996aedd4bb5fa1831631361244813d48b82f on master, got fb678c5b4456c733e011d4bd6ad0888baca8c124"

• Error Category: Version/Commit

• Failure Point: Git checkout step for ModSecurity-nginx repository

• Root Cause Analysis: There's a mismatch between the expected commit hash (ef64996aedd4bb5fa1831631361244813d48b82f) and the actual commit hash (fb678c5b4456c733e011d4bd6ad0888baca8c124) when checking out the ModSecurity-nginx repository.

• Suggested Fix:
Update the MODSECURITY_NGINX_VERSION variable in the vars section to match the current commit hash:

vars:
  # Update this line
  MODSECURITY_NGINX_VERSION: "fb678c5b4456c733e011d4bd6ad0888baca8c124"

• Explanation: The build is failing because the git checkout step is expecting a specific commit hash that no longer exists or has changed in the upstream repository. By updating to the current commit hash that exists in the repository, the checkout step will succeed.

• Additional Notes:

  • The ModSecurity-nginx repository is a development dependency for the ingress-nginx controller
  • The commit hash mismatch suggests the upstream repository history may have been modified
  • Consider adding a comment with the date this commit was selected to help with future updates

• References:

@octo-sts octo-sts bot added ai/skip-comment Stop AI from commenting on PR bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages. labels Jan 15, 2025
@EyeCantCU EyeCantCU force-pushed the stream-otel-plugin branch 2 times, most recently from 8a4d76b to 3030c05 Compare January 15, 2025 23:55
The plugin needs to be built with the version set to the exact version
of nginx shipped with the controller. Get rid of the standalone package
and build inline with ingress nginx

Signed-off-by: RJ Sampson <[email protected]>
@EyeCantCU EyeCantCU enabled auto-merge (squash) January 16, 2025 13:01
@EyeCantCU EyeCantCU merged commit 2918296 into wolfi-dev:main Jan 16, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ai/skip-comment Stop AI from commenting on PR bincapz/pass bincapz/pass Bincapz (aka. malcontent) scan didn't detect any CRITICALs on the scanned packages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants