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

Make proxy_next_upstream_tries configurable #2232

Merged
merged 2 commits into from
Mar 22, 2018

Conversation

maxlaverse
Copy link
Contributor

What this PR does / why we need it:
On deployments running a large number of pods, it is not desired to have Nginx retry failed requests as many times as they are pods. This PR makes proxy_next_upstream_tries configurable on the Nginx Ingress level through a ConfigMap, and on the Ingress leve with annotations.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 21, 2018
@maxlaverse
Copy link
Contributor Author

/assign @nicksardo

@aledbf
Copy link
Member

aledbf commented Mar 22, 2018

@maxlaverse please rebase, run make code-generator and commit the changes

@maxlaverse maxlaverse force-pushed the next_upstream_tries branch from 1c00197 to e34664d Compare March 22, 2018 09:16
@codecov-io
Copy link

Codecov Report

Merging #2232 into master will increase coverage by 0.02%.
The diff coverage is 88%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2232      +/-   ##
=========================================
+ Coverage   36.97%     37%   +0.02%     
=========================================
  Files          71      71              
  Lines        5001    5008       +7     
=========================================
+ Hits         1849    1853       +4     
- Misses       2869    2872       +3     
  Partials      283     283
Impacted Files Coverage Δ
internal/file/bindata.go 51.8% <ø> (ø) ⬆️
internal/ingress/controller/controller.go 0% <0%> (ø) ⬆️
internal/ingress/controller/config/config.go 98.05% <100%> (+0.01%) ⬆️
internal/ingress/annotations/proxy/main.go 57.89% <66.66%> (+0.14%) ⬆️

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 4f5fa47...e34664d. Read the comment docs.

@aledbf
Copy link
Member

aledbf commented Mar 22, 2018

/approve

@aledbf
Copy link
Member

aledbf commented Mar 22, 2018

@maxlaverse thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, maxlaverse

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 22, 2018
@aledbf aledbf merged commit 8575769 into kubernetes:master Mar 22, 2018
@maxlaverse maxlaverse deleted the next_upstream_tries branch March 22, 2018 12:33
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. 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.

5 participants