Merge pull request #6616 from brendandburns/default

Default replica controller selector and labels using pod template.

pkg/registry/controller/etcd/etcd_test.go

@@ -139,9 +139,7 @@ func TestEtcdCreateControllerValidates(t *testing.T) {
 	storage, _ := newStorage(t)
 	emptyName := validController
 	emptyName.Name = ""
-	emptySelector := validController
-	emptySelector.Spec.Selector = map[string]string{}
-	failureCases := []api.ReplicationController{emptyName, emptySelector}
+	failureCases := []api.ReplicationController{emptyName}
 	for _, failureCase := range failureCases {
 		c, err := storage.Create(ctx, &failureCase)
 		if c != nil {