@@ -119,8 +119,10 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {

 			supportsTCP := false

 			for _, port := range svc.Spec.Ports {

 				if port.Protocol == kapi.ProtocolTCP {

-					// Pass service target port as the route port

-					cmd.Flags().Set("port", port.TargetPort.String())

+					if len(port.Name) > 0 {

+						// Pass service port name as the route target port, if it is named

+						cmd.Flags().Set("target-port", port.Name)

+					}

 					supportsTCP = true

 					break

 				}

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

 import (

 	"fmt"

-	"strings"

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

 	"k8s.io/kubernetes/pkg/kubectl"

@@ -23,8 +22,7 @@ func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {

 	return []kubectl.GeneratorParam{

 		{"labels", false},

 		{"default-name", true},

-		{"port", false},

-		{"ports", false},

+		{"target-port", false},

 		{"name", false},

 		{"hostname", false},

 	}

@@ -62,16 +60,7 @@ func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Ob

 		}

 	}

-	var portString string

-	portString, found = params["port"]

-	if !found || len(portString) == 0 {

-		portString = strings.Split(params["ports"], ",")[0]

-	}

-	if len(portString) == 0 {

-		return nil, fmt.Errorf("exposed service does not have any target ports specified")

-	}

-

-	return &api.Route{

+	route := &api.Route{

 		ObjectMeta: kapi.ObjectMeta{

 			Name:   name,

 			Labels: labels,

@@ -81,9 +70,15 @@ func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Ob

 			To: kapi.ObjectReference{

 				Name: params["default-name"],

 			},

-			Port: &api.RoutePort{

-				TargetPort: util.NewIntOrStringFromString(portString),

-			},

 		},

-	}, nil

+	}

+

+	portString := params["target-port"]

+	if len(portString) > 0 {

+		route.Spec.Port = &api.RoutePort{

+			TargetPort: util.NewIntOrStringFromString(portString),

+		}

+	}

+

+	return route, nil

 }

@@ -23,6 +23,8 @@ func TestGenerateRoute(t *testing.T) {

 				"name":         "test",

 				"default-name": "someservice",

 				"port":         "80",

+				"ports":        "80,443",

+				"target-port":  "svcportname",

 				"hostname":     "www.example.com",

 			},

 			expected: routeapi.Route{

@@ -40,7 +42,7 @@ func TestGenerateRoute(t *testing.T) {

 					Port: &routeapi.RoutePort{

 						TargetPort: util.IntOrString{

 							Kind:   util.IntstrString,

-							StrVal: "80",

+							StrVal: "svcportname",

 						},

 					},

 				},

@@ -51,6 +53,7 @@ func TestGenerateRoute(t *testing.T) {

 				"labels":       "foo=bar",

 				"name":         "test",

 				"default-name": "someservice",

+				"port":         "80",

 				"ports":        "80,443",

 				"hostname":     "www.example.com",

 			},

@@ -66,12 +69,6 @@ func TestGenerateRoute(t *testing.T) {

 					To: api.ObjectReference{

 						Name: "someservice",

 					},

-					Port: &routeapi.RoutePort{

-						TargetPort: util.IntOrString{

-							Kind:   util.IntstrString,

-							StrVal: "80",

-						},

-					},

 				},

 			},

 		},

@@ -68,7 +68,8 @@ os::cmd::expect_success 'oc create -f test/integration/fixtures/test-service.jso

 os::cmd::expect_failure 'oc expose service frontend --create-external-load-balancer'

 os::cmd::expect_failure 'oc expose service frontend --port=40 --type=NodePort'

 os::cmd::expect_success 'oc expose service frontend'

-os::cmd::expect_success_and_text 'oc get route frontend' 'name=frontend'

+os::cmd::expect_success_and_text "oc get route frontend --output-version=v1 --template='{{.spec.to.name}}'" "frontend"           # routes to correct service

+os::cmd::expect_success_and_text "oc get route frontend --output-version=v1 --template='{{.spec.port.targetPort}}'" "<no value>" # no target port for services with unnamed ports

 os::cmd::expect_success 'oc delete svc,route -l name=frontend'

 # Test that external services are exposable

 os::cmd::expect_success 'oc create -f test/fixtures/external-service.yaml'

@@ -79,7 +80,7 @@ os::cmd::expect_success 'oc delete svc external'

 # Expose multiport service and verify we set a port in the route

 os::cmd::expect_success 'oc create -f test/fixtures/multiport-service.yaml'

 os::cmd::expect_success 'oc expose svc/frontend --name route-with-set-port'

-os::cmd::expect_success "os::util::get_object_assert 'route route-with-set-port' '{{.spec.port.targetPort}}' '8080'"

+os::cmd::expect_success_and_text "oc get route route-with-set-port --template='{{.spec.port.targetPort}}' --output-version=v1" "web"

 echo "expose: ok"

 os::cmd::expect_success 'oc delete all --all'