Fix the e2e tests and kubecfg given recent additional validation.

duda · Oct 27, 2014 · df3dd28 · df3dd28
1 parent 019170e
commit df3dd28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hack/e2e-suite/update.sh b/hack/e2e-suite/update.sh
@@ -38,7 +38,7 @@ function validate() {
     sleep 2
 
     local pod_id_list
-    pod_id_list=($($KUBECFG -template='{{range.Items}}{{.Name}} {{end}}' -l simpleService="${CONTROLLER_NAME}" list pods))
+    pod_id_list=($($KUBECFG -template='{{range.Items}}{{.Name}} {{end}}' -l name="${CONTROLLER_NAME}" list pods))
 
     echo "  ${#pod_id_list[@]} out of ${num_replicas} created"
 

diff --git a/pkg/kubecfg/kubecfg.go b/pkg/kubecfg/kubecfg.go
@@ -254,7 +254,7 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli
 		DesiredState: api.ReplicationControllerState{
 			Replicas: replicas,
 			ReplicaSelector: map[string]string{
-				"simpleService": name,
+				"name": name,
 			},
 			PodTemplate: api.PodTemplate{
 				DesiredState: api.PodState{
@@ -270,7 +270,7 @@ func RunController(ctx api.Context, image, name string, replicas int, client cli
 					},
 				},
 				Labels: map[string]string{
-					"simpleService": name,
+					"name": name,
 				},
 			},
 		},