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

Config-entry: Support proxy config in service-defaults #14395

Merged
merged 5 commits into from
Sep 12, 2022

Conversation

huikang
Copy link
Contributor

@huikang huikang commented Aug 30, 2022

Description

In current implementation, local_request_timeout_ms and local_connect_timeout_ms can only be configured either in proxy.config of individual service instances or the global proxy-defaults. Sometimes, users want to use the service-defaults config-entry to propagate the values only to the proxies of the selected service.

This PR enables this feature by adding local_request_timeout_ms and local_connect_timeout_ms to the service-defaults config-entry.

Testing & Reproduction steps

Following is an example of the service-defaults entry with the added fields.

Kind      = "service-defaults"
Name      = "backend"
Protocol  = "grpc"

LocalConnectTimeoutMs = 9000
LocalRequestTimeoutMs = 11000

Links

Address #12553

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

@huikang huikang requested a review from a team as a code owner August 30, 2022 13:30
@github-actions github-actions bot added theme/api Relating to the HTTP API interface type/docs Documentation needs to be created/updated/clarified labels Aug 30, 2022
@huikang huikang requested a review from mkeeler August 30, 2022 13:30
Copy link
Contributor

@boruszak boruszak left a comment

Choose a reason for hiding this comment

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

I reviewed the changes to service-defaults.mdx on behalf of the consul-docs team. One minor suggestion to review.

Please let me know if you have any questions or require additional review.

Granting approval on behalf of consul-docs.

Copy link
Member

@mkeeler mkeeler left a comment

Choose a reason for hiding this comment

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

This will need a rebase but overall it LGTM. I was a little surprised how little code it took to make this happen.

@huikang huikang force-pushed the support-centralized-local-timeout branch from 89e9757 to e7c190b Compare September 12, 2022 13:53
@huikang huikang merged commit f22685b into main Sep 12, 2022
@huikang huikang deleted the support-centralized-local-timeout branch September 12, 2022 14:41
huikang added a commit that referenced this pull request Sep 12, 2022
* Config-entry: Support proxy config in service-defaults

* Update website/content/docs/connect/config-entries/service-defaults.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
huikang pushed a commit that referenced this pull request Sep 12, 2022
* Config-entry: Support proxy config in service-defaults

* Update website/content/docs/connect/config-entries/service-defaults.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
huikang pushed a commit that referenced this pull request Sep 12, 2022
* Config-entry: Support proxy config in service-defaults

* Update website/content/docs/connect/config-entries/service-defaults.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/api Relating to the HTTP API interface type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants