Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8886 from gyuho/qqq

Browse Source 
release-3.2: Revert "embed: fix HTTPs + DNS SRV discovery"
This commit is contained in:
Gyu-Ho Lee 2017-11-15 14:47:57 -08:00 committed by GitHub
commit 8dc20ead31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/config.go
View File

@ -331,9 +331,7 @@ func (cfg *Config) PeerURLsMapAndToken(which string) (urlsmap types.URLsMap, tok
} }
clusterStr := strings.Join(clusterStrs, ",") clusterStr := strings.Join(clusterStrs, ",")
if strings.Contains(clusterStr, "https://") && cfg.PeerTLSInfo.CAFile == "" { if strings.Contains(clusterStr, "https://") && cfg.PeerTLSInfo.CAFile == "" {
// SRV targets have subdomains under the given DNSCluster, so wildcard matching cfg.PeerTLSInfo.ServerName = cfg.DNSCluster
// is needed.
cfg.PeerTLSInfo.ServerName = "*." + cfg.DNSCluster
} }
urlsmap, err = types.NewURLsMap(clusterStr) urlsmap, err = types.NewURLsMap(clusterStr)
// only etcd member must belong to the discovered cluster. // only etcd member must belong to the discovered cluster.