@@ -1533,6 +1533,12 @@ Start a shell session in a pod

   # Run the command 'cat /etc/resolv.conf' inside pod 'foo'

   $ oc rsh foo cat /etc/resolv.conf

+

+  # See the configuration of your internal registry

+  $ oc rsh dc/docker-registry cat config.yml

+

+  # Open a shell session on the container named 'index' inside a pod of your job

+  # oc rsh -c index job/sheduled

 ----

 ====

@@ -3,6 +3,7 @@ package cmd

 import (

 	"fmt"

 	"io"

+	"time"

 	"github.com/spf13/cobra"

@@ -19,11 +20,13 @@ const (

 	rshLong = `

 Open a remote shell session to a container

-This command will attempt to start a shell session in the specified pod. It will default to the

-first container if none is specified, and will attempt to use '/bin/bash' as the default shell.

-You may pass an optional command after the pod name, which will be executed instead of a login

-shell. A TTY will be automatically allocated if standard input is interactive - use -t and -T

-to override.

+This command will attempt to start a shell session in a pod for the specified resource.

+It works with pods, deployment configs, jobs, daemon sets, and replication controllers.

+Any of the aforementioned resources (apart from pods) will be resolved to a ready pod.

+It will default to the first container if none is specified, and will attempt to use

+'/bin/bash' as the default shell. You may pass an optional command after the resource name,

+which will be executed instead of a login shell. A TTY will be automatically allocated

+if standard input is interactive - use -t and -T to override.

 Note, some containers may not include a shell - use '%[1]s exec' if you need to run commands

 directly.`

@@ -33,7 +36,13 @@ directly.`

   $ %[1]s foo

   # Run the command 'cat /etc/resolv.conf' inside pod 'foo'

-  $ %[1]s foo cat /etc/resolv.conf`

+  $ %[1]s foo cat /etc/resolv.conf

+

+  # See the configuration of your internal registry

+  $ %[1]s dc/docker-registry cat config.yml

+

+  # Open a shell session on the container named 'index' inside a pod of your job

+  # %[1]s -c index job/sheduled`

 )

 // RshOptions declare the arguments accepted by the Rsh command

@@ -96,7 +105,7 @@ func (o *RshOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []s

 	if len(args) < 1 {

 		return kcmdutil.UsageError(cmd, "rsh requires a single Pod to connect to")

 	}

-	o.PodName = args[0]

+	resource := args[0]

 	args = args[1:]

 	if len(args) > 0 {

 		o.Command = args

@@ -122,7 +131,9 @@ func (o *RshOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, args []s

 	}

 	o.Client = client

-	return nil

+	// TODO: Consider making the timeout configurable

+	o.PodName, err = f.PodForResource(resource, 10*time.Second)

+	return err

 }

 // Validate ensures that RshOptions are valid

@@ -18,14 +18,16 @@ import (

 	"github.com/spf13/pflag"

 	"k8s.io/kubernetes/pkg/api"

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

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

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

 	"k8s.io/kubernetes/pkg/apimachinery/registered"

+	"k8s.io/kubernetes/pkg/apis/batch"

+	"k8s.io/kubernetes/pkg/apis/extensions"

 	"k8s.io/kubernetes/pkg/client/restclient"

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

 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"

 	kclientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"

+	"k8s.io/kubernetes/pkg/controller"

 	"k8s.io/kubernetes/pkg/kubectl"

 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	"k8s.io/kubernetes/pkg/kubectl/resource"

@@ -41,6 +43,7 @@ import (

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	"github.com/openshift/origin/pkg/client"

 	"github.com/openshift/origin/pkg/cmd/cli/describe"

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deploygen "github.com/openshift/origin/pkg/deploy/generator"

 	deployreaper "github.com/openshift/origin/pkg/deploy/reaper"

@@ -391,45 +394,16 @@ func NewFactory(clientConfig kclientcmd.ClientConfig) *Factory {

 	}

 	kAttachablePodForObjectFunc := w.Factory.AttachablePodForObject

 	w.AttachablePodForObject = func(object runtime.Object) (*api.Pod, error) {

-		oc, kc, err := w.Clients()

-		if err != nil {

-			return nil, err

-		}

 		switch t := object.(type) {

 		case *deployapi.DeploymentConfig:

-			var err error

-			var pods *api.PodList

-			for pods == nil || len(pods.Items) == 0 {

-				if t.Status.LatestVersion == 0 {

-					time.Sleep(2 * time.Second)

-				}

-				if t, err = oc.DeploymentConfigs(t.Namespace).Get(t.Name); err != nil {

-					return nil, err

-				}

-				latestDeploymentName := deployutil.LatestDeploymentNameForConfig(t)

-				deployment, err := kc.ReplicationControllers(t.Namespace).Get(latestDeploymentName)

-				if err != nil {

-					if kerrors.IsNotFound(err) {

-						continue

-					}

-					return nil, err

-				}

-				pods, err = kc.Pods(deployment.Namespace).List(api.ListOptions{LabelSelector: labels.SelectorFromSet(deployment.Spec.Selector)})

-				if err != nil {

-					return nil, err

-				}

-				if len(pods.Items) == 0 {

-					time.Sleep(2 * time.Second)

-				}

-			}

-			var oldestPod *api.Pod

-			for i := range pods.Items {

-				pod := &pods.Items[i]

-				if oldestPod == nil || pod.CreationTimestamp.Before(oldestPod.CreationTimestamp) {

-					oldestPod = pod

-				}

+			_, kc, err := w.Clients()

+			if err != nil {

+				return nil, err

 			}

-			return oldestPod, nil

+			selector := labels.SelectorFromSet(t.Spec.Selector)

+			f := func(pods []*api.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) }

+			pod, _, err := cmdutil.GetFirstPod(kc, t.Namespace, selector, 1*time.Minute, f)

+			return pod, err

 		default:

 			return kAttachablePodForObjectFunc(object)

 		}

@@ -578,6 +552,90 @@ func (w *Factory) ApproximatePodTemplateForObject(object runtime.Object) (*api.P

 	}

 }

+func (f *Factory) PodForResource(resource string, timeout time.Duration) (string, error) {

+	sortBy := func(pods []*api.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) }

+	namespace, _, err := f.DefaultNamespace()

+	if err != nil {

+		return "", err

+	}

+	oc, kc, err := f.Clients()

+	if err != nil {

+		return "", err

+	}

+	mapper, _ := f.Object(false)

+	resourceType, name, err := util.ResolveResource(api.Resource("pods"), resource, mapper)

+	if err != nil {

+		return "", err

+	}

+

+	switch resourceType {

+	case api.Resource("pods"):

+		return name, nil

+	case api.Resource("replicationcontrollers"):

+		rc, err := kc.ReplicationControllers(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		selector := labels.SelectorFromSet(rc.Spec.Selector)

+		pod, _, err := cmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy)

+		if err != nil {

+			return "", err

+		}

+		return pod.Name, nil

+	case deployapi.Resource("deploymentconfigs"):

+		dc, err := oc.DeploymentConfigs(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		selector := labels.SelectorFromSet(dc.Spec.Selector)

+		pod, _, err := cmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy)

+		if err != nil {

+			return "", err

+		}

+		return pod.Name, nil

+	case extensions.Resource("daemonsets"):

+		ds, err := kc.Extensions().DaemonSets(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		selector, err := unversioned.LabelSelectorAsSelector(ds.Spec.Selector)

+		if err != nil {

+			return "", err

+		}

+		pod, _, err := cmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy)

+		if err != nil {

+			return "", err

+		}

+		return pod.Name, nil

+	case extensions.Resource("jobs"):

+		job, err := kc.Extensions().Jobs(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		return podNameForJob(job, kc, timeout, sortBy)

+	case batch.Resource("jobs"):

+		job, err := kc.Batch().Jobs(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		return podNameForJob(job, kc, timeout, sortBy)

+	default:

+		return "", fmt.Errorf("remote shell for %s is not supported", resourceType)

+	}

+}

+

+func podNameForJob(job *extensions.Job, kc *kclient.Client, timeout time.Duration, sortBy func(pods []*api.Pod) sort.Interface) (string, error) {

+	selector, err := unversioned.LabelSelectorAsSelector(job.Spec.Selector)

+	if err != nil {

+		return "", err

+	}

+	pod, _, err := cmdutil.GetFirstPod(kc, job.Namespace, selector, timeout, sortBy)

+	if err != nil {

+		return "", err

+	}

+	return pod.Name, nil

+}

+

 // Clients returns an OpenShift and Kubernetes client.

 func (f *Factory) Clients() (*client.Client, *kclient.Client, error) {

 	kClient, err := f.Client()

@@ -90,7 +90,10 @@ echo "[INFO] Waiting for Docker registry pod to start"

 wait_for_registry

 # check to make sure that logs for rc works

-oc logs rc/docker-registry-1 > /dev/null

+os::cmd::expect_success "oc logs rc/docker-registry-1 > /dev/null"

+# check that we can get a remote shell to a dc or rc

+os::cmd::expect_success_and_text "oc rsh dc/docker-registry cat config.yml" "5000"

+os::cmd::expect_success_and_text "oc rsh rc/docker-registry-1 cat config.yml" "5000"

 # services can end up on any IP.  Make sure we get the IP we need for the docker registry

 DOCKER_REGISTRY=$(oc get --output-version=v1beta3 --template="{{ .spec.portalIP }}:{{ with index .spec.ports 0 }}{{ .port }}{{ end }}" service docker-registry)

@@ -263,7 +266,7 @@ frontend_pod=$(oc get pod -l deploymentconfig=frontend --template='{{(index .ite

 # when running as a restricted pod the registry will run with a pre-allocated

 # user in the neighborhood of 1000000+.  Look for a substring of the pre-allocated uid range

 os::cmd::expect_success_and_text "oc exec -p ${frontend_pod} id" '1000'

-os::cmd::expect_success_and_text "oc rsh ${frontend_pod} id -u" '1000'

+os::cmd::expect_success_and_text "oc rsh pod/${frontend_pod} id -u" '1000'

 os::cmd::expect_success_and_text "oc rsh -T ${frontend_pod} id -u" '1000'

 # Test retrieving application logs from dc

 oc logs dc/frontend | grep "Connecting to production database"