consul/agent
Derek Menteer 0379dabe4e
Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007)
Fix configuration merging for implicit tproxy upstreams.

Change the merging logic so that the wildcard upstream has correct proxy-defaults
and service-defaults values combined into it. It did not previously merge all fields,
and the wildcard upstream did not exist unless service-defaults existed (it ignored
proxy-defaults, essentially).

Change the way we fetch upstream configuration in the xDS layer so that it falls back
to the wildcard when no matching upstream is found. This is what allows implicit peer
upstreams to have the correct "merged" config.

Change proxycfg to always watch local mesh gateway endpoints whenever a peer upstream
is found. This simplifies the logic so that we do not have to inspect the "merged"
configuration on peer upstreams to extract the mesh gateway mode.
2023-01-19 10:55:27 -06:00
..
ae sdk: add TestLogLevel for setting log level in tests 2022-02-03 13:42:28 -05:00
auto-config Backport of Update go version to 1.19 into release/1.14.x (#15139) 2022-10-24 16:12:42 -04:00
cache xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
cache-types Backport of Update go version to 1.19 into release/1.14.x (#15139) 2022-10-24 16:12:42 -04:00
checks Update hcp-scada-provider to fix diamond dependency problem with go-msgpack (#15185) (#15277) 2022-11-07 12:09:18 -05:00
config Add support for configuring Envoys route idle_timeout (#14340) (#15611) 2022-11-29 17:58:00 -05:00
configentry Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007) 2023-01-19 10:55:27 -06:00
connect xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
consul Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007) 2023-01-19 10:55:27 -06:00
debug bulk rewrite using this script 2022-01-20 10:46:23 -06:00
dns test: fix incorrect use of t instead of r in retry test (#13146) 2022-05-19 14:00:07 -05:00
exec re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
grpc-external xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
grpc-internal backport of commit 8cdb0e7fd2 (#16002) 2023-01-18 16:55:57 +00:00
grpc-middleware Backport of Added check for empty peeringsni in restrictPeeringEndpoints into release/1.14.x (#15240) 2022-11-02 18:21:09 -04:00
hcp xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
local Merge pull request #13499 from maxb/delete-unused-metric 2022-08-01 12:31:05 -06:00
metadata Change serf-tag references to field references. 2022-08-31 16:38:42 -05:00
mock
pool backport of commit b3f544a23b (#15545) 2022-11-24 10:13:31 -05:00
proxycfg Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007) 2023-01-19 10:55:27 -06:00
proxycfg-glue Backport of Fixup authz for data imported from peers into release/1.14.x (#15355) 2022-11-14 13:36:51 -05:00
proxycfg-sources xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
router Backport of Update go version to 1.19 into release/1.14.x (#15139) 2022-10-24 16:12:42 -04:00
routine-leak-checker Remove references to "master" ACL tokens in tests (#11751) 2021-12-07 12:48:50 +00:00
rpc Backport of Enforce lowercase peer names. into release/1.14.x (#15977) 2023-01-13 20:30:50 +00:00
rpcclient/health backport of commit 62688107af (#15129) 2022-10-24 14:10:23 -04:00
structs Backport of Fix DialedDirectly configuration for Consul dataplane. into release/1.14.x (#15779) 2022-12-13 15:31:26 +00:00
submatview xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
systemd
token agent/token: rename `agent_master` to `agent_recovery` (internally) (#11744) 2021-12-07 12:12:47 +00:00
uiserver Enable/Disable Peering Support in the UI (#13816) 2022-07-25 11:50:11 -04:00
xds Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007) 2023-01-19 10:55:27 -06:00
acl.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
acl_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
acl_endpoint_legacy.go
acl_endpoint_legacy_test.go agent: Ensure partition is considered in agent endpoints (#11427) 2021-10-26 15:20:57 -04:00
acl_endpoint_test.go [OSS] Add new peering ACL rule (#13848) 2022-07-22 14:42:23 -06:00
acl_oss.go agent: support `X-Consul-Results-Filtered-By-ACLs` header in agent-local endpoints (#11610) 2021-12-03 20:36:28 +00:00
acl_test.go chore: removed unused method AddService (#13905) 2022-07-26 16:54:53 -04:00
agent.go xds: don't attempt to load-balance sessions for local proxies (#15789) (#16004) 2023-01-19 10:34:01 +00:00
agent_endpoint.go Merge branch 'main' of github.com:hashicorp/consul into derekm/split-grpc-ports 2022-09-08 14:53:08 -05:00
agent_endpoint_oss.go Fixup acl.EnterpriseMeta 2022-04-05 15:11:49 -07:00
agent_endpoint_oss_test.go Add oss test 2022-05-09 10:07:19 -07:00
agent_endpoint_test.go connect: ensure all vault connect CA tests use limited privilege tokens (#15689) 2022-12-06 12:30:45 -06:00
agent_oss.go proxycfg: replace direct agent cache usage with interfaces (#13320) 2022-06-01 16:18:06 +01:00
agent_test.go Backport of Backport tests from ent. into release/1.14.x (#15262) 2022-11-04 11:19:44 -04:00
apiserver.go
apiserver_test.go
catalog_endpoint.go [OSS] Support merge-central-config option in node services list API (#13450) 2022-06-15 08:30:31 -07:00
catalog_endpoint_oss.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
catalog_endpoint_test.go block PeerName register requests (#13887) 2022-07-29 14:36:22 -07:00
check.go Fixup acl.EnterpriseMeta 2022-04-05 15:11:49 -07:00
config_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
config_endpoint_test.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
connect_auth.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
connect_ca_endpoint.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
connect_ca_endpoint_test.go Update go version to 1.18.1 2022-04-18 11:41:10 -04:00
coordinate_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
coordinate_endpoint_test.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
delegate_mock_test.go Move ACLResolveResult into acl/resolver package (#13467) 2022-06-17 10:24:43 +01:00
denylist.go
denylist_test.go
discovery_chain_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
discovery_chain_endpoint_test.go Cluster peering failover disco chain changes (#14296) 2022-08-23 09:13:43 -04:00
dns.go Backport of Add peering `.service` and `.node` DNS lookups. into release/1.14.x (#15599) 2022-11-29 13:18:48 -06:00
dns_oss.go Backport of Add peering `.service` and `.node` DNS lookups. into release/1.14.x (#15599) 2022-11-29 13:18:48 -06:00
dns_oss_test.go Backport of Add peering `.service` and `.node` DNS lookups. into release/1.14.x (#15599) 2022-11-29 13:18:48 -06:00
dns_test.go backport of commit ee0ba0ef63 (#15756) 2022-12-09 16:36:33 +00:00
enterprise_delegate_oss.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
event_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
event_endpoint_test.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
federation_state_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
health_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
health_endpoint_test.go backport of commit 62688107af (#15129) 2022-10-24 14:10:23 -04:00
http.go Backport of Allow consul debug on non-ACL consul servers into release/1.14.x (#15167) 2022-10-27 09:26:06 -04:00
http_decode_test.go Backport of Update go version to 1.19 into release/1.14.x (#15139) 2022-10-24 16:12:42 -04:00
http_oss.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
http_oss_test.go Remove references to "master" ACL tokens in tests (#11751) 2021-12-07 12:48:50 +00:00
http_register.go Add new internal endpoint to list exported services to a peer 2022-09-23 09:43:56 -04:00
http_test.go Backport of Allow consul debug on non-ACL consul servers into release/1.14.x (#15167) 2022-10-27 09:26:06 -04:00
intentions_endpoint.go oss: peering, http: get peer service intentions (#2098) 2022-06-22 16:25:09 -07:00
intentions_endpoint_oss_test.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
intentions_endpoint_test.go test: possibly fix flake in TestIntentionGetExact (#15021) 2022-10-18 10:51:20 -05:00
keyring.go Allows keyring operations on client agents 2022-02-24 17:24:57 +00:00
keyring_test.go Remove references to "master" ACL tokens in tests (#11751) 2021-12-07 12:48:50 +00:00
kvs_endpoint.go Fix KVSGet method to handle QueryOptions properly (#13344) 2022-06-02 12:26:18 -04:00
kvs_endpoint_test.go
metrics.go agent: move agent tls metric monitor to a more appropriate place 2021-10-27 16:26:09 -04:00
metrics_test.go Middleware: `RequestRecorder` reports calls below 1ms as decimal value (#12905) 2022-09-15 13:04:37 -04:00
nodeid.go
nodeid_test.go
notify.go
notify_test.go
operator_endpoint.go Unify various status errors into one HTTP error type. (#12594) 2022-04-29 13:42:49 -04:00
operator_endpoint_oss.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
operator_endpoint_test.go
peering_endpoint.go Support Stale Queries for Trust Bundle Lookups (#14724) 2022-09-28 09:56:59 -07:00
peering_endpoint_oss_test.go [sync oss] api: add peering api module (#12911) 2022-05-02 11:49:05 -07:00
peering_endpoint_test.go Backport of Bring back parameter ServerExternalAddresses in GenerateToken endpoint into release/1.14.x (#15296) 2022-11-08 15:31:17 -06:00
prepared_query_endpoint.go Revert getPathSuffixUnescaped (#13256) 2022-06-01 13:17:14 -04:00
prepared_query_endpoint_test.go Add Cluster Peering Failover Support to Prepared Queries (#13835) 2022-07-22 09:14:43 -04:00
reload.go
remote_exec.go
remote_exec_test.go Remove references to "master" ACL tokens in tests (#11751) 2021-12-07 12:48:50 +00:00
retry_join.go add HCP integration component (#14723) 2022-09-26 14:58:15 -04:00
retry_join_test.go add HCP integration component (#14723) 2022-09-26 14:58:15 -04:00
service_checks_test.go Service http checks data source for agentless proxies (#14924) 2022-10-12 07:49:56 -07:00
service_manager.go Merge central config for GetEnvoyBootstrapParams (#14869) 2022-10-10 12:40:27 -05:00
service_manager_test.go Fix configuration merging for implicit tproxy upstreams. (#16000) (#16007) 2023-01-19 10:55:27 -06:00
session_endpoint.go Backport of fix: clarifying error message when acquiring a lock in remote dc into release/1.14.x (#15415) 2022-11-16 15:28:16 -05:00
session_endpoint_test.go
setup.go backport of commit b3f544a23b (#15545) 2022-11-24 10:13:31 -05:00
setup_oss.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
sidecar_service.go PR #14057 follow up fix: service id parsing from sidecar id (#14541) 2022-09-09 09:47:10 -05:00
sidecar_service_test.go Backport of Backport test from ENT: "Fix missing test fields" into release/1.14.x (#15261) 2022-11-04 10:29:37 -04:00
signal_unix.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
signal_windows.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
snapshot_endpoint.go
snapshot_endpoint_test.go
status_endpoint.go
status_endpoint_test.go
streaming_test.go regenerate expired certs (#11462) 2021-11-01 11:40:16 -04:00
testagent.go Use internal server certificate for peering TLS 2022-10-07 09:05:32 -06:00
testagent_test.go
translate_addr.go
txn_endpoint.go Merge pull request #13388 from deblasis/feature/health-checks_windows_service 2022-10-17 09:26:19 -04:00
txn_endpoint_test.go increase the size of txn to support vault (#14599) 2022-09-19 09:07:19 -07:00
ui_endpoint.go Add new internal endpoint to list exported services to a peer 2022-09-23 09:43:56 -04:00
ui_endpoint_oss_test.go re-run gofmt on 1.17 (#11579) 2021-11-16 12:04:01 -06:00
ui_endpoint_test.go Rename `PeerName` to `Peer` on prepared queries and exported services (#14854) 2022-10-04 14:46:15 -04:00
user_event.go Vendor in rpc mono repo for net/rpc fork, go-msgpack, msgpackrpc. (#12311) 2022-02-14 09:45:45 -08:00
user_event_test.go chore: removed unused method AddService (#13905) 2022-07-26 16:54:53 -04:00
util.go Remove some usage of md5 from the system (#11491) 2021-11-04 13:07:54 -07:00
util_test.go Remove some usage of md5 from the system (#11491) 2021-11-04 13:07:54 -07:00
watch_handler.go
watch_handler_test.go