-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
proxycfg: Ensure that endpoints for explicit upstreams in other datacenters are watched in transparent mode #10391
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the fix!
It looks like CI did not run on this PR, I think you may need to re-authenticate with CircleCI to have them run.
agent/structs/structs_oss.go
Outdated
func (n ServiceName) DiscoveryChainID() string { | ||
return fmt.Sprintf("%s?dc=dc2", n.String()) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This appears to only be used by tests, so would probably be better as a function in state_test.go
instead of a method on ServiceName
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @dnephin! I've moved it to the test file and left the hardcoding of the dc and named the function appropriately since it's the only case the function is used for. Let me know if you'd prefer a different style.
4cd53b7
to
c517e65
Compare
when they're not in the seen services list of explicit and implicit upstreams within a datacenter. Co-authored-by: Freddy Vallenilla <[email protected]>
c517e65
to
9a525eb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! I'm not familiar enough with tproxy to understand the underlying bug, but I trust you and Freddy understand it well.
The code change LGTM, but one suggestion for the changelog entry (not blocking a merge).
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/387160. |
🍒✅ Cherry pick of commit b8b4441 onto |
…enters are watched in transparent mode (#10391) Co-authored-by: Freddy Vallenilla <[email protected]>
Co-authored-by: Freddy Vallenilla [email protected]
Other Notes: