Skip to content

Backport of Add support for requestTimeout in Service Resolver spec into release/1.0.x#2657

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.0.xfrom
backport/mvincent/request-timeout-resolver/briefly-humorous-grizzly
Closed

Backport of Add support for requestTimeout in Service Resolver spec into release/1.0.x#2657
hc-github-team-consul-core wants to merge 1 commit intorelease/1.0.xfrom
backport/mvincent/request-timeout-resolver/briefly-humorous-grizzly

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #2641 to be assessed for backporting due to the inclusion of the label backport/1.0.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@thisisnotashwin
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR:

  • Adding support for providing requestTimeout in the Service Resolver config.
  • Currently adding requestTimeout in config gets an unknown field error.

How I've tested this PR:
Use imageK8S: campvin/consul-k8s-control-plane-dev and image: "hashicorp/consul:1.16.0" in values.yaml with this PR. Apply a service resolver to an upstream with the requestTimeout:

apiVersion: consul.hashicorp.com/v1alpha1
kind: ServiceResolver
metadata:
  name: counting
spec:
  requestTimeout: 39s

Check the downstream envoy sidecar for the request timeout

example in dashboard's sidecar:


      "virtual_hosts": [
       {
        "name": "counting",
        "domains": [
         "*"
        ],
        "routes": [
         {
          "match": {
           "prefix": "/"
          },
          "route": {
           "cluster": "c96d44b2~counting.default.dc1.internal.2b5d16f8-cd32-a7ef-1026-2a1c4032c6b9.consul",
           "timeout": "39s"
          }

How I expect reviewers to test this PR:

Checklist:


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/mvincent/request-timeout-resolver/briefly-humorous-grizzly branch 2 times, most recently from 1d51da8 to 0057640 Compare July 25, 2023 20:54
@hashicorp-cla
Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@github-actions github-actions bot deleted the backport/mvincent/request-timeout-resolver/briefly-humorous-grizzly branch September 1, 2025 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants