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.

Sign up for GitHub

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

Jump to bottom

embed: fix HTTPs + DNS SRV discovery #8651

Merged
merged 1 commit into from
Oct 5, 2017
Merged

embed: fix HTTPs + DNS SRV discovery #8651

merged 1 commit into from
Oct 5, 2017

Conversation

xiang90
Copy link
Contributor

@xiang90 xiang90 commented Oct 5, 2017

Fix #8445

@gyuho can you manually test it? or do we have a plan to add a test case for this?

@gyuho
Copy link
Contributor

gyuho commented Oct 5, 2017

Ok I will try manual-testing it. Thanks.

gyuho
gyuho reviewed Oct 5, 2017
View reviewed changes
embed/config.go Outdated
cfg.PeerTLSInfo.ServerName = cfg.DNSCluster
// SRV targets have subdomains under the given DNSCluster, so wildcard matching
// is needed.
cfg.PeerTLSInfo.ServerName = "*" + cfg.DNSCluster
Copy link
Contributor

Choose a reason for hiding this comment

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

s/*/*./?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed.

@gyuho gyuho mentioned this pull request Oct 5, 2017
Merged
gyuho
gyuho approved these changes Oct 5, 2017
View reviewed changes
Copy link
Contributor

@gyuho gyuho left a comment

Choose a reason for hiding this comment

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

lgtm. Thanks!

@gyuho
Copy link
Contributor

gyuho commented Oct 5, 2017 •
edited
Loading

Was able to reproduce, and confirm the fix via #8654.

@xiang90
Copy link
Contributor Author

xiang90 commented Oct 5, 2017

The ppc64 one is always failing recently. i have not digged into why. but that should not block this pr. so merging.

@xiang90 xiang90 merged commit db0ea5d into etcd-io:master Oct 5, 2017
@xiang90 xiang90 deleted the https_srv branch October 5, 2017 22:49
@bdhess bdhess mentioned this pull request Oct 24, 2017
Closed
@stephanh
Copy link

stephanh commented Nov 8, 2017

This change breaks existing clusters that use ETCD with SSL without the wildcard domain. It would have been good if it wasn't part of a patch release and the release notes highlighted that it is a backwards incompatible change.

@gyuho gyuho mentioned this pull request Nov 8, 2017
Closed
14 tasks
@xiang90
Copy link
Contributor Author

xiang90 commented Nov 8, 2017

@stephanh maybe we will revert this change, and find a better solution. i am not sure how to deal with it for now. but we will figure it out before the release.

@stephanh
Copy link

stephanh commented Nov 8, 2017

@xiang90 it has already been included in the 3.2.9 release (https://github.com/coreos/etcd/releases/tag/v3.2.9).

@xiang90
Copy link
Contributor Author

xiang90 commented Nov 8, 2017

@stephanh sorry. then we need to figure this out as soon as possible.

@gyuho gyuho mentioned this pull request Nov 15, 2017
Merged
@gyuho
Copy link
Contributor

gyuho commented Nov 17, 2017

FYI this has been reverted and released with https://github.com/coreos/etcd/releases/tag/v3.2.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gyuho gyuho gyuho approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xiang90 @gyuho @stephanh