@@ -1,6 +1,7 @@

 package dns

 import (

+	"encoding/json"

 	"fmt"

 	"hash/fnv"

 	"net"

@@ -10,8 +11,10 @@ import (

 	"github.com/golang/glog"

 	kapi "k8s.io/kubernetes/pkg/api"

+	kendpoints "k8s.io/kubernetes/pkg/api/endpoints"

 	"k8s.io/kubernetes/pkg/api/errors"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

+	"k8s.io/kubernetes/pkg/util/validation"

 	"github.com/skynetservices/skydns/msg"

 	"github.com/skynetservices/skydns/server"

@@ -133,6 +136,8 @@ func (b *ServiceResolver) Records(dnsName string, exact bool) ([]msg.Service, er

 		endpointPrefix := base == "endpoints"

 		retrieveEndpoints := endpointPrefix || (len(segments) > 3 && segments[3] == "_endpoints")

+		includePorts := len(segments) > 3 && hasAllPrefixedSegments(segments[3:], "_") && segments[3] != "_endpoints"

+

 		// if has a portal IP and looking at svc

 		if svc.Spec.ClusterIP != kapi.ClusterIPNone && !retrieveEndpoints {

 			defaultService := msg.Service{

@@ -147,41 +152,41 @@ func (b *ServiceResolver) Records(dnsName string, exact bool) ([]msg.Service, er

 			defaultName := buildDNSName(subdomain, defaultHash)

 			defaultService.Key = msg.Path(defaultName)

-			if len(svc.Spec.Ports) == 0 {

+			if len(svc.Spec.Ports) == 0 || !includePorts {

 				return []msg.Service{defaultService}, nil

 			}

 			services := []msg.Service{}

-			if len(segments) == 3 {

-				for _, p := range svc.Spec.Ports {

-					port := p.Port

-					if port == 0 {

-						port = int32(p.TargetPort.IntVal)

-					}

-					if port == 0 {

-						continue

-					}

-					if len(p.Protocol) == 0 {

-						p.Protocol = kapi.ProtocolTCP

-					}

-					portName := p.Name

-					if len(portName) == 0 {

-						portName = fmt.Sprintf("unknown-port-%d", port)

-					}

-					keyName := buildDNSName(subdomain, "_"+strings.ToLower(string(p.Protocol)), "_"+portName)

-					services = append(services,

-						msg.Service{

-							Host: svc.Spec.ClusterIP,

-							Port: int(port),

-

-							Priority: 10,

-							Weight:   10,

-							Ttl:      30,

-

-							Key: msg.Path(keyName),

-						},

-					)

+			protocolMatch, portMatch := segments[3], "*"

+			if len(segments) > 4 {

+				portMatch = segments[4]

+			}

+			for _, p := range svc.Spec.Ports {

+				portSegment, protocolSegment, ok := matchesPortAndProtocol(p.Name, string(p.Protocol), portMatch, protocolMatch)

+				if !ok {

+					continue

 				}

+

+				port := p.Port

+				if port == 0 {

+					port = int32(p.TargetPort.IntVal)

+				}

+

+				keyName := buildDNSName(defaultName, protocolSegment, portSegment)

+				services = append(services,

+					msg.Service{

+						Host: svc.Spec.ClusterIP,

+						Port: int(port),

+

+						Priority: 10,

+						Weight:   10,

+						Ttl:      30,

+

+						TargetStrip: 2,

+

+						Key: msg.Path(keyName),

+					},

+				)

 			}

 			if len(services) == 0 {

 				services = append(services, defaultService)

@@ -196,6 +201,16 @@ func (b *ServiceResolver) Records(dnsName string, exact bool) ([]msg.Service, er

 			return nil, errNoSuchName

 		}

+		hostnameMappings := noHostnameMappings

+		if savedHostnames := endpoints.Annotations[kendpoints.PodHostnamesAnnotation]; len(savedHostnames) > 0 {

+			mapped := make(map[string]kendpoints.HostRecord)

+			if err = json.Unmarshal([]byte(savedHostnames), &mapped); err == nil {

+				hostnameMappings = mapped

+			}

+		}

+

+		matchHostname := len(segments) > 3 && !hasAllPrefixedSegments(segments[3:4], "_")

+

 		services := make([]msg.Service, 0, len(endpoints.Subsets)*4)

 		for _, s := range endpoints.Subsets {

 			for _, a := range s.Addresses {

@@ -207,38 +222,47 @@ func (b *ServiceResolver) Records(dnsName string, exact bool) ([]msg.Service, er

 					Weight:   10,

 					Ttl:      30,

 				}

-				defaultHash := getHash(defaultService.Host)

-				defaultName := buildDNSName(subdomain, defaultHash)

+				var endpointName string

+				if hostname, ok := getHostname(&a, hostnameMappings); ok {

+					endpointName = hostname

+				} else {

+					endpointName = getHash(defaultService.Host)

+				}

+				if matchHostname && endpointName != segments[3] {

+					continue

+				}

+

+				defaultName := buildDNSName(subdomain, endpointName)

 				defaultService.Key = msg.Path(defaultName)

+				if !includePorts {

+					services = append(services, defaultService)

+					continue

+				}

+

+				protocolMatch, portMatch := segments[3], "*"

+				if len(segments) > 4 {

+					portMatch = segments[4]

+				}

 				for _, p := range s.Ports {

-					port := p.Port

-					if port == 0 {

+					portSegment, protocolSegment, ok := matchesPortAndProtocol(p.Name, string(p.Protocol), portMatch, protocolMatch)

+					if !ok || p.Port == 0 {

 						continue

 					}

-					if len(p.Protocol) == 0 {

-						p.Protocol = kapi.ProtocolTCP

-					}

-					portName := p.Name

-					if len(portName) == 0 {

-						portName = fmt.Sprintf("unknown-port-%d", port)

-					}

-

-					keyName := buildDNSName(subdomain, "_"+strings.ToLower(string(p.Protocol)), "_"+portName, defaultHash)

+					keyName := buildDNSName(defaultName, protocolSegment, portSegment)

 					services = append(services, msg.Service{

 						Host: a.IP,

-						Port: int(port),

+						Port: int(p.Port),

 						Priority: 10,

 						Weight:   10,

 						Ttl:      30,

+						TargetStrip: 2,

+

 						Key: msg.Path(keyName),

 					})

 				}

-				if len(services) == 0 {

-					services = append(services, defaultService)

-				}

 			}

 		}

 		glog.V(4).Infof("Answered %s:%t with %#v", dnsName, exact, services)

@@ -279,6 +303,21 @@ func (b *ServiceResolver) ReverseRecord(name string) (*msg.Service, error) {

 // arpaSuffix is the standard suffix for PTR IP reverse lookups.

 const arpaSuffix = ".in-addr.arpa."

+func matchesPortAndProtocol(name, protocol, matchPortSegment, matchProtocolSegment string) (portSegment string, protocolSegment string, match bool) {

+	if len(name) == 0 {

+		return "", "", false

+	}

+	portSegment = "_" + name

+	if portSegment != matchPortSegment && matchPortSegment != "*" {

+		return "", "", false

+	}

+	protocolSegment = "_" + strings.ToLower(string(protocol))

+	if protocolSegment != matchProtocolSegment && matchProtocolSegment != "*" {

+		return "", "", false

+	}

+	return portSegment, protocolSegment, true

+}

+

 // extractIP turns a standard PTR reverse record lookup name

 // into an IP address

 func extractIP(reverseName string) (string, bool) {

@@ -309,6 +348,17 @@ func buildDNSName(labels ...string) string {

 	return res

 }

+// getHostname returns true if the provided address has a hostname, or false otherwise.

+func getHostname(address *kapi.EndpointAddress, podHostnames map[string]kendpoints.HostRecord) (string, bool) {

+	if len(address.Hostname) > 0 {

+		return address.Hostname, true

+	}

+	if hostRecord, exists := podHostnames[address.IP]; exists && len(validation.IsDNS1123Label(hostRecord.HostName)) == 0 {

+		return hostRecord.HostName, true

+	}

+	return "", false

+}

+

 // return a hash for the key name

 func getHash(text string) string {

 	h := fnv.New32a()

@@ -321,3 +371,15 @@ func getHash(text string) string {

 func convertDashIPToIP(ip string) string {

 	return strings.Join(strings.Split(ip, "-"), ".")

 }

+

+// hasAllPrefixedSegments returns true if all provided segments have the given prefix.

+func hasAllPrefixedSegments(segments []string, prefix string) bool {

+	for _, s := range segments {

+		if !strings.HasPrefix(s, prefix) {

+			return false

+		}

+	}

+	return true

+}

+

+var noHostnameMappings = map[string]kendpoints.HostRecord{}

new file mode 100755

@@ -0,0 +1,55 @@

+#!/bin/bash

+

+set -o errexit

+set -o nounset

+set -o pipefail

+

+OS_ROOT=$(dirname "${BASH_SOURCE}")/../..

+source "${OS_ROOT}/hack/lib/init.sh"

+os::log::stacktrace::install

+trap os::test::junit::reconcile_output EXIT

+

+# Cleanup cluster resources created by this test

+(

+  set +e

+  oc delete svc,endpoints --all

+  exit 0

+) &>/dev/null

+

+

+os::test::junit::declare_suite_start "cmd/dns"

+# This test validates DNS behavior

+

+ns="$(oc project -q)"

+dig="dig @${API_HOST} -p 8053"

+if [[ -z "$(which dig)" ]]; then

+  dig="echo SKIPPED TEST: dig is not installed: "

+fi

+

+os::cmd::expect_success 'oc create -f test/testdata/services.yaml'

+os::cmd::try_until_success "${dig} +short headless.${ns}.svc.cluster.local"

+

+ip="$( oc get svc/clusterip --template '{{ .spec.clusterIP }}' )"

+

+os::cmd::expect_success_and_text "${dig} +short headless.${ns}.svc.cluster.local | wc -l" "2"

+os::cmd::expect_success_and_text "${dig} +short headless.${ns}.svc.cluster.local" "10.1.2.3"

+os::cmd::expect_success_and_text "${dig} +short headless.${ns}.svc.cluster.local" "10.1.2.4"

+os::cmd::expect_success_and_text "${dig} +short test2.headless.${ns}.svc.cluster.local" "^10.1.2.4$"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.headless.${ns}.svc.cluster.local | wc -l" "2"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.headless.${ns}.svc.cluster.local" "10.1.2.3"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.headless.${ns}.svc.cluster.local" "10.1.2.4"

+os::cmd::expect_success_and_text "${dig} +short headless.${ns}.svc.cluster.local SRV" "^10 50 0 3987d90a.headless.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short headless.${ns}.svc.cluster.local SRV" "^10 50 0 test2.headless.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short test2.headless.${ns}.svc.cluster.local SRV" "^10 100 0 test2.headless.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short _http._tcp.headless.${ns}.svc.cluster.local SRV" "^10 50 80 3987d90a.headless.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short _http._tcp.headless.${ns}.svc.cluster.local SRV" "^10 50 80 test2.headless.${ns}.svc.cluster.local"

+

+os::cmd::expect_success_and_text "${dig} +short clusterip.${ns}.svc.cluster.local" "^${ip}$"

+os::cmd::expect_success_and_text "${dig} +short clusterip.${ns}.svc.cluster.local SRV" "^10 100 0 [0-9a-f]+.clusterip.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short _http._tcp.clusterip.${ns}.svc.cluster.local SRV" "^10 100 80 [0-9a-f]+.clusterip.${ns}.svc.cluster.local"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.clusterip.${ns}.svc.cluster.local | wc -l" "2"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.clusterip.${ns}.svc.cluster.local" "10.1.2.3"

+os::cmd::expect_success_and_text "${dig} +short _endpoints.clusterip.${ns}.svc.cluster.local" "10.1.2.4"

+

+echo "dns: ok"

+os::test::junit::declare_suite_end

@@ -266,8 +266,7 @@ var _ = Describe("DNS", func() {

 				"prefix.kubernetes.default.svc",

 				"prefix.kubernetes.default.svc.cluster.local",

-				// answer wildcards on cluster service

-				fmt.Sprintf("prefix.headless.%s", f.Namespace.Name),

+				// answer wildcards on clusterIP services

 				fmt.Sprintf("prefix.clusterip.%s", f.Namespace.Name),

 			}, expect),

@@ -194,8 +194,17 @@ func TestDNS(t *testing.T) {

 			dnsQuestionName: "headless.default.svc.cluster.local.",

 			srv: []*dns.SRV{

 				{

-					Target: headlessIPHash + "._unknown-port-2345._tcp.headless.default.svc.cluster.local.",

-					Port:   2345,

+					Target: headlessIPHash + ".headless.default.svc.cluster.local.",

+					Port:   0,

+				},

+			},

+		},

+		{ // SRV record for a port

+			dnsQuestionName: "_http._tcp.headless2.default.svc.cluster.local.",

+			srv: []*dns.SRV{

+				{

+					Target: headless2IPHash + ".headless2.default.svc.cluster.local.",

+					Port:   2346,

 				},

 			},

 		},

@@ -211,17 +220,13 @@ func TestDNS(t *testing.T) {

 			dnsQuestionName: "headless2.default.svc.cluster.local.",

 			srv: []*dns.SRV{

 				{

-					Target: headless2IPHash + "._http._tcp.headless2.default.svc.cluster.local.",

-					Port:   2346,

-				},

-				{

-					Target: headless2IPHash + "._other._tcp.headless2.default.svc.cluster.local.",

-					Port:   2345,

+					Target: headless2IPHash + ".headless2.default.svc.cluster.local.",

+					Port:   0,

 				},

 			},

 		},

 		{ // the SRV record resolves to the IP

-			dnsQuestionName: "other.e1.headless2.default.svc.cluster.local.",

+			dnsQuestionName: headless2IPHash + ".headless2.default.svc.cluster.local.",

 			expect:          []*net.IP{&headless2IP},

 		},

 		{

new file mode 100644

@@ -0,0 +1,49 @@

+kind: List

+apiVersion: v1

+items:

+- kind: Service

+  apiVersion: v1

+  metadata:

+    name: clusterip

+  spec:

+    ports:

+    - name: http

+      protocol: TCP

+      port: 80

+- kind: Endpoints

+  apiVersion: v1

+  metadata:

+    name: clusterip

+    annotations:

+      "endpoints.beta.kubernetes.io/hostnames-map": '{"10.1.2.4":{"HostName": "test2"}}'

+  subsets:

+  - addresses:

+    - ip: 10.1.2.3

+    - ip: 10.1.2.4

+    ports:

+    - name: http

+      protocol: TCP

+      port: 80

+- kind: Service

+  apiVersion: v1

+  metadata:

+    name: headless

+  spec:

+    clusterIP: None

+    ports:

+    - name: http

+      protocol: TCP

+      port: 80

+- kind: Endpoints

+  apiVersion: v1

+  metadata:

+    name: headless

+  subsets:

+  - addresses:

+    - ip: 10.1.2.3

+    - ip: 10.1.2.4

+      hostname: test2

+    ports:

+    - name: http

+      protocol: TCP

+      port: 80

\ No newline at end of file