Merge pull request #19628 from mikedanese/dns-headless

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-29 23:54:40 -08:00

View File

@@ -337,13 +337,13 @@ func (ks *kube2sky) generateSRVRecord(subdomain, portSegment, recordName, cName
}
func (ks *kube2sky) addDNS(subdomain string, service *kapi.Service) error {
if len(service.Spec.Ports) == 0 {
glog.Fatalf("Unexpected service with no ports: %v", service)
}
// if ClusterIP is not set, a DNS entry should not be created
if !kapi.IsServiceIPSet(service) {
return ks.newHeadlessService(subdomain, service)
}
if len(service.Spec.Ports) == 0 {
glog.Info("Unexpected service with no ports, this should not have happend: %v", service)
}
return ks.generateRecordsForPortalService(subdomain, service)
}