*: use wildcard domain in DNS: SAN for etcd server certs

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>

cmd/setup-etcd-environment/run.go

@@ -87,8 +87,9 @@ func runRunCmd(cmd *cobra.Command, args []string) error {
 	}
 
 	return writeEnvironmentFile(map[string]string{
-		"IPV4_ADDRESS": ip,
-		"DNS_NAME":     dns,
+		"IPV4_ADDRESS":      ip,
+		"DNS_NAME":          dns,
+		"WILDCARD_DNS_NAME": fmt.Sprintf("*.%s", runOpts.discoverySRV),
 	}, out)
 }
 

pkg/controller/template/render.go

@@ -327,11 +327,11 @@ func skipMissing(key string) (interface{}, error) {
 func etcdServerCertDNSNames(cfg RenderConfig) (interface{}, error) {
 	var dnsNames = []string{
 		"localhost",
-		"etcd.kube-system.svc",               // sign for the local etcd service name that cluster-network apiservers use to communicate
-		"etcd.kube-system.svc.cluster.local", // sign for the local etcd service name that cluster-network apiservers use to communicate
+		"etcd.kube-system.svc",                  // sign for the local etcd service name that cluster-network apiservers use to communicate
+		"etcd.kube-system.svc.cluster.local",    // sign for the local etcd service name that cluster-network apiservers use to communicate
 		"etcd.openshift-etcd.svc",               // sign for the local etcd service name that cluster-network apiservers use to communicate
 		"etcd.openshift-etcd.svc.cluster.local", // sign for the local etcd service name that cluster-network apiservers use to communicate
-		"${ETCD_DNS_NAME}",
+		"${ETCD_WILDCARD_DNS_NAME}",
 	}
 	return strings.Join(dnsNames, ","), nil
 }

pkg/controller/template/render_test.go

@@ -160,7 +160,7 @@ func TestEtcdServerCertDNSNames(t *testing.T) {
 		url string
 		err bool
 	}{{
-		url: "localhost,etcd.kube-system.svc,etcd.kube-system.svc.cluster.local,etcd.openshift-etcd.svc,etcd.openshift-etcd.svc.cluster.local,${ETCD_DNS_NAME}",
+		url: "localhost,etcd.kube-system.svc,etcd.kube-system.svc.cluster.local,etcd.openshift-etcd.svc,etcd.openshift-etcd.svc.cluster.local,${ETCD_WILDCARD_DNS_NAME}",
 		err: false,
 	}}
 	for idx, c := range cases {