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

Merge pull request #31216 from piosz/e2e-utils-fix 

Automatic merge from submit-queue

Improve ScaleRC function to be more generic

Relaxed the requirement for RC selector.
pull/6/head
Kubernetes Submit Queue 2016-08-23 02:27:16 -07:00 committed by GitHub
parent 6e75fa9745 e8135c30d5
commit 28ded18c4c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/util.go
View File

@ -2974,11 +2974,14 @@ func ScaleRC(c *client.Client, ns, name string, size uint, wait bool) error {
return WaitForRCPodsRunning(c, ns, name)
}
// Wait up to 10 minutes for pods to become Running. Assume that the pods of the
// rc are labels with {"name":rcName}.
// Wait up to 10 minutes for pods to become Running.
func WaitForRCPodsRunning(c *client.Client, ns, rcName string) error {
selector := labels.SelectorFromSet(labels.Set(map[string]string{"name": rcName}))
err := WaitForPodsWithLabelRunning(c, ns, selector)
rc, err := c.ReplicationControllers(ns).Get(rcName)
if err != nil {
return err
}
selector := labels.SelectorFromSet(labels.Set(rc.Spec.Selector))
err = WaitForPodsWithLabelRunning(c, ns, selector)
if err != nil {
return fmt.Errorf("Error while waiting for replication controller %s pods to be running: %v", rcName, err)
}