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.

Sign up for GitHub

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

Jump to bottom

Add proxy-send-timeout to configmap key and annotation #616

Merged
merged 1 commit into from
Jul 8, 2019
Merged

Add proxy-send-timeout to configmap key and annotation #616

merged 1 commit into from
Jul 8, 2019

Conversation

LorcanMcVeigh
Copy link
Contributor

Allow the admin/user to configure the send timeout for https using proxy_send_timeout directive or for gRPC services using grpc_send_timeout directive.

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@LorcanMcVeigh LorcanMcVeigh self-assigned this Jul 5, 2019
pleshakov
pleshakov suggested changes Jul 5, 2019
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

@LorcanMcVeigh
Looks good.

Please add ProxySendTimeout here https://github.com/nginxinc/kubernetes-ingress/blob/c03735c6fa580c1ca8e1692ed46c7f0b41cfaff3/internal/configs/version1/templates_test.go#L60

Have you tested how this change affects VS/VSR upstreams? The expected behavior is that the ConfigMap now sets the default send-timeout for Upstreams https://github.com/nginxinc/kubernetes-ingress/blob/master/docs/virtualserver-and-virtualserverroute.md#Upstream Please make sure it is the case and update the documentation for the send-timeout field accordingly.

@LorcanMcVeigh LorcanMcVeigh requested a review from pleshakov July 5, 2019 13:11
@LorcanMcVeigh LorcanMcVeigh force-pushed the add-proxy-send-cm-annot branch from fb77fdc to 685194c Compare July 5, 2019 13:38
@LorcanMcVeigh
Copy link
Contributor Author

@LorcanMcVeigh
Looks good.

Please add ProxySendTimeout here

https://github.com/nginxinc/kubernetes-ingress/blob/c03735c6fa580c1ca8e1692ed46c7f0b41cfaff3/internal/configs/version1/templates_test.go#L60

Have you tested how this change affects VS/VSR upstreams? The expected behavior is that the ConfigMap now sets the default send-timeout for Upstreams https://github.com/nginxinc/kubernetes-ingress/blob/master/docs/virtualserver-and-virtualserverroute.md#Upstream Please make sure it is the case and update the documentation for the send-timeout field accordingly.

yes that works and i've updated the docs

Rulox
Rulox suggested changes Jul 5, 2019
View reviewed changes
Copy link
Contributor

@Rulox Rulox left a comment

Choose a reason for hiding this comment

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

lgtm except for a small typo in the doc I think.

docs/virtualserver-and-virtualserverroute.md Outdated Show resolved Hide resolved
Dean-Coakley
Dean-Coakley approved these changes Jul 5, 2019
View reviewed changes
Copy link
Contributor

@Dean-Coakley Dean-Coakley left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good. Tested using ingress resource, and also with using vs/vsrs. Appears to be in working order

pleshakov
pleshakov approved these changes Jul 5, 2019
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Looks good. But please fix the typo mentioned in https://github.com/nginxinc/kubernetes-ingress/pull/616/files#r300727258

@LorcanMcVeigh LorcanMcVeigh requested a review from Rulox July 8, 2019 07:49
Rulox
Rulox approved these changes Jul 8, 2019
View reviewed changes
Copy link
Contributor

@Rulox Rulox left a comment

Choose a reason for hiding this comment

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

👍

@LorcanMcVeigh LorcanMcVeigh force-pushed the add-proxy-send-cm-annot branch from 2b0231e to 31405b2 Compare July 8, 2019 09:25
@LorcanMcVeigh LorcanMcVeigh force-pushed the add-proxy-send-cm-annot branch from 31405b2 to 27706c9 Compare July 8, 2019 09:47
@LorcanMcVeigh LorcanMcVeigh changed the title Added proxy_send_timeout to configmap and annot Add proxy_send_timeout to configmap and annot Jul 8, 2019
@LorcanMcVeigh LorcanMcVeigh merged commit 1f4ad60 into master Jul 8, 2019
@LorcanMcVeigh LorcanMcVeigh deleted the add-proxy-send-cm-annot branch July 8, 2019 10:37
@pleshakov pleshakov changed the title Add proxy_send_timeout to configmap and annot Add proxy_send_timeout to configmap key and annotation Dec 17, 2019
@pleshakov pleshakov changed the title Add proxy_send_timeout to configmap key and annotation Add proxy-send-timeout to configmap key and annotation Dec 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dean-Coakley Dean-Coakley Dean-Coakley approved these changes

@Rulox Rulox Rulox approved these changes

@pleshakov pleshakov pleshakov approved these changes

Assignees

@LorcanMcVeigh LorcanMcVeigh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@LorcanMcVeigh @pleshakov @Rulox @Dean-Coakley