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

kubectl: return more meaningful timeout errors

pull/6/head
Michail Kargakis 2016-06-08 17:44:38 +02:00
parent a74f700b63
commit c7140b3749
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/kubectl/scale.go
View File

@ -179,8 +179,11 @@ func (scaler *ReplicationControllerScaler) Scale(namespace, name string, newSize
if err != nil { if err != nil {
return err return err
} }
return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.ControllerHasDesiredReplicas(scaler.c, rc))
client.ControllerHasDesiredReplicas(scaler.c, rc)) if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name)
}
return err
} }
return nil return nil
} }
@ -240,8 +243,11 @@ func (scaler *ReplicaSetScaler) Scale(namespace, name string, newSize uint, prec
if err != nil { if err != nil {
return err return err
} }
return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.ReplicaSetHasDesiredReplicas(scaler.c, rs))
client.ReplicaSetHasDesiredReplicas(scaler.c, rs)) if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name)
}
return err
} }
return nil return nil
} }
@ -306,8 +312,11 @@ func (scaler *JobScaler) Scale(namespace, name string, newSize uint, preconditio
if err != nil { if err != nil {
return err return err
} }
return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.JobHasDesiredParallelism(scaler.c, job))
client.JobHasDesiredParallelism(scaler.c, job)) if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name)
}
return err
} }
return nil return nil
} }
@ -370,8 +379,11 @@ func (scaler *DeploymentScaler) Scale(namespace, name string, newSize uint, prec
if err != nil { if err != nil {
return err return err
} }
return wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, err = wait.Poll(waitForReplicas.Interval, waitForReplicas.Timeout, client.DeploymentHasDesiredReplicas(scaler.c, deployment))
client.DeploymentHasDesiredReplicas(scaler.c, deployment)) if err == wait.ErrWaitTimeout {
return fmt.Errorf("timed out waiting for %q to be synced", name)
}
return err
} }
return nil return nil
} }