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

Working OpenTelemetry sidecar (base nginx image) #8719

Merged
merged 4 commits into from
Jun 23, 2022

Conversation

Tobrek
Copy link
Contributor

@Tobrek Tobrek commented Jun 21, 2022

What this PR does / why we need it:

This PR is a separation of the PR #8622 to prepare the change base nginx image (on request of @longwuyuan ).
fixes #8437 and #5883

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 21, 2022
@k8s-ci-robot
Copy link
Contributor

@Tobrek: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 21, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @Tobrek. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 21, 2022
@k8s-ci-robot k8s-ci-robot requested review from bowei and rikatz June 21, 2022 12:36
@longwuyuan
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 21, 2022
@@ -71,8 +69,10 @@ RUN chmod +x /usr/local/entrypoint.sh \
chown -R www-data.www-data ${dir}; \
done'

EXPOSE 80 443
# enable sidecar / init cotnainer library path
RUN echo "/lib:/usr/lib:/usr/local/lib:/modules_mount/usr/lib" > /etc/ld-musl-x86_64.path
Copy link
Contributor

@longwuyuan longwuyuan Jun 22, 2022

Choose a reason for hiding this comment

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

Hi Daniel, I had completely forgotten in the meeting yesterday so sorry for this late update.
I had moved he LD_LIBRARY_PATH variable from the base nginx image to the Controller Image. Please see this line

ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/modules_mount/etc/nginx/modules/modules
. So let us move this step of creating the /etc/ld-musl-x86_64.path file, from here to the Controller Image. So kindly remove the line here for now.

Then you can add the change to https://github.com/kubernetes/ingress-nginx/blob/7806159b386bf34b3ef0d8f130e66ad0247903af/rootfs/Dockerfile. Or if you prefer, then please let me know and I can take care of adding the file to the Controller Image, in a different PR.

@longwuyuan
Copy link
Contributor

/assign @tao12345666333 @rikatz

We are reverting the changes made to the base nginx image for Opentelemetry. These changes were discussed with the maintainer of OT @esigo as well. The other open PR on OT #8622, will become relevant, once this PR is merged.

@rikatz @tao12345666333 if you approve this now, we will have the base image promoted by tomorrow, so can talk about this in the community meeting with OTEL maintainer on this + zipkin + jaeger

@longwuyuan
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2022
@strongjz
Copy link
Member

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: longwuyuan, strongjz, Tobrek

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 23, 2022
@k8s-ci-robot k8s-ci-robot merged commit 0ff500c into kubernetes:main Jun 23, 2022
Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

/approve

@thomaschaaf
Copy link

@Tobrek there are many PRs some closed, some merged, some still open. Is it possible to use opentelemetry with the ingress? If it is would you be able to provide an example that can be added to the docs?

@Tobrek
Copy link
Contributor Author

Tobrek commented Jul 6, 2022

Hallo @thomaschaaf,
leider ist dieser PR nicht ohne #8735 nutzbar, da das opentelemtry sidecar erst in diesem PR angepasst wird. Ich warte noch auf ein Review, bevor ich damit weitermachen kann.
Für eine Anleitung, wie das sidecar nutzbar ist, kannst du in dem PR in der Datei docs/user-guide/third-party-addons/opentelemetry.md nachlesen - allerdings ohne helm zu benutzen und wenn du dir das sidecar selber compilierst.

Sorry, without PR #8735 the opentelemetry is not really able to use.
A documentation how to usethe sidecar can be (currently) found at docs/user-guide/third-party-addons/opentelemetry.md in the still open pull request.

rchshld pushed a commit to joomcode/ingress-nginx that referenced this pull request May 19, 2023
* Delete entrypoint script and add sidecar lib path

* make otel libs path otel specific

* add description

* remove library path adaption from nginx base image
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

An error occurred between opentelemetry modules
7 participants