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

update nginx base image, handle jaeger propagation format #6956

Merged
merged 2 commits into from
Mar 26, 2021

Conversation

timmysilv
Copy link
Contributor

Rel #6936

Updating the nginx base image to create a new one in the staging env.

@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 Mar 15, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @timmysilv. 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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 15, 2021
@timmysilv
Copy link
Contributor Author

the downgrade of Alpine to 3.10 was needed to avoid a segfault in the new jaeger-cpp-client, but modsecurity seems to not be backwards compatible. I formerly thought the Jaeger issue was compatibility, but I now think something's actually wrong with some of the new yaml parsing. I'm going to look deeper into the function in the Jaeger client then come back here.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 24, 2021
@timmysilv
Copy link
Contributor Author

timmysilv commented Mar 24, 2021

^ shows that e2e passes for #6936 to be approved. Manuel's comment suggests that this means the other PR can be merged, then a new image will be auto-released. I'll update the Makefile in this PR to use that resulting image. The jaeger code changes are to support the new Jaeger client configuration features available with the new base image.

@ElvinEfendi
Copy link
Member

/ok-to-test
/hold

@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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 24, 2021
Makefile Outdated Show resolved Hide resolved
@ElvinEfendi
Copy link
Member

The PR is doing more than just updating the base image, is that intentional?

@timmysilv
Copy link
Contributor Author

yes, I alluded to that in the above comment. The new base image updates the jaeger client which handles the new propagation parameter. It can be separated into a different PR if you prefer, but the jaegerTmpl variable should probably be updated with this image update anyway.

@timmysilv timmysilv changed the title updating nginx base image update nginx base image, handle jaeger propagation format Mar 25, 2021
@timmysilv timmysilv force-pushed the timmy/base-image branch 2 times, most recently from 217d738 to afcf7c9 Compare March 26, 2021 16:31
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 26, 2021
adding default, testing w3c traceparent is propagated
@ElvinEfendi
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ElvinEfendi, timmysilv

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 Mar 26, 2021
@ElvinEfendi
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2021
@k8s-ci-robot k8s-ci-robot merged commit 844a02c into kubernetes:master Mar 26, 2021
@timmysilv timmysilv deleted the timmy/base-image branch April 9, 2021 21:54
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. 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.

3 participants