github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2010 from brendandburns/fix 

Fix the e2e tests and kubecfg given recent additional validation.
pull/6/head
Joe Beda 2014-10-27 13:43:13 -07:00
parent b965e85b7e df3dd288f2
commit fca05982fc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/e2e-suite/update.sh
View File

@ -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"

4
pkg/kubecfg/kubecfg.go
View File

@ -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,
},
},
},