From 63d4103bb3d75bc8d09c0dd7a9f997a1676a4abb Mon Sep 17 00:00:00 2001 From: RishabhSaini Date: Tue, 25 Mar 2025 13:01:57 -0400 Subject: [PATCH] pinned_image_set: update the status of only the primary pool --- pkg/daemon/pinned_image_set.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/daemon/pinned_image_set.go b/pkg/daemon/pinned_image_set.go index d30fbe6f61..adcab84768 100644 --- a/pkg/daemon/pinned_image_set.go +++ b/pkg/daemon/pinned_image_set.go @@ -220,17 +220,23 @@ func (p *PinnedImageSetManager) sync(key string) error { return nil } + primaryPool, err := helpers.GetPrimaryPoolForNode(p.mcpLister, node) + if err != nil { + klog.Errorf("error getting primary pool for node: %v", node.Name) + return err + } + ctx, cancel := context.WithTimeout(context.Background(), p.prefetchTimeout) // cancel any currently running tasks in the worker pool p.resetWorkload(cancel) - if err := p.updateStatusProgressing(pools); err != nil { + if err := p.updateStatusProgressing([]*mcfgv1.MachineConfigPool{primaryPool}); err != nil { klog.Errorf("failed to update status: %v", err) } if err := p.syncMachineConfigPools(ctx, pools); err != nil { if errors.Is(err, context.DeadlineExceeded) { ctxErr := fmt.Errorf("%w: %v", errRequeueAfterTimeout, p.prefetchTimeout) - if err := p.updateStatusError(pools, ctxErr); err != nil { + if err := p.updateStatusError([]*mcfgv1.MachineConfigPool{primaryPool}, ctxErr); err != nil { klog.Errorf("failed to update status: %v", err) } klog.Info(ctxErr) @@ -238,13 +244,13 @@ func (p *PinnedImageSetManager) sync(key string) error { } klog.Error(err) - if err := p.updateStatusError(pools, err); err != nil { + if err := p.updateStatusError([]*mcfgv1.MachineConfigPool{primaryPool}, err); err != nil { klog.Errorf("failed to update status: %v", err) } return err } - return p.updateStatusProgressingComplete(pools, "All pinned image sets complete") + return p.updateStatusProgressingComplete([]*mcfgv1.MachineConfigPool{primaryPool}, "All pinned image sets complete") } func (p *PinnedImageSetManager) syncMachineConfigPools(ctx context.Context, pools []*mcfgv1.MachineConfigPool) error {