github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-14 02:58:47 +00:00
Code Issues Projects Releases Wiki Activity

Check observed generation only after rs template is labeled in addHashKeyToRSAndPods

Browse Source
This commit is contained in:
Janet Kuo
2016-02-23 18:07:04 -08:00
parent 1d1c6f19b4
commit 020ab8813d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/util/deployment/deployment.go
View File

@@ -190,13 +190,13 @@ func addHashKeyToRSAndPods(deployment extensions.Deployment, c clientset.Interfa
if err != nil {
return nil, fmt.Errorf("error updating rs %s pod template label with template hash: %v", updatedRS.Name, err)
}
}
// Make sure rs pod template is updated so that it won't create pods without the new label (orphaned pods).
if updatedRS.Generation > updatedRS.Status.ObservedGeneration {
if err = waitForReplicaSetUpdated(c, updatedRS.Generation, namespace, rs.Name); err != nil {
return nil, fmt.Errorf("error waiting for rs %s generation %d observed by controller: %v", updatedRS.Name, updatedRS.Generation, err)
}
}
}
// 2. Update all pods managed by the rs to have the new hash label, so they will be correctly adopted.
selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector)