Merge pull request #8651 from xiang90/https_srv

embed: fix HTTPs + DNS SRV discovery
etcd-io · Oct 5, 2017 · db0ea5d · db0ea5d
2 parents 867e3da + f79d5aa
commit db0ea5d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/embed/config.go b/embed/config.go
@@ -397,7 +397,9 @@ func (cfg *Config) PeerURLsMapAndToken(which string) (urlsmap types.URLsMap, tok
 		}
 		clusterStr := strings.Join(clusterStrs, ",")
 		if strings.Contains(clusterStr, "https://") && cfg.PeerTLSInfo.CAFile == "" {
-			cfg.PeerTLSInfo.ServerName = cfg.DNSCluster
+			// SRV targets have subdomains under the given DNSCluster, so wildcard matching
+			// is needed.
+			cfg.PeerTLSInfo.ServerName = "*." + cfg.DNSCluster
 		}
 		urlsmap, err = types.NewURLsMap(clusterStr)
 		// only etcd member must belong to the discovered cluster.