Merge pull request #43865 from kargakis/deflake-recreate-test

Automatic merge from submit-queue (batch tested with PRs 43133, 43865)

Log replica sets/pods for recreate test

Dumps info for debugging https://github.com/kubernetes/kubernetes/issues/43864
This commit is contained in:
Kubernetes Submit Queue 2017-03-31 03:06:20 -07:00 committed by GitHub
commit e907742d93

View File

@ -3388,6 +3388,13 @@ func WatchRecreateDeployment(c clientset.Interface, d *extensions.Deployment) er
status = d.Status
if d.Status.UpdatedReplicas > 0 && d.Status.Replicas != d.Status.UpdatedReplicas {
_, allOldRSs, err := deploymentutil.GetOldReplicaSets(d, c)
newRS, nerr := deploymentutil.GetNewReplicaSet(d, c)
if err == nil && nerr == nil {
Logf("%+v", d)
logReplicaSetsOfDeployment(d, allOldRSs, newRS)
logPodsOfDeployment(c, d, append(allOldRSs, newRS), false)
}
return false, fmt.Errorf("deployment %q is running new pods alongside old pods: %#v", d.Name, status)
}