Skip to content

Backport of Fix catalog service endpoint when querying for a peer service into release/1.21.x#22340

Merged
sreeram77 merged 6 commits into
release/1.21.xfrom
backport/f-catalog-service-peer/typically-peaceful-jackal
May 14, 2025
Merged

Backport of Fix catalog service endpoint when querying for a peer service into release/1.21.x#22340
sreeram77 merged 6 commits into
release/1.21.xfrom
backport/f-catalog-service-peer/typically-peaceful-jackal

Conversation

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

@hc-github-team-consul-core hc-github-team-consul-core commented May 14, 2025

Backport

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

🚨

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:
@nitin-sachdev-29
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: unable to process merge commit: "6cdaef235356f6ec61fdd690f55eaf4bb844c67b", automatic backport requires rebase workflow

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

When calling /catalog/service/<service>?peer=<peer-name> no services are returned even when they are configured as exported in the peer and shown correctly in the UI.

Making the same call on health /health/service/<service>?peer=<peer-name> works fine.

This fixes #20792

Overview of commits

github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes May 14, 2025
View reviewed changes
Copy link
Copy Markdown
Collaborator

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver left a comment

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@github-actions github-actions Bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/health-checks Health Check functionality theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/telemetry Anything related to telemetry or observability type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels May 14, 2025
@sreeram77 sreeram77 marked this pull request as ready for review May 14, 2025 08:50
@sreeram77 sreeram77 requested review from a team as code owners May 14, 2025 08:50
@sreeram77 sreeram77 merged commit 343fb96 into release/1.21.x May 14, 2025
91 checks passed
@sreeram77 sreeram77 deleted the backport/f-catalog-service-peer/typically-peaceful-jackal branch May 14, 2025 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@nitin-sachdev-29 nitin-sachdev-29 Awaiting requested review from nitin-sachdev-29

+1 more reviewer

@sreeram77 sreeram77 sreeram77 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@nitin-sachdev-29 nitin-sachdev-29

Labels

pr/dependencies PR specifically updates dependencies of project theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/health-checks Health Check functionality theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/telemetry Anything related to telemetry or observability theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hc-github-team-consul-core @sreeram77 @github-team-consul-core-pr-approver @nitin-sachdev-29 @jorgemarey