@@ -145,13 +145,11 @@ func (o DeployOptions) RunDeploy() error {

 			return o.kubeClient.ReplicationControllers(namespace).Get(name)

 		},

 		ListDeploymentsForConfigFn: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

-			rcs, err := o.kubeClient.ReplicationControllers(namespace).List(labels.Everything())

+			list, err := o.kubeClient.ReplicationControllers(namespace).List(deployutil.ConfigSelector(configName))

 			if err != nil {

 				return nil, err

 			}

-			return &kapi.ReplicationControllerList{

-				Items: deployutil.ConfigSelector(configName, rcs.Items),

-			}, nil

+			return list, nil

 		},

 		UpdateDeploymentConfigFn: func(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

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

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

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

@@ -83,8 +82,8 @@ func NewDeployer(client kclient.Interface) *Deployer {

 		getDeployment: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return client.ReplicationControllers(namespace).Get(name)

 		},

-		getControllers: func(namespace string) (*kapi.ReplicationControllerList, error) {

-			return client.ReplicationControllers(namespace).List(labels.Everything())

+		getDeployments: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

+			return client.ReplicationControllers(namespace).List(deployutil.ConfigSelector(configName))

 		},

 		scaler: scaler,

 		strategyFor: func(config *deployapi.DeploymentConfig) (strategy.DeploymentStrategy, error) {

@@ -114,8 +113,8 @@ type Deployer struct {

 	strategyFor func(config *deployapi.DeploymentConfig) (strategy.DeploymentStrategy, error)

 	// getDeployment finds the named deployment.

 	getDeployment func(namespace, name string) (*kapi.ReplicationController, error)

-	// getControllers finds all controllers in namespace.

-	getControllers func(namespace string) (*kapi.ReplicationControllerList, error)

+	// getDeployments finds all deployments associated with a config.

+	getDeployments func(namespace, configName string) (*kapi.ReplicationControllerList, error)

 	// scaler is used to scale replication controllers.

 	scaler kubectl.Scaler

 }

@@ -146,14 +145,14 @@ func (d *Deployer) Deploy(namespace, deploymentName string) error {

 		return fmt.Errorf("deployment %s has no desired replica count", deployutil.LabelForDeployment(deployment))

 	}

-	// Find all controllers in order to pick out the deployments.

-	controllers, err := d.getControllers(namespace)

+	// Find all deployments for the config.

+	unsortedDeployments, err := d.getDeployments(namespace, config.Name)

 	if err != nil {

 		return fmt.Errorf("couldn't get controllers in namespace %s: %v", namespace, err)

 	}

+	deployments := unsortedDeployments.Items

-	// Find all deployments sorted by version.

-	deployments := deployutil.ConfigSelector(config.Name, controllers.Items)

+	// Sort all the deployments by version.

 	sort.Sort(deployutil.DeploymentsByLatestVersionDesc(deployments))

 	// Find any last completed deployment.

@@ -23,7 +23,7 @@ func TestDeployer_getDeploymentFail(t *testing.T) {

 		getDeployment: func(namespace, name string) (*kapi.ReplicationController, error) {

 			return nil, fmt.Errorf("get error")

 		},

-		getControllers: func(namespace string) (*kapi.ReplicationControllerList, error) {

+		getDeployments: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 			t.Fatal("unexpected call")

 			return nil, nil

 		},

@@ -144,7 +144,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 			getDeployment: func(namespace, name string) (*kapi.ReplicationController, error) {

 				return to, nil

 			},

-			getControllers: func(namespace string) (*kapi.ReplicationControllerList, error) {

+			getDeployments: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

 				list := &kapi.ReplicationControllerList{}

 				for _, d := range s.deployments {

 					list.Items = append(list.Items, *d)

@@ -52,12 +52,12 @@ func (factory *DeploymentConfigControllerFactory) Create() controller.RunnableCo

 				return factory.KubeClient.ReplicationControllers(namespace).Create(deployment)

 			},

 			listDeploymentsForConfigFunc: func(namespace, configName string) (*kapi.ReplicationControllerList, error) {

-				rcList, err := factory.KubeClient.ReplicationControllers(namespace).List(labels.Everything())

+				sel := deployutil.ConfigSelector(configName)

+				list, err := factory.KubeClient.ReplicationControllers(namespace).List(sel)

 				if err != nil {

 					return nil, err

 				}

-				rcList.Items = deployutil.ConfigSelector(configName, rcList.Items)

-				return rcList, nil

+				return list, nil

 			},

 			updateDeploymentFunc: func(namespace string, deployment *kapi.ReplicationController) (*kapi.ReplicationController, error) {

 				return factory.KubeClient.ReplicationControllers(namespace).Update(deployment)

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

 	kerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

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

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

 	"github.com/golang/glog"

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

@@ -52,7 +51,7 @@ func (reaper *DeploymentConfigReaper) Stop(namespace, name string, gracePeriod *

 	}

 	// Clean up deployments related to the config.

-	rcList, err := reaper.kc.ReplicationControllers(namespace).List(labels.Everything())

+	rcList, err := reaper.kc.ReplicationControllers(namespace).List(util.ConfigSelector(name))

 	if err != nil {

 		return "", err

 	}

@@ -62,7 +61,7 @@ func (reaper *DeploymentConfigReaper) Stop(namespace, name string, gracePeriod *

 	}

 	// If there is neither a config nor any deployments, we can return NotFound.

-	deployments := util.ConfigSelector(name, rcList.Items)

+	deployments := rcList.Items

 	if configNotFound && len(deployments) == 0 {

 		return "", kerrors.NewNotFound("DeploymentConfig", name)

 	}

@@ -109,15 +109,13 @@ func LabelForDeploymentConfig(config *deployapi.DeploymentConfig) string {

 	return fmt.Sprintf("%s/%s:%d", config.Namespace, config.Name, config.LatestVersion)

 }

-// ConfigSelector matches all the deployments of the provided DeploymentConfig

-func ConfigSelector(name string, list []api.ReplicationController) []api.ReplicationController {

-	matches := []api.ReplicationController{}

-	for _, rc := range list {

-		if DeploymentConfigNameFor(&rc) == name {

-			matches = append(matches, rc)

-		}

-	}

-	return matches

+// ConfigSelector returns a label Selector which can be used to find all

+// deployments for a DeploymentConfig.

+//

+// TODO: Using the annotation constant for now since the value is correct

+// but we could consider adding a new constant to the public types.

+func ConfigSelector(name string) labels.Selector {

+	return labels.Set{deployapi.DeploymentConfigAnnotation: name}.AsSelector()

 }

 // DecodeDeploymentConfig decodes a DeploymentConfig from controller using codec. An error is returned

@@ -165,6 +163,10 @@ func MakeDeployment(config *deployapi.DeploymentConfig, codec runtime.Codec) (*a

 	for k, v := range config.Labels {

 		controllerLabels[k] = v

 	}

+	// Correlate the deployment with the config.

+	// TODO: Using the annotation constant for now since the value is correct

+	// but we could consider adding a new constant to the public types.

+	controllerLabels[deployapi.DeploymentConfigAnnotation] = config.Name

 	// Ensure that pods created by this deployment controller can be safely associated back

 	// to the controller, and that multiple deployment controllers for the same config don't

@@ -107,6 +107,10 @@ func TestMakeDeploymentOk(t *testing.T) {

 		t.Fatalf("expected deployment replicas to be 0")

 	}

+	if l, e, a := deployapi.DeploymentConfigAnnotation, config.Name, deployment.Labels[deployapi.DeploymentConfigAnnotation]; e != a {

+		t.Fatalf("expected label %s=%s, got %s", l, e, a)

+	}

+

 	if e, a := config.Name, deployment.Spec.Template.Labels[deployapi.DeploymentConfigLabel]; e != a {

 		t.Fatalf("expected label DeploymentConfigLabel=%s, got %s", e, a)

 	}