github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108349 from LastNight1997/optimize-dedup

Browse Source 
optimize dedupCurHistories func in DaemonSetsController
This commit is contained in:
Kubernetes Prow Robot
2024-05-08 15:13:17 -07:00
committed by GitHub
parent 22578c545f 153dca4832
commit de7d9a9897
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/daemon/update.go
View File

@@ -411,11 +411,6 @@ func (dsc *DaemonSetsController) dedupCurHistories(ctx context.Context, ds *apps
maxRevision = cur.Revision maxRevision = cur.Revision
} }
} }
// Clean up duplicates and relabel pods
for _, cur := range curHistories {
if cur.Name == keepCur.Name {
continue
}
// Relabel pods before dedup // Relabel pods before dedup
pods, err := dsc.getDaemonPods(ctx, ds) pods, err := dsc.getDaemonPods(ctx, ds)
if err != nil { if err != nil {
@@ -430,16 +425,21 @@ func (dsc *DaemonSetsController) dedupCurHistories(ctx context.Context, ds *apps
}, },
}, },
} }
patchJson, err := json.Marshal(patchRaw) patchJSON, err := json.Marshal(patchRaw)
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, err = dsc.kubeClient.CoreV1().Pods(ds.Namespace).Patch(ctx, pod.Name, types.MergePatchType, patchJson, metav1.PatchOptions{}) _, err = dsc.kubeClient.CoreV1().Pods(ds.Namespace).Patch(ctx, pod.Name, types.MergePatchType, patchJSON, metav1.PatchOptions{})
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
} }
// Clean up duplicates
for _, cur := range curHistories {
if cur.Name == keepCur.Name {
continue
}
// Remove duplicates // Remove duplicates
err = dsc.kubeClient.AppsV1().ControllerRevisions(ds.Namespace).Delete(ctx, cur.Name, metav1.DeleteOptions{}) err = dsc.kubeClient.AppsV1().ControllerRevisions(ds.Namespace).Delete(ctx, cur.Name, metav1.DeleteOptions{})
if err != nil { if err != nil {