Merge pull request #20765 from janetkuo/remove-podtemplate-key

Auto commit by PR queue bot
2016-02-06 00:44:47 -08:00
parent fe269474ca 38ae5785dc
commit b45a94bc78
23 changed files with 12455 additions and 12668 deletions
--- a/test/e2e/deployment.go
+++ b/test/e2e/deployment.go
@@ -101,7 +101,6 @@ func newDeployment(deploymentName string, replicas int, podLabels map[string]str
 				Type: strategyType,
 			},
 			RevisionHistoryLimit: revisionHistoryLimit,
-			UniqueLabelKey:       extensions.DefaultDeploymentUniqueLabelKey,
 			Template: api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
 					Labels: podLabels,
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -1527,7 +1527,6 @@ func (config *DeploymentConfig) create() error {
 			Selector: map[string]string{
 				"name": config.Name,
 			},
-			UniqueLabelKey: extensions.DefaultDeploymentUniqueLabelKey,
 			Template: api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
 					Labels: map[string]string{"name": config.Name},