@@ -23,7 +23,8 @@ var (

 		Open a remote shell session to a container

 		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.

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

+		and replica sets.

 		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/sh' as the default shell. You may pass any flags supported by this command before

@@ -976,6 +976,42 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string

 			return "", err

 		}

 		return pod.Name, nil

+	case extensions.Resource("deployments"):

+		kc, err := f.Client()

+		if err != nil {

+			return "", err

+		}

+		d, err := kc.Extensions().Deployments(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		selector, err := unversioned.LabelSelectorAsSelector(d.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("replicasets"):

+		kc, err := f.Client()

+		if err != nil {

+			return "", err

+		}

+		rs, err := kc.Extensions().ReplicaSets(namespace).Get(name)

+		if err != nil {

+			return "", err

+		}

+		selector, err := unversioned.LabelSelectorAsSelector(rs.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"):

 		kc, err := f.Client()

 		if err != nil {