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

Issue 4244 #4619

Merged
merged 1 commit into from
Sep 29, 2019
Merged

Issue 4244 #4619

merged 1 commit into from
Sep 29, 2019

Conversation

aspacca
Copy link
Contributor

@aspacca aspacca commented Sep 29, 2019

What this PR does / why we need it:
--health-check-path param is broken, only default healthz value is working.
Needed for integration with custom ingress controllers that need hardcoded health check path (like https://github.com/zalando-incubator/kube-ingress-aws-controller)

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #
fixes #4244

Special notes for your reviewer:
I added one test case in internal/ingress/controller/checker_test.go:35 (TestNginxCheck), not so useful and maybe an e2e test would be rather needed, but I'd need some guidance to add one of this

@k8s-ci-robot
Copy link
Contributor

Welcome @aspacca!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Sep 29, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @aspacca. 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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 29, 2019
@aspacca
Copy link
Contributor Author

aspacca commented Sep 29, 2019

/assign @bowei

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Sep 29, 2019
@aledbf
Copy link
Member

aledbf commented Sep 29, 2019

/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 Sep 29, 2019
@aledbf
Copy link
Member

aledbf commented Sep 29, 2019

@aspacca please squash the commits

@aledbf aledbf assigned aledbf and unassigned bowei Sep 29, 2019
@aspacca
Copy link
Contributor Author

aspacca commented Sep 29, 2019

@aledbf squashed

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: aspacca
To complete the pull request process, please assign aledbf
You can assign the PR to them by writing /assign @aledbf in a comment when ready.

The full list of commands accepted by this bot can be found 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

@aledbf
Copy link
Member

aledbf commented Sep 29, 2019

@aspacca thanks!. Once this passes the tests I will merge it and include it in the fix release 0.26.1 to be released today.

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@d5d2b40). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #4619   +/-   ##
=========================================
  Coverage          ?   58.67%           
=========================================
  Files             ?       88           
  Lines             ?     6764           
  Branches          ?        0           
=========================================
  Hits              ?     3969           
  Misses            ?     2356           
  Partials          ?      439
Impacted Files Coverage Δ
cmd/nginx/main.go 6.49% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d5d2b40...b4e1372. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Sep 29, 2019

Please open a new PR with the e2e test. This new test should be similar to https://github.com/kubernetes/ingress-nginx/blob/c85450c1e7eff7df36e06dc61caa51a4e2c60526/test/e2e/settings/listen_nondefault_ports.go. You need to create a directory, similar to https://github.com/kubernetes/ingress-nginx/tree/master/test/e2e-image/namespace-overlays/forwarded-port-headers changing the probe paths.
In the e2e test, you need to create a request to the new health-check path

@aledbf aledbf merged commit 203a3ed into kubernetes:master Sep 29, 2019
@aspacca aspacca deleted the ISSUE-4244 branch September 29, 2019 19:10
@aspacca aspacca mentioned this pull request Sep 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom health check path not on custom health check port
5 participants