@@ -27432,7 +27432,7 @@

      },

      "wildcardPolicy": {

       "type": "string",

-      "description": "Wildcard policy if any for the route."

+      "description": "Wildcard policy if any for the route. Currently only 'Subdomain' or 'None' is allowed."

      }

     }

    },

@@ -51353,7 +51353,7 @@

       "$ref": "#/definitions/v1.RouteTargetReference"

      },

      "wildcardPolicy": {

-      "description": "Wildcard policy if any for the route.",

+      "description": "Wildcard policy if any for the route. Currently only 'Subdomain' or 'None' is allowed.",

       "type": "string"

      }

     }

@@ -36,19 +36,12 @@ func RouteLessThan(route1, route2 *Route) bool {

 	return false

 }

-// GetSubdomainForHost returns the subdomain for the specified host.

-// This handles top-level domain names as well.

-// Example: acme.test and www.acme.test both return acme.test

-//          and www1.edge.acme.test returns edge.acme.test

-func GetSubdomainForHost(host string) string {

-	if len(host) == 0 {

-		return host

+// GetDomainForHost returns the domain for the specified host.

+// Note for top level domains, this will return an empty string.

+func GetDomainForHost(host string) string {

+	if idx := strings.IndexRune(host, '.'); idx > -1 {

+		return host[idx+1:]

 	}

-	parts := strings.SplitAfterN(host, ".", 3)

-	if len(parts) > 2 {

-		return parts[1] + parts[2]

-	}

-

-	return host

+	return ""

 }

@@ -89,7 +89,7 @@ func TestRouteLessThan(t *testing.T) {

 	}

 }

-func TestGetSubdomainForHost(t *testing.T) {

+func TestGetDomainForHost(t *testing.T) {

 	tests := []struct {

 		name        string

 		host        string

@@ -101,24 +101,24 @@ func TestGetSubdomainForHost(t *testing.T) {

 			expectation: "host.test",

 		},

 		{

-			name:        "plain2 aceswild",

+			name:        "aceswild",

 			host:        "www777.aceswild.test",

 			expectation: "aceswild.test",

 		},

 		{

 			name:        "subdomain1",

 			host:        "one.test",

-			expectation: "one.test",

+			expectation: "test",

 		},

 		{

 			name:        "subdomain2",

 			host:        "two.test",

-			expectation: "two.test",

+			expectation: "test",

 		},

 		{

 			name:        "subdomain3",

 			host:        "three.org",

-			expectation: "three.org",

+			expectation: "org",

 		},

 		{

 			name:        "nested subdomain",

@@ -143,17 +143,12 @@ func TestGetSubdomainForHost(t *testing.T) {

 		{

 			name:        "tld1",

 			host:        "test",

-			expectation: "test",

+			expectation: "",

 		},

 		{

 			name:        "tld2",

 			host:        "org",

-			expectation: "org",

-		},

-		{

-			name:        "tld3",

-			host:        "com",

-			expectation: "com",

+			expectation: "",

 		},

 		{

 			name:        "semi-longish host",

@@ -163,7 +158,7 @@ func TestGetSubdomainForHost(t *testing.T) {

 	}

 	for _, tc := range tests {

-		subdomain := GetSubdomainForHost(tc.host)

+		subdomain := GetDomainForHost(tc.host)

 		if subdomain != tc.expectation {

 			t.Errorf("Test case %s expected %v got %v", tc.name, tc.expectation, subdomain)

@@ -2,7 +2,6 @@ package controller

 import (

 	"fmt"

-	"strings"

 	"github.com/golang/glog"

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

@@ -147,7 +146,7 @@ func (p *HostAdmitter) HandleRoute(eventType watch.EventType, route *routeapi.Ro

 		case watch.Deleted:

 			p.claimedHosts.RemoveRoute(route.Spec.Host, route)

-			wildcardKey := getDomain(route.Spec.Host)

+			wildcardKey := routeapi.GetDomainForHost(route.Spec.Host)

 			p.claimedWildcards.RemoveRoute(wildcardKey, route)

 			p.blockedWildcards.RemoveRoute(wildcardKey, route)

 		}

@@ -166,14 +165,6 @@ func (p *HostAdmitter) SetLastSyncProcessed(processed bool) error {

 	return p.plugin.SetLastSyncProcessed(processed)

 }

-func getDomain(hostname string) string {

-	index := strings.IndexRune(hostname, '.')

-	if index == -1 {

-		return ""

-	}

-	return hostname[index+1:]

-}

-

 // addRoute admits routes based on subdomain ownership - returns errors if the route is not admitted.

 func (p *HostAdmitter) addRoute(route *routeapi.Route) error {

 	// Find displaced routes (or error if an existing route displaces us)

@@ -186,7 +177,7 @@ func (p *HostAdmitter) addRoute(route *routeapi.Route) error {

 	// Remove displaced routes

 	for _, displacedRoute := range displacedRoutes {

-		wildcardKey := getDomain(displacedRoute.Spec.Host)

+		wildcardKey := routeapi.GetDomainForHost(displacedRoute.Spec.Host)

 		p.claimedHosts.RemoveRoute(displacedRoute.Spec.Host, displacedRoute)

 		p.blockedWildcards.RemoveRoute(wildcardKey, displacedRoute)

 		p.claimedWildcards.RemoveRoute(wildcardKey, displacedRoute)

@@ -197,7 +188,7 @@ func (p *HostAdmitter) addRoute(route *routeapi.Route) error {

 	}

 	// Add the new route

-	wildcardKey := getDomain(route.Spec.Host)

+	wildcardKey := routeapi.GetDomainForHost(route.Spec.Host)

 	switch route.Spec.WildcardPolicy {

 	case routeapi.WildcardPolicyNone:

@@ -233,7 +224,7 @@ func (p *HostAdmitter) displacedRoutes(newRoute *routeapi.Route) ([]*routeapi.Ro

 		displaced = append(displaced, p.claimedHosts[newRoute.Spec.Host][i])

 	}

-	wildcardKey := getDomain(newRoute.Spec.Host)

+	wildcardKey := routeapi.GetDomainForHost(newRoute.Spec.Host)

 	// See if any existing wildcard routes block our domain, or if we displace them

 	for i, route := range p.claimedWildcards[wildcardKey] {

@@ -210,7 +210,7 @@ func matchPattern(pattern, s string) bool {

 // Generate a regular expression to match wildcard hosts (and paths if any)

 // for a [sub]domain.

 func genSubdomainWildcardRegexp(hostname, path string, exactPath bool) string {

-	subdomain := routeapi.GetSubdomainForHost(hostname)

+	subdomain := routeapi.GetDomainForHost(hostname)

 	if len(subdomain) == 0 {

 		glog.Warningf("Generating subdomain wildcard regexp - invalid host name %s", hostname)

 		return fmt.Sprintf("%s%s", hostname, path)