@@ -19753,10 +19753,6 @@ _openshift_infra_f5-router()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--allow-wildcard-routes")

-    local_nonpersistent_flags+=("--allow-wildcard-routes")

-    flags+=("--allowed-domains=")

-    local_nonpersistent_flags+=("--allowed-domains=")

     flags+=("--as=")

     local_nonpersistent_flags+=("--as=")

     flags+=("--certificate-authority=")

@@ -19779,8 +19775,6 @@ _openshift_infra_f5-router()

     local_nonpersistent_flags+=("--config=")

     flags+=("--context=")

     local_nonpersistent_flags+=("--context=")

-    flags+=("--denied-domains=")

-    local_nonpersistent_flags+=("--denied-domains=")

     flags+=("--f5-host=")

     local_nonpersistent_flags+=("--f5-host=")

     flags+=("--f5-http-vserver=")

@@ -19896,10 +19890,6 @@ _openshift_infra_router()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--allow-wildcard-routes")

-    local_nonpersistent_flags+=("--allow-wildcard-routes")

-    flags+=("--allowed-domains=")

-    local_nonpersistent_flags+=("--allowed-domains=")

     flags+=("--as=")

     local_nonpersistent_flags+=("--as=")

     flags+=("--certificate-authority=")

@@ -19928,8 +19918,6 @@ _openshift_infra_router()

     local_nonpersistent_flags+=("--default-certificate-dir=")

     flags+=("--default-certificate-path=")

     local_nonpersistent_flags+=("--default-certificate-path=")

-    flags+=("--denied-domains=")

-    local_nonpersistent_flags+=("--denied-domains=")

     flags+=("--extended-validation")

     local_nonpersistent_flags+=("--extended-validation")

     flags+=("--fields=")

@@ -19914,10 +19914,6 @@ _openshift_infra_f5-router()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--allow-wildcard-routes")

-    local_nonpersistent_flags+=("--allow-wildcard-routes")

-    flags+=("--allowed-domains=")

-    local_nonpersistent_flags+=("--allowed-domains=")

     flags+=("--as=")

     local_nonpersistent_flags+=("--as=")

     flags+=("--certificate-authority=")

@@ -19940,8 +19936,6 @@ _openshift_infra_f5-router()

     local_nonpersistent_flags+=("--config=")

     flags+=("--context=")

     local_nonpersistent_flags+=("--context=")

-    flags+=("--denied-domains=")

-    local_nonpersistent_flags+=("--denied-domains=")

     flags+=("--f5-host=")

     local_nonpersistent_flags+=("--f5-host=")

     flags+=("--f5-http-vserver=")

@@ -20057,10 +20051,6 @@ _openshift_infra_router()

     flags_with_completion=()

     flags_completion=()

-    flags+=("--allow-wildcard-routes")

-    local_nonpersistent_flags+=("--allow-wildcard-routes")

-    flags+=("--allowed-domains=")

-    local_nonpersistent_flags+=("--allowed-domains=")

     flags+=("--as=")

     local_nonpersistent_flags+=("--as=")

     flags+=("--certificate-authority=")

@@ -20089,8 +20079,6 @@ _openshift_infra_router()

     local_nonpersistent_flags+=("--default-certificate-dir=")

     flags+=("--default-certificate-path=")

     local_nonpersistent_flags+=("--default-certificate-path=")

-    flags+=("--denied-domains=")

-    local_nonpersistent_flags+=("--denied-domains=")

     flags+=("--extended-validation")

     local_nonpersistent_flags+=("--extended-validation")

     flags+=("--fields=")

@@ -24,14 +24,6 @@ You may restrict the set of routes exposed to a single project (with \-\-namespa

 .SH OPTIONS

 .PP

-\fB\-\-allow\-wildcard\-routes\fP=false

-    Allow wildcard host names for routes

-

-.PP

-\fB\-\-allowed\-domains\fP=[]

-    List of comma separated domains to allow in routes. If specified, only the domains in this list will be allowed routes. Note that domains in the denied list take precedence over the ones in the allowed list

-

-.PP

 \fB\-\-api\-version\fP=""

     DEPRECATED: The API version to use when talking to the server

@@ -64,10 +56,6 @@ You may restrict the set of routes exposed to a single project (with \-\-namespa

     The name of the kubeconfig context to use

 .PP

-\fB\-\-denied\-domains\fP=[]

-    List of comma separated domains to deny in routes

-

-.PP

 \fB\-\-f5\-host\fP=""

     The host of F5 BIG\-IP's management interface

@@ -30,14 +30,6 @@ You may restrict the set of routes exposed to a single project (with \-\-namespa

 .SH OPTIONS

 .PP

-\fB\-\-allow\-wildcard\-routes\fP=false

-    Allow wildcard host names for routes

-

-.PP

-\fB\-\-allowed\-domains\fP=[]

-    List of comma separated domains to allow in routes. If specified, only the domains in this list will be allowed routes. Note that domains in the denied list take precedence over the ones in the allowed list

-

-.PP

 \fB\-\-api\-version\fP=""

     DEPRECATED: The API version to use when talking to the server

@@ -82,10 +74,6 @@ You may restrict the set of routes exposed to a single project (with \-\-namespa

     A path to default certificate to use for routes that don't expose a TLS server cert; in PEM format

 .PP

-\fB\-\-denied\-domains\fP=[]

-    List of comma separated domains to deny in routes

-

-.PP

 \fB\-\-extended\-validation\fP=true

     If set, then an additional extended validation step is performed on all routes admitted in by this router. Defaults to true and enables the extended validation checks.

@@ -16,7 +16,7 @@ RUN INSTALL_PKGS="haproxy" && \

     yum clean all && \

     mkdir -p /var/lib/haproxy/router/{certs,cacerts} && \

     mkdir -p /var/lib/haproxy/{conf,run,bin,log} && \

-    touch /var/lib/haproxy/conf/{{os_http_be,os_edge_http_be,os_tcp_be,os_sni_passthrough,os_reencrypt,os_edge_http_expose,os_edge_http_redirect,cert_config,os_wildcard_domain}.map,haproxy.config} && \

+    touch /var/lib/haproxy/conf/{{os_http_be,os_edge_http_be,os_tcp_be,os_sni_passthrough,os_reencrypt,os_edge_http_expose,os_edge_http_redirect,cert_config}.map,haproxy.config} && \

     chmod -R 777 /var && \

     setcap 'cap_net_bind_service=ep' /usr/sbin/haproxy

@@ -109,36 +109,15 @@ frontend public

   acl secure_redirect base,map_beg(/var/lib/haproxy/conf/os_edge_http_redirect.map) -m found

   redirect scheme https if secure_redirect

-{{ if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-  #  Check for wildcard domains with redirected http routes.

-  acl wildcard_domain hdr(host),map_reg(/var/lib/haproxy/conf/os_wildcard_domain.map) -m found

-

-  acl wildcard_secure_redirect base,map_reg(/var/lib/haproxy/conf/os_edge_http_redirect.map) -m found

-  redirect scheme https if wildcard_domain wildcard_secure_redirect

-

-{{ end }}

-

   # Check if it is an edge route exposed insecurely.

   acl edge_http_expose base,map_beg(/var/lib/haproxy/conf/os_edge_http_expose.map) -m found

   use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_expose.map)] if edge_http_expose

   # map to http backend

   # Search from most specific to general path (host case).

-  acl http_backend base,map_beg(/var/lib/haproxy/conf/os_http_be.map) -m found

-  use_backend be_http_%[base,map_beg(/var/lib/haproxy/conf/os_http_be.map)] if http_backend

-

-{{ if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-  #  Check for wildcard domains with exposed http routes.

-  acl wildcard_edge_http_expose base,map_reg(/var/lib/haproxy/conf/os_edge_http_expose.map) -m found

-  use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_expose.map)] if wildcard_domain wildcard_edge_http_expose

-

-  # map to http backend

-  # Search from most specific to general path (host case).

   # Note: If no match, haproxy uses the default_backend, no other

   #       use_backend directives below this will be processed.

-  use_backend be_http_%[base,map_reg(/var/lib/haproxy/conf/os_http_be.map)] if wildcard_domain

-

-{{ end }}

+  use_backend be_http_%[base,map_beg(/var/lib/haproxy/conf/os_http_be.map)]

   default_backend openshift_default

@@ -155,15 +134,6 @@ frontend public_ssl

   acl sni_passthrough req.ssl_sni,map(/var/lib/haproxy/conf/os_sni_passthrough.map) -m found

   use_backend be_tcp_%[req.ssl_sni,map(/var/lib/haproxy/conf/os_tcp_be.map)] if sni sni_passthrough

-{{ if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-  #  Check for wildcard domains with passthrough.

-  acl sni_wildcard_domain req.ssl_sni,map_reg(/var/lib/haproxy/conf/os_wildcard_domain.map) -m found

-

-  acl sni_wildcard_passthrough req.ssl_sni,map_reg(/var/lib/haproxy/conf/os_sni_passthrough.map) -m found

-  use_backend be_tcp_%[req.ssl_sni,map_reg(/var/lib/haproxy/conf/os_tcp_be.map)] if sni sni_wildcard_domain sni_wildcard_passthrough

-

-{{ end }}

-

   # if the route is SNI and NOT passthrough enter the termination flow

   use_backend be_sni if sni

@@ -201,23 +171,9 @@ frontend fe_sni

   # map to http backend

   # Search from most specific to general path (host case).

-  acl http_backend base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map) -m found

-  use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map)] if http_backend

-

-{{ if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-  #  Check for wildcard domains with redirected or exposed http routes.

-  acl sni_wildcard_domain hdr(host),map_reg(/var/lib/haproxy/conf/os_wildcard_domain.map) -m found

-

-  acl wildcard_reencrypt base,map_reg(/var/lib/haproxy/conf/os_reencrypt.map) -m found

-  use_backend be_secure_%[base,map_reg(/var/lib/haproxy/conf/os_reencrypt.map)] if sni_wildcard_domain wildcard_reencrypt

-

-  # map to http backend

-  # Search from most specific to general path (host case).

   # Note: If no match, haproxy uses the default_backend, no other

   #       use_backend directives below this will be processed.

-  use_backend be_edge_http_%[base,map_reg(/var/lib/haproxy/conf/os_edge_http_be.map)] if sni_wildcard_domain

-

-{{ end }}

+  use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map)]

   default_backend openshift_default

@@ -252,22 +208,9 @@ frontend fe_no_sni

   # map to http backend

   # Search from most specific to general path (host case).

-  acl edge_http_backend base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map) -m found

-  use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map)] if edge_http_backend

-

-{{ if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-  acl host_wildcard_domain req.ssl_sni,map_reg(/var/lib/haproxy/conf/os_wildcard_domain.map) -m found

-

-  acl host_reencrypt base,map_reg(/var/lib/haproxy/conf/os_reencrypt.map) -m found

-  use_backend be_secure_%[base,map_reg(/var/lib/haproxy/conf/os_reencrypt.map)] if host_wildcard_domain host_reencrypt

-

-  # map to http backend

-  # Search from most specific to general path (host case).

   # Note: If no match, haproxy uses the default_backend, no other

   #       use_backend directives below this will be processed.

-  use_backend be_edge_http_%[base,map_reg(/var/lib/haproxy/conf/os_edge_http_be.map)] if host_wildcard_domain

-

-{{ end }}

+  use_backend be_edge_http_%[base,map_beg(/var/lib/haproxy/conf/os_edge_http_be.map)]

   default_backend openshift_default

@@ -387,8 +330,8 @@ backend be_edge_http_{{$cfgIdx}}

     {{ end }}{{/* end iterate over services */}}

   {{ end }}{{/* end if tls==edge/none */}}

-  {{ if eq $cfg.TLSTermination "passthrough" }}

 # Secure backend, pass through

+  {{ if eq $cfg.TLSTermination "passthrough" }}

 backend be_tcp_{{$cfgIdx}}

 {{ if ne (env "ROUTER_SYSLOG_ADDRESS" "") ""}}

   option tcplog

@@ -451,8 +394,8 @@ backend be_tcp_{{$cfgIdx}}

     {{ end }}{{/* end iterate over services*/}}

   {{ end }}{{/*end tls==passthrough*/}}

-  {{ if eq $cfg.TLSTermination "reencrypt" }}

 # Secure backend which requires re-encryption

+  {{ if eq $cfg.TLSTermination "reencrypt" }}

 backend be_secure_{{$cfgIdx}}

   mode http

   option redispatch

@@ -529,34 +472,13 @@ backend be_secure_{{$cfgIdx}}

 {{/*--------------------------------- END OF HAPROXY CONFIG, BELOW ARE MAPPING FILES ------------------------*/}}

 {{/*

-    os_wildcard_domain.map: contains a mapping of wildcard hosts for a

-			[sub]domain regexps. This map is used to check if

-			a host matches a [sub]domain with has wildcard support.

-*/}}

-{{ define "/var/lib/haproxy/conf/os_wildcard_domain.map" }}

-{{     if matchPattern "true|TRUE" (env "ROUTER_ALLOW_WILDCARD_ROUTES" "")}}

-{{       range $idx, $cfg := .State }}

-{{         if ne $cfg.Host ""}}

-{{           if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host "" true}} 1

-{{           end }}

-{{         end }}

-{{       end }}

-{{     end }}{{/* end if router allows wildcard routes */}}

-{{ end }}{{/* end wildcard domain map template */}}

-

-{{/*

     os_http_be.map: contains a mapping of www.example.com -> <service name>.  This map is used to discover the correct backend

                         by attaching a prefix (be_http_) by use_backend statements if acls are matched.

 */}}

 {{ define "/var/lib/haproxy/conf/os_http_be.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (ne $cfg.Host "") (eq $cfg.TLSTermination "")}}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host $cfg.Path false}} {{$idx}}

-{{         else }}

 {{$cfg.Host}}{{$cfg.Path}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end http host map template */}}

@@ -568,11 +490,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_edge_http_be.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (ne $cfg.Host "") (eq $cfg.TLSTermination "edge")}}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host $cfg.Path false}} {{$idx}}

-{{         else }}

 {{$cfg.Host}}{{$cfg.Path}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end edge http host map template */}}

@@ -585,11 +503,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_edge_http_expose.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (ne $cfg.Host "") (and (eq $cfg.TLSTermination "edge") (eq $cfg.InsecureEdgeTerminationPolicy "Allow"))}}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host $cfg.Path false}} {{$idx}}

-{{         else }}

 {{$cfg.Host}}{{$cfg.Path}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end edge insecure expose http host map template */}}

@@ -602,11 +516,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_edge_http_redirect.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (ne $cfg.Host "") (and (eq $cfg.TLSTermination "edge") (eq $cfg.InsecureEdgeTerminationPolicy "Redirect"))}}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host $cfg.Path false}} {{$idx}}

-{{         else }}

 {{$cfg.Host}}{{$cfg.Path}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end edge insecure redirect http host map template */}}

@@ -619,11 +529,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_tcp_be.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (eq $cfg.Path "") (and (ne $cfg.Host "") (or (eq $cfg.TLSTermination "passthrough") (eq $cfg.TLSTermination "reencrypt"))) }}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host "" true}} {{$idx}}

-{{         else }}

 {{$cfg.Host}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end tcp host map template */}}

@@ -635,11 +541,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_sni_passthrough.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (eq $cfg.Path "") (eq $cfg.TLSTermination "passthrough") }}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host "" true}} {{$idx}}

-{{         else }}

 {{$cfg.Host}} 1

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end sni passthrough map template */}}

@@ -652,11 +554,7 @@ backend be_secure_{{$cfgIdx}}

 {{ define "/var/lib/haproxy/conf/os_reencrypt.map" }}

 {{     range $idx, $cfg := .State }}

 {{       if and (ne $cfg.Host "") (eq $cfg.TLSTermination "reencrypt") }}

-{{         if $cfg.IsWildcard }}

-{{genDomainWildcardRegexp $cfg.Host $cfg.Path false}} {{$idx}}

-{{         else }}

 {{$cfg.Host}}{{$cfg.Path}} {{$idx}}

-{{         end }}

 {{       end }}

 {{     end }}

 {{ end }}{{/* end reencrypt map template */}}

@@ -15,7 +15,6 @@ import (

 	"github.com/openshift/origin/pkg/cmd/templates"

 	"github.com/openshift/origin/pkg/cmd/util"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

-	routeapi "github.com/openshift/origin/pkg/route/api"

 	"github.com/openshift/origin/pkg/router/controller"

 	f5plugin "github.com/openshift/origin/pkg/router/f5"

 )

@@ -156,23 +155,6 @@ func (o *F5RouterOptions) Validate() error {

 	return o.F5Router.Validate()

 }

-// F5RouteAdmitterFunc returns a func that checks if a route is a

-// wildcard route and currently denies it.

-func (o *F5RouterOptions) F5RouteAdmitterFunc() controller.RouteAdmissionFunc {

-	return func(route *routeapi.Route) error {

-		if err := o.AdmissionCheck(route); err != nil {

-			return err

-		}

-

-		if _, wildcard := routeapi.NormalizeWildcardHost(route.Spec.Host); wildcard {

-			// TODO: F5 wildcard route support.

-			return fmt.Errorf("Wildcard routes are currently not supported by the F5 router")

-		}

-

-		return nil

-	}

-}

-

 // Run launches an F5 route sync process using the provided options. It never exits.

 func (o *F5RouterOptions) Run() error {

 	cfg := f5plugin.F5PluginConfig{

@@ -196,8 +178,7 @@ func (o *F5RouterOptions) Run() error {

 	}

 	statusPlugin := controller.NewStatusAdmitter(f5Plugin, oc, o.RouterName)

-	uniqueHostPlugin := controller.NewUniqueHost(statusPlugin, o.RouteSelectionFunc(), statusPlugin)

-	plugin := controller.NewHostAdmitter(uniqueHostPlugin, o.F5RouteAdmitterFunc(), false, statusPlugin)

+	plugin := controller.NewUniqueHost(statusPlugin, o.RouteSelectionFunc(), statusPlugin)

 	factory := o.RouterSelection.NewFactory(oc, kc)

 	controller := factory.Create(plugin)

@@ -43,15 +43,6 @@ type RouterSelection struct {

 	ProjectLabels        labels.Selector

 	IncludeUDP bool

-

-	DeniedDomains      []string

-	BlacklistedDomains sets.String

-

-	AllowedDomains     []string

-	WhitelistedDomains sets.String

-

-	AllowWildcardRoutes        bool

-	RestrictSubdomainOwnership bool

 }

 // Bind sets the appropriate labels

@@ -64,9 +55,6 @@ func (o *RouterSelection) Bind(flag *pflag.FlagSet) {

 	flag.StringVar(&o.ProjectLabelSelector, "project-labels", cmdutil.Env("PROJECT_LABELS", ""), "A label selector to apply to projects to watch; if '*' watches all projects the client can access")

 	flag.StringVar(&o.NamespaceLabelSelector, "namespace-labels", cmdutil.Env("NAMESPACE_LABELS", ""), "A label selector to apply to namespaces to watch")

 	flag.BoolVar(&o.IncludeUDP, "include-udp-endpoints", false, "If true, UDP endpoints will be considered as candidates for routing")

-	flag.StringSliceVar(&o.DeniedDomains, "denied-domains", envVarAsStrings("ROUTER_DENIED_DOMAINS", "", ","), "List of comma separated domains to deny in routes")

-	flag.StringSliceVar(&o.AllowedDomains, "allowed-domains", envVarAsStrings("ROUTER_ALLOWED_DOMAINS", "", ","), "List of comma separated domains to allow in routes. If specified, only the domains in this list will be allowed routes. Note that domains in the denied list take precedence over the ones in the allowed list")

-	flag.BoolVar(&o.AllowWildcardRoutes, "allow-wildcard-routes", cmdutil.Env("ROUTER_ALLOW_WILDCARD_ROUTES", "") == "true", "Allow wildcard host names for routes")

 }

 // RouteSelectionFunc returns a func that identifies the host for a route.

@@ -95,50 +83,6 @@ func (o *RouterSelection) RouteSelectionFunc() controller.RouteHostFunc {

 	}

 }

-func (o *RouterSelection) AdmissionCheck(route *routeapi.Route) error {

-	if len(route.Spec.Host) < 1 {

-		return nil

-	}

-

-	if hostInDomainList(route.Spec.Host, o.BlacklistedDomains) {

-		glog.V(4).Infof("host %s in list of denied domains", route.Spec.Host)

-		return fmt.Errorf("host in list of denied domains")

-	}

-

-	if o.WhitelistedDomains.Len() > 0 {

-		glog.V(4).Infof("Checking if host %s is in the list of allowed domains", route.Spec.Host)

-		if hostInDomainList(route.Spec.Host, o.WhitelistedDomains) {

-			glog.V(4).Infof("host %s admitted - in the list of allowed domains", route.Spec.Host)

-			return nil

-		}

-

-		glog.V(4).Infof("host %s rejected - not in the list of allowed domains", route.Spec.Host)

-		return fmt.Errorf("host not in the allowed list of domains")

-	}

-

-	glog.V(4).Infof("host %s admitted", route.Spec.Host)

-	return nil

-}

-

-// RouteAdmissionFunc returns a func that checks if a route can be admitted

-// based on blacklist & whitelist checks and wildcard routes policy setting.

-// Note: The blacklist settings trumps the whitelist ones.

-func (o *RouterSelection) RouteAdmissionFunc() controller.RouteAdmissionFunc {

-	return func(route *routeapi.Route) error {

-		if err := o.AdmissionCheck(route); err != nil {

-			return err

-		}

-

-		if _, wildcard := routeapi.NormalizeWildcardHost(route.Spec.Host); wildcard {

-			if !o.AllowWildcardRoutes {

-				return fmt.Errorf("wildcard routes are not allowed")

-			}

-		}

-

-		return nil

-	}

-}

-

 // Complete converts string representations of field and label selectors to their parsed equivalent, or

 // returns an error.

 func (o *RouterSelection) Complete() error {

@@ -194,13 +138,6 @@ func (o *RouterSelection) Complete() error {

 		}

 		o.NamespaceLabels = s

 	}

-

-	o.BlacklistedDomains = sets.NewString(o.DeniedDomains...)

-	o.WhitelistedDomains = sets.NewString(o.AllowedDomains...)

-

-	// Restrict subdomains is currently enforced for wildcard routes.

-	o.RestrictSubdomainOwnership = o.AllowWildcardRoutes

-

 	return nil

 }

@@ -261,28 +198,3 @@ func (n namespaceNames) NamespaceNames() (sets.String, error) {

 	}

 	return names, nil

 }

-

-func envVarAsStrings(name, defaultValue, seperator string) []string {

-	strlist := []string{}

-	if env := cmdutil.Env(name, defaultValue); env != "" {

-		values := strings.Split(env, seperator)

-		for i := range values {

-			if val := strings.TrimSpace(values[i]); val != "" {

-				strlist = append(strlist, val)

-			}

-		}

-	}

-	return strlist

-}

-

-func hostInDomainList(host string, domains sets.String) bool {

-	if domains.Has(host) {

-		return true

-	}

-

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

-		return hostInDomainList(host[idx+1:], domains)

-	}

-

-	return false

-}

@@ -207,8 +207,7 @@ func (o *TemplateRouterOptions) Run() error {

 	if o.ExtendedValidation {

 		nextPlugin = controller.NewExtendedValidator(nextPlugin, controller.RejectionRecorder(statusPlugin))

 	}

-	uniqueHostPlugin := controller.NewUniqueHost(nextPlugin, o.RouteSelectionFunc(), controller.RejectionRecorder(statusPlugin))

-	plugin := controller.NewHostAdmitter(uniqueHostPlugin, o.RouteAdmissionFunc(), o.RestrictSubdomainOwnership, controller.RejectionRecorder(statusPlugin))

+	plugin := controller.NewUniqueHost(nextPlugin, o.RouteSelectionFunc(), controller.RejectionRecorder(statusPlugin))

 	factory := o.RouterSelection.NewFactory(oc, kc)

 	controller := factory.Create(plugin)

@@ -1,15 +1,9 @@

 package api

 import (

-	"strings"

-

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

 )

-const (

-	RouteWildcardPrefix = "*."

-)

-

 // IngressConditionStatus returns the first status and condition matching the provided ingress condition type. Conditions

 // prefer the first matching entry and clients are allowed to ignore later conditions of the same type.

 func IngressConditionStatus(ingress *RouteIngress, t RouteIngressConditionType) (kapi.ConditionStatus, RouteIngressCondition) {

@@ -26,29 +20,11 @@ func RouteLessThan(route1, route2 *Route) bool {

 	if route1.CreationTimestamp.Before(route2.CreationTimestamp) {

 		return true

 	}

-

-	if route1.CreationTimestamp == route2.CreationTimestamp {

-		if route1.UID < route2.UID {

-			return true

-		}

-		if route1.Namespace < route2.Namespace {

-			return true

-		}

-		return route1.Name < route2.Name

+	if route1.CreationTimestamp == route2.CreationTimestamp && route1.UID < route2.UID {

+		return true

 	}

-

-	return false

-}

-

-// NormalizeWildcardHost tests if a host is wildcarded and returns

-// the "normalized" (domain name currently) form of the host.

-func NormalizeWildcardHost(host string) (string, bool) {

-	if len(host) > 0 {

-		if strings.HasPrefix(host, RouteWildcardPrefix) {

-			// For wildcard hosts, strip the prefix.

-			return host[len(RouteWildcardPrefix):], true

-		}

+	if route1.Namespace < route2.Namespace {

+		return true

 	}

-

-	return host, false

+	return route1.Name < route2.Name

 }

@@ -9,12 +9,9 @@ import (

 )

 func TestRouteLessThan(t *testing.T) {

-	current := unversioned.Now()

-	older := unversioned.Time{Time: current.Add(-1 * time.Minute)}

-

 	r := Route{

 		ObjectMeta: kapi.ObjectMeta{

-			CreationTimestamp: current.Rfc3339Copy(),

+			CreationTimestamp: unversioned.Now().Rfc3339Copy(),

 			UID:               "alpha",

 			Namespace:         "alpha",

 			Name:              "alpha",

@@ -52,27 +49,6 @@ func TestRouteLessThan(t *testing.T) {

 				Name:              "beta",

 			},

 		}, true},

-		{Route{

-			ObjectMeta: kapi.ObjectMeta{

-				CreationTimestamp: older,

-				UID:               r.UID,

-				Namespace:         r.Namespace,

-				Name:              "beta",

-			},

-		}, false},

-		{Route{

-			ObjectMeta: kapi.ObjectMeta{

-				CreationTimestamp: older,

-				UID:               r.UID,

-				Name:              "gamma",

-			},

-		}, false},

-		{Route{

-			ObjectMeta: kapi.ObjectMeta{

-				CreationTimestamp: older,

-				Name:              "delta",

-			},

-		}, false},

 		{r, false},

 	}

@@ -88,53 +64,3 @@ func TestRouteLessThan(t *testing.T) {

 		}

 	}

 }

-

-func TestNormalizeWildcardHost(t *testing.T) {

-	tests := []struct {

-		name        string

-		host        string

-		expectation string

-		wildcard    bool

-	}{

-		{

-			name:        "plain",

-			host:        "www.host.test",

-			expectation: "www.host.test",

-			wildcard:    false,

-		},

-		{

-			name:        "aceswild",

-			host:        "*.aceswild.test",

-			expectation: "aceswild.test",

-			wildcard:    true,

-		},

-		{

-			name:        "otherwild",

-			host:        "aces.*.test",

-			expectation: "aces.*.test",

-			wildcard:    false,

-		},

-		{

-			name:        "Invalid host",

-			host:        "*.aces.*.test",

-			expectation: "aces.*.test",

-			wildcard:    true,

-		},

-		{

-			name:        "No host",

-			host:        "",

-			expectation: "",

-			wildcard:    false,

-		},

-	}

-

-	for _, tc := range tests {

-		host, flag := NormalizeWildcardHost(tc.host)

-

-		if flag != tc.wildcard {

-			t.Errorf("Test case %s expected %t got %t", tc.name, tc.wildcard, flag)

-		} else if host != tc.expectation {

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

-		}

-	}

-}

@@ -26,8 +26,7 @@ func ValidateRoute(route *routeapi.Route) field.ErrorList {

 	//host is not required but if it is set ensure it meets DNS requirements

 	if len(route.Spec.Host) > 0 {

-		hostname, _ := routeapi.NormalizeWildcardHost(route.Spec.Host)

-		if len(kvalidation.IsDNS1123Subdomain(hostname)) != 0 {

+		if len(kvalidation.IsDNS1123Subdomain(route.Spec.Host)) != 0 {

 			result = append(result, field.Invalid(specPath.Child("host"), route.Spec.Host, "host must conform to DNS 952 subdomain conventions"))

 		}

 	}

@@ -182,34 +182,6 @@ func TestValidateRoute(t *testing.T) {

 			expectedErrors: 1,

 		},

 		{

-			name: "Wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "name",

-					Namespace: "aceswild",

-				},

-				Spec: api.RouteSpec{

-					Host: "*.aceswild.com",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			expectedErrors: 0,

-		},

-		{

-			name: "Invalid Wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "name",

-					Namespace: "wildly",

-				},

-				Spec: api.RouteSpec{

-					Host: "*.not.*.wild.ly",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			expectedErrors: 1,

-		},

-		{

 			name: "No service name",

 			route: &api.Route{

 				ObjectMeta: kapi.ObjectMeta{

@@ -1025,146 +997,3 @@ func TestExtendedValidateRoute(t *testing.T) {

 		}

 	}

 }

-

-func TestValidateRouteWildcard(t *testing.T) {

-	tests := []struct {

-		name             string

-		route            *api.Route

-		errorExpectation bool

-	}{

-		{

-			name: "No Name",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "host",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: false,

-		},

-		{

-			name: "Named host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name: "named",

-				},

-				Spec: api.RouteSpec{

-					Host: "www.name.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: false,

-		},

-		{

-			name: "aceswild",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name: "aceswild",

-				},

-				Spec: api.RouteSpec{

-					Host: "*.aceswild.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: false,

-		},

-		{

-			name: "another wild",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name: "anotherwild",

-				},

-				Spec: api.RouteSpec{

-					Host: "*.where.the.wild.things.ar",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: false,

-		},

-		{

-			name: "Invalid host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "invalid",

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "aces.*.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: true,

-		},

-		{

-			name: "Bad wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "badwildcard",

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "*.aces.*.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: true,

-		},

-		{

-			name: "Another bad wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "badwildcard2",

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "*aces.wild.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: true,

-		},

-		{

-			name: "Yet another bad wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "badwildcard3",

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "aces*.wild.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: true,

-		},

-		{

-			name: "And one more bad wildcard host",

-			route: &api.Route{

-				ObjectMeta: kapi.ObjectMeta{

-					Name:      "badwildcard4",

-					Namespace: "foo",

-				},

-				Spec: api.RouteSpec{

-					Host: "a*es.wild.test",

-					To:   createRouteSpecTo("serviceName", "Service"),

-				},

-			},

-			errorExpectation: true,

-		},

-	}

-

-	for _, tc := range tests {

-		errs := ValidateRoute(tc.route)

-

-		if tc.errorExpectation {

-			if len(errs) == 0 {

-				t.Errorf("Test case %s expected error(s), got none.", tc.name)