Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DialedDirectly configuration for Consul dataplane. #15760

Merged
merged 3 commits into from Dec 13, 2022

Conversation

hashi-derek
Copy link
Member

@hashi-derek hashi-derek commented Dec 9, 2022

The DialedDirectly configuration on upstreams is ignored by Consul Dataplane, because it selects data through the streaming backend which does not support the MergeCentralConfig flag. This means that any service-defaults or proxy-defaults configurations on upstreams were ignored.

This PR adds the DialedDirectly config into the compiled discovery chain targets, so that the "merged" version is available to the proxy config.

This PR also fixes an existing issue where passthrough clusters were not properly cleaned up whenever the DialedDirectly field is toggled on and off during runtime.

@hashi-derek hashi-derek force-pushed the derekm/NET-1719/dialed-directly-chains branch 8 times, most recently from c90fc75 to 7ca8d26 Compare December 12, 2022 17:02
@hashi-derek hashi-derek marked this pull request as ready for review December 12, 2022 17:35
@hashi-derek hashi-derek force-pushed the derekm/NET-1719/dialed-directly-chains branch from 7ca8d26 to b9b929d Compare December 12, 2022 17:54
Copy link
Contributor

@freddygv freddygv left a comment

Choose a reason for hiding this comment

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

This is looking good, left a few asks below

agent/consul/discoverychain/compile.go Outdated Show resolved Hide resolved
agent/proxycfg/upstreams.go Show resolved Hide resolved
@hashi-derek hashi-derek merged commit e87d35e into main Dec 13, 2022
@hashi-derek hashi-derek deleted the derekm/NET-1719/dialed-directly-chains branch December 13, 2022 15:16
@hashi-derek hashi-derek added the backport-inactive/1.14 This release series is longer active label Dec 13, 2022
t-eckert pushed a commit that referenced this pull request Dec 15, 2022
Fix DialedDirectly configuration for Consul dataplane.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-inactive/1.14 This release series is longer active
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Transparent proxy dialed directly not working on Consul 1.14.0 and Consul K8s 1.0
3 participants