@@ -199,7 +199,7 @@ the new object will re-use the labels from the object it exposes.

 # Expose a service as a route

 $ osc expose service frontend

 # Expose a deployment config as a service and use the specified port and name

-$ osc expose dc ruby-heloo-world --port=8080 --name=myservice --generator=services/v1

+$ osc expose dc ruby-hello-world --port=8080 --name=myservice --generator=services/v1

 ```

 osc process

@@ -13,15 +13,20 @@ import (

 )

 const (

-	exposeLong = `Take a replicated application and expose it as a route.

+	exposeLong = `Expose containers internally as services or externally via routes.

-Looks up a service by name and derives a route from it.`

+There is also the ability to expose a deployment configuration, replication controller, service, or pod

+as a new service on a specified port. If no labels are specified, the new object will re-use the 

+labels from the object it exposes.`

-	exposeExample = `// Create a route based on service nginx. The new route will re-use nginx's labels.

+	exposeExample = `// Create a route based on service nginx. The new route will re-use nginx's labels

 $ %[1]s expose service nginx

-// Create a route and specify your own label.

-$ %[1]s expose service nginx --labels name=myroute`

+// Create a route and specify your own label and route name

+$ %[1]s expose service nginx --labels name=myroute --name=fromdowntown

+

+// Expose a deployment configuration as a service and use the specified port

+$ %[1]s expose dc ruby-hello-world --port=8080 --generator=services/v1`

 )

 // NewCmdExpose is a wrapper for the Kubernetes cli expose command

@@ -1,6 +1,8 @@

 package generator

 import (

+	"fmt"

+

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"

@@ -15,7 +17,8 @@ type RouteGenerator struct{}

 func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {

 	return []kubectl.GeneratorParam{

 		{"labels", false},

-		{"name", true},

+		{"default-name", true},

+		{"name", false},

 	}

 }

@@ -34,12 +37,20 @@ func (RouteGenerator) Generate(params map[string]string) (runtime.Object, error)

 		}

 	}

+	name, found := params["name"]

+	if !found || len(name) == 0 {

+		name, found = params["default-name"]

+		if !found || len(name) == 0 {

+			return nil, fmt.Errorf("'name' is a required parameter.")

+		}

+	}

+

 	return &api.Route{

 		ObjectMeta: kapi.ObjectMeta{

-			Name:   params["name"],

+			Name:   name,

 			Labels: labels,

 		},

-		ServiceName: params["name"],

+		ServiceName: params["default-name"],

 	}, nil

 }