mirror of https://github.com/status-im/consul.git
418bd62c44
* Fix mesh gateway proxy-defaults not affecting upstreams. * Clarify distinction with upstream settings Top-level mesh gateway mode in proxy-defaults and service-defaults gets merged into NodeService.Proxy.MeshGateway, and only gets merged with the mode attached to an an upstream in proxycfg/xds. * Fix mgw mode usage for peered upstreams There were a couple issues with how mgw mode was being handled for peered upstreams. For starters, mesh gateway mode from proxy-defaults and the top-level of service-defaults gets stored in NodeService.Proxy.MeshGateway, but the upstream watch for peered data was only considering the mesh gateway config attached in NodeService.Proxy.Upstreams[i]. This means that applying a mesh gateway mode via global proxy-defaults or service-defaults on the downstream would not have an effect. Separately, transparent proxy watches for peered upstreams didn't consider mesh gateway mode at all. This commit addresses the first issue by ensuring that we overlay the upstream config for peered upstreams as we do for non-peered. The second issue is addressed by re-using setupWatchesForPeeredUpstream when handling transparent proxy updates. Note that for transparent proxies we do not yet support mesh gateway mode per upstream, so the NodeService.Proxy.MeshGateway mode is used. * Fix upstream mesh gateway mode handling in xds This commit ensures that when determining the mesh gateway mode for peered upstreams we consider the NodeService.Proxy.MeshGateway config as a baseline. In absense of this change, setting a mesh gateway mode via proxy-defaults or the top-level of service-defaults will not have an effect for peered upstreams. * Merge service/proxy defaults in cfg resolver Previously the mesh gateway mode for connect proxies would be merged at three points: 1. On servers, in ComputeResolvedServiceConfig. 2. On clients, in MergeServiceConfig. 3. On clients, in proxycfg/xds. The first merge returns a ServiceConfigResponse where there is a top-level MeshGateway config from proxy/service-defaults, along with per-upstream config. The second merge combines per-upstream config specified at the service instance with per-upstream config specified centrally. The third merge combines the NodeService.Proxy.MeshGateway config containing proxy/service-defaults data with the per-upstream mode. This third merge is easy to miss, which led to peered upstreams not considering the mesh gateway mode from proxy-defaults. This commit removes the third merge, and ensures that all mesh gateway config is available at the upstream. This way proxycfg/xds do not need to do additional overlays. * Ensure that proxy-defaults is considered in wc Upstream defaults become a synthetic Upstream definition under a wildcard key "*". Now that proxycfg/xds expect Upstream definitions to have the final MeshGateway values, this commit ensures that values from proxy-defaults/service-defaults are the default for this synthetic upstream. * Add changelog. Co-authored-by: freddygv <freddy@hashicorp.com> |
||
|---|---|---|
| .. | ||
| proxysupport | ||
| serverlessplugin | ||
| testdata | ||
| xdscommon | ||
| clusters.go | ||
| clusters_test.go | ||
| config.go | ||
| config_test.go | ||
| delta.go | ||
| delta_test.go | ||
| endpoints.go | ||
| endpoints_test.go | ||
| envoy_versioning.go | ||
| envoy_versioning_test.go | ||
| failover_math.go | ||
| failover_math_test.go | ||
| golden_test.go | ||
| listeners.go | ||
| listeners_ingress.go | ||
| listeners_test.go | ||
| naming.go | ||
| net_fallback.go | ||
| net_linux.go | ||
| protocol_trace.go | ||
| rbac.go | ||
| rbac_test.go | ||
| resources.go | ||
| resources_oss_test.go | ||
| resources_test.go | ||
| response.go | ||
| routes.go | ||
| routes_test.go | ||
| server.go | ||
| server_oss.go | ||
| serverless_plugin_oss_test.go | ||
| testing.go | ||
| xds.go | ||
| xds_protocol_helpers_test.go | ||
| z_xds_packages.go | ||
| z_xds_packages_test.go | ||