Skip to content

Commit

Permalink
[NET-7557] Backport of Fix to not create a watch to `Internal.Service…
Browse files Browse the repository at this point in the history
…Dump` when mesh gateway is not used into release/1.14.x (#20731)

* Backport of Fix to not create a watch to `Internal.ServiceDump` when mesh gateway is not used into release/1.14.x

This add a fix to properly verify the gateway mode before creating a watch specific to mesh gateways. This watch have a high performance cost and when mesh gateways are not used is not used.

This also adds an optimization to only return the nodes when watching the Internal.ServiceDump RPC to avoid unnecessary disco chain compilation. As watches in proxy config only need the nodes.

* backport of commit b0ce20b
* backport of commit 3d4bde0
* backport of commit b2c7724
* backport of commit e7ab4d4
* backport of commit d00d9c5
* backport of commit b2db3d5
* backport of commit 50fb45a
* backport of commit 7b41a61
* backport of commit 2fa0e0a
* backport of commit 88849c9
* backport of commit 4ac54f1
* backport of commit 2a9dfc3
* Fix tests for backport.

---------

Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: Derek Menteer <[email protected]>

* Backport of Regen expired test certs into release/1.14.x

backport of commit d399654

Co-authored-by: Semir Patel <[email protected]>

* Backport of Pin version of lint-consul-retry into release/1.14.x

backport of commit c9a08b3

* ci: disable broken integration tests

These tests fail on an unmodified version of release/1.14.x, indicating
they require later fixes that were not backported to this branch in
order to pass. Disabling for now to enable patch application and
testing.

* chore: clean up go.sum (go mod tidy)

---------

Co-authored-by: hc-github-team-consul-core <[email protected]>
Co-authored-by: Dhia Ayachi <[email protected]>
Co-authored-by: Derek Menteer <[email protected]>
Co-authored-by: Semir Patel <[email protected]>
Co-authored-by: Matt Keeler <[email protected]>
  • Loading branch information
6 people authored Mar 11, 2024
1 parent 1761eaa commit ca318f7
Show file tree
Hide file tree
Showing 47 changed files with 803 additions and 462 deletions.
7 changes: 7 additions & 0 deletions .changelog/20168.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
ProxyCfg: avoid setting a watch on `Internal.ServiceDump` when mesh gateway is not used.
```

```release-note:enhancement
ProxyCfg: only return the nodes list when querying the `Internal.ServiceDump` watch from proxycfg
```
Loading

0 comments on commit ca318f7

Please sign in to comment.