mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-23 07:11:36 +01:00
fix: sweep executions of image scan job (#18649)
1. Change the SCAN_ALL job execution retain counts from 5 to 1(per current design, only one report be stored for every artifact, so retain latest 1 is enough). 2. Enable the sweep for IMAGE_SCAN job(retain latest 1). Fixes: #18633 Signed-off-by: chlins <chenyuzh@vmware.com>
This commit is contained in:
parent
220383147e
commit
36c2b93fe6
@ -1 +1,7 @@
|
||||
CREATE INDEX IF NOT EXISTS idx_task_extra_attrs_report_uuids ON task USING gin ((extra_attrs::jsonb->'report_uuids'));
|
||||
|
||||
/* Set the vendor_id of IMAGE_SCAN to the artifact id instead of scanner id, which facilitates execution sweep */
|
||||
UPDATE execution SET vendor_id = (extra_attrs -> 'artifact' ->> 'id')::integer
|
||||
WHERE jsonb_path_exists(extra_attrs::jsonb, '$.artifact.id')
|
||||
AND vendor_id IN (SELECT id FROM scanner_registration)
|
||||
AND vendor_type = 'IMAGE_SCAN';
|
@ -294,7 +294,7 @@ func (bc *basicController) Scan(ctx context.Context, artifact *ar.Artifact, opti
|
||||
"name": r.Name,
|
||||
},
|
||||
}
|
||||
executionID, err := bc.execMgr.Create(ctx, job.ImageScanJobVendorType, r.ID, task.ExecutionTriggerManual, extraAttrs)
|
||||
executionID, err := bc.execMgr.Create(ctx, job.ImageScanJobVendorType, artifact.ID, task.ExecutionTriggerManual, extraAttrs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -49,7 +49,8 @@ const (
|
||||
var (
|
||||
// executionSweeperCount stores the count for execution retained
|
||||
executionSweeperCount = map[string]int64{
|
||||
ScanAllVendorType: 5,
|
||||
ImageScanJobVendorType: 1,
|
||||
ScanAllVendorType: 1,
|
||||
PurgeAuditVendorType: 10,
|
||||
ExecSweepVendorType: 10,
|
||||
GarbageCollectionVendorType: 50,
|
||||
|
Loading…
Reference in New Issue
Block a user