Skip to content

[1.16.x] Fix topology view when displaying mixed connect-native/normal services.#18330

Merged
kisunji merged 1 commit intorelease/1.16.xfrom
kisunji/1.16.x-manual-backport
Jul 31, 2023
Merged

[1.16.x] Fix topology view when displaying mixed connect-native/normal services.#18330
kisunji merged 1 commit intorelease/1.16.xfrom
kisunji/1.16.x-manual-backport

Conversation

@kisunji
Copy link
Copy Markdown
Contributor

@kisunji kisunji commented Jul 31, 2023

Manual backport of #13023

@kisunji kisunji requested a review from a team July 31, 2023 12:23
@kisunji kisunji requested review from a team as code owners July 31, 2023 12:23
@kisunji kisunji requested review from alvin-huang and claire-labry and removed request for a team July 31, 2023 12:23
@kisunji kisunji changed the base branch from main to release/1.16.x July 31, 2023 12:23
@github-actions github-actions bot added 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/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies type/ci Relating to continuous integration (CI) tooling for testing or releases theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials labels Jul 31, 2023
@kisunji kisunji removed request for a team, alvin-huang and claire-labry July 31, 2023 12:23
@apollo13
Fix topology view when displaying mixed connect-native/normal service…
73e515f 
…s. (#13023)

* Fix topoloy intention with mixed connect-native/normal services.

If a service is registered twice, once with connect-native and once
without, the topology views would prune the existing intentions. This
change brings the code more in line with the transparent proxy behavior.

* Dedupe nodes in the ServiceTopology ui endpoint (like done with tags).

* Consider a service connect-native as soon as one instance is.
@kisunji kisunji force-pushed the kisunji/1.16.x-manual-backport branch from da42a04 to 73e515f Compare July 31, 2023 12:24
@kisunji kisunji added pr/no-backport and removed theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/ci Relating to continuous integration (CI) tooling for testing or releases theme/envoy/xds Related to Envoy support theme/config Relating to Consul Agent configuration, including reloading labels Jul 31, 2023
@kisunji kisunji merged commit e592cf0 into release/1.16.x Jul 31, 2023
@kisunji kisunji deleted the kisunji/1.16.x-manual-backport branch July 31, 2023 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@roncodingenthusiast roncodingenthusiast roncodingenthusiast approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

pr/no-backport theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/contributing Additions and enhancements to community contributing materials

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kisunji @roncodingenthusiast @apollo13