Backport of Include RequestTimeout in marshal/unmarshal of ServiceResolverConfigE… into release/1.15.x#19033
Merged
hc-github-team-consul-core merged 1032 commits intorelease/1.15.xfrom Sep 29, 2023
Conversation
implement http read endpoint to expose resource grpc service read method
feat: list resources endpoint
Stop log producer before restarting container
Update BUSL LICENSE to include licensed product and version. Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com>
Update compatibility.mdx
resource: Make resource delete tenancy awarae
…ns BUSL header (#18485) * Add license-checker action that fails when any backported file contains BUSL header * Quote echoed variable to retain line breaks * Add ticket to reference for more details
The `grep` command used to obtain the ID for the terminating gateway role is not reliable in all scenarios. For example, if there is a similarly named role, the command may return the wrong role ID for the active terminating gateway instance. This commit updates the command to use jq to obtain the role ID. If multiple roles are found, jq will raise an error informing the user that it cannot reliably determine the role ID.
* Update grep command to work on ubuntu * Run license checker when new commits are pushed to PR
* Update README.md * Update kv.mdx * Add BUSL badge
Update README.md
* Support locality testing in consul-container Support including locality in client sidecar config. Also align test config structs with Ent to avoid future conflicts. * Refactor consul-container fortio helpers Refactor fortio test helpers to separate HTTP retries from waiting on fortio result changes due to e.g. service startup and failovers.
…dpoints (#18500) * NET-4853 - xds v2 - implement base connect proxy functionality for clusters * NET-4853 - xds v2 - implement base connect proxy functionality for clusters * NET-4932 - xds v2 - implement base connect proxy functionality for endpoints * Update endpoints_test.go * gofmt * Update naming.go
* Support custom watches on controller * refactor mapper methods
…utes (#18501) * NET-4853 - xds v2 - implement base connect proxy functionality for clusters * NET-4853 - xds v2 - implement base connect proxy functionality for clusters * NET-4932 - xds v2 - implement base connect proxy functionality for endpoints * Update endpoints_test.go * gofmt * NET-4858 - Make connect proxy route tests pass using xds v2 * Update endpoints_test.go * Update naming.go * use alsoRunTestForV2 * remove unused makeAddress * gofmt * fixing clusters
* CI Split integration tests to run nightly and every PR * Checkout release branch for nightly test
* fix broken link caught in weekly report * Apply suggestions from code review Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com> --------- Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
* Create nightly test-integration for consul release branch * test * fix
This commit fixes numerous spelling errors across the site and also removes unnecessary whitespace that was present in the edited files.
* Make proto-public license MPL * Add proto-public dir to exclusion list in .copywrite.hcl
b4018be to
f6e1a3f
Compare
github-team-consul-core-pr-approver
approved these changes
Sep 29, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
Collaborator
Author
|
🤔 This PR has changes in the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #19031 to be assessed for backporting due to the inclusion of the label backport/1.15.
The below text is copied from the body of the original PR.
Description
This PR fixes a bug where we’re missing the custom JSON marshal and unmarshal for the
ServiceResolverConfigEntry.RequestTimeoutfield. This has the effect that the config entry can be written successfully to Consul but it cannot be read back through the API.Testing & Reproduction steps
Before the changes proposed in this PR:
After these changes:
PR Checklist
external facing docs updatedOverview of commits