Skip to content

Commit

Permalink
Revert "embed: fix HTTPs + DNS SRV discovery"
Browse files Browse the repository at this point in the history
This reverts commit f79d5aa.
  • Loading branch information
gyuho committed Nov 15, 2017
1 parent 4a8c788 commit eaf3388
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions embed/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,7 @@ func (cfg *Config) PeerURLsMapAndToken(which string) (urlsmap types.URLsMap, tok
}
clusterStr := strings.Join(clusterStrs, ",")
if strings.Contains(clusterStr, "https://") && cfg.PeerTLSInfo.CAFile == "" {
// SRV targets have subdomains under the given DNSCluster, so wildcard matching
// is needed.
cfg.PeerTLSInfo.ServerName = "*." + cfg.DNSCluster
cfg.PeerTLSInfo.ServerName = cfg.DNSCluster
}
urlsmap, err = types.NewURLsMap(clusterStr)
// only etcd member must belong to the discovered cluster.
Expand Down

0 comments on commit eaf3388

Please sign in to comment.