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

Support proxy_next_upstream_timeout #4005

Merged
merged 1 commit into from
Apr 15, 2019

Conversation

alexkursell
Copy link
Contributor

What this PR does / why we need it: We already support proxy_next_upstream and proxy_next_upstream_tries. We should also support proxy_next_upstream_timeout

This PR adds both a configmap value and annotation, proxy-next-upstream-timeout, that mirrors the other two supported proxy settings.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 12, 2019
CookieDomain string `json:"cookieDomain"`
CookiePath string `json:"cookiePath"`
NextUpstream string `json:"nextUpstream"`
NextUpstreamTimeout string `json:"nextUpstreamTimeout"`
Copy link
Member

Choose a reason for hiding this comment

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

Why string? Should be int.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a time value according to the docs, so it takes values like 5s, 3m, etc

@ElvinEfendi
Copy link
Member

@alexkursell please also add an e2e test for configuring proxy-next-upstream-timeout in configmap. Then squash the commits, we should be good to merge.

@alexkursell alexkursell force-pushed the proxy-next-upstream-timeout branch from 1f7beab to ffeb1fe Compare April 15, 2019 15:09
@ElvinEfendi
Copy link
Member

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 15, 2019
@aledbf
Copy link
Member

aledbf commented Apr 15, 2019

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, alexkursell, ElvinEfendi

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 merged commit 34734ed into kubernetes:master Apr 15, 2019
@alexkursell alexkursell deleted the proxy-next-upstream-timeout branch April 15, 2019 17:49
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. 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.

4 participants