Merge pull request #8886 from gyuho/qqq

release-3.2: Revert "embed: fix HTTPs + DNS SRV discovery"
etcd-io · Nov 15, 2017 · 8dc20ea · 8dc20ea
2 parents d557296 + d3a3c31
commit 8dc20ea
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/embed/config.go b/embed/config.go
@@ -331,9 +331,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.