github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

fix a bug that orphan revision cannot be adopted and sts cannot be synced

Browse Source
This commit is contained in:
likakuli
2020-01-03 11:51:26 +08:00
parent 1780792d3c
commit 10864d3366
5 changed files with 137 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/statefulset/stateful_set.go
View File

@@ -311,14 +311,13 @@ func (ssc *StatefulSetController) adoptOrphanRevisions(set *apps.StatefulSet) er
if err != nil {
return err
}
hasOrphans := false
orphanRevisions := make([]*apps.ControllerRevision, 0)
for i := range revisions {
if metav1.GetControllerOf(revisions[i]) == nil {
hasOrphans = true
break
orphanRevisions = append(orphanRevisions, revisions[i])
}
}
if hasOrphans {
if len(orphanRevisions) > 0 {
fresh, err := ssc.kubeClient.AppsV1().StatefulSets(set.Namespace).Get(set.Name, metav1.GetOptions{})
if err != nil {
return err
@@ -326,7 +325,7 @@ func (ssc *StatefulSetController) adoptOrphanRevisions(set *apps.StatefulSet) er
if fresh.UID != set.UID {
return fmt.Errorf("original StatefulSet %v/%v is gone: got uid %v, wanted %v", set.Namespace, set.Name, fresh.UID, set.UID)
}
return ssc.control.AdoptOrphanRevisions(set, revisions)
return ssc.control.AdoptOrphanRevisions(set, orphanRevisions)
}
return nil
}