mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-21 14:21:36 +01:00
Register the scheduler job and fix bugs
1. Register the scheduler job 2. Fix retention bugs Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
parent
2211be7a80
commit
94c1cf8ac9
@ -109,10 +109,10 @@ func main() {
|
||||
log.Fatalf("failed to load config: %v", err)
|
||||
}
|
||||
|
||||
// init the scheduler
|
||||
scheduler.Init()
|
||||
// init the jobservice client
|
||||
job.Init()
|
||||
// init the scheduler
|
||||
scheduler.Init()
|
||||
|
||||
password, err := config.InitialAdminPassword()
|
||||
if err != nil {
|
||||
|
@ -23,6 +23,8 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/goharbor/harbor/src/pkg/scheduler"
|
||||
|
||||
"github.com/goharbor/harbor/src/jobservice/api"
|
||||
"github.com/goharbor/harbor/src/jobservice/common/utils"
|
||||
"github.com/goharbor/harbor/src/jobservice/config"
|
||||
@ -239,12 +241,13 @@ func (bs *Bootstrap) loadAndRunRedisWorkerPool(
|
||||
// Only for debugging and testing purpose
|
||||
job.SampleJob: (*sample.Job)(nil),
|
||||
// Functional jobs
|
||||
job.ImageScanJob: (*scan.ClairJob)(nil),
|
||||
job.ImageScanAllJob: (*scan.All)(nil),
|
||||
job.ImageGC: (*gc.GarbageCollector)(nil),
|
||||
job.Replication: (*replication.Replication)(nil),
|
||||
job.ReplicationScheduler: (*replication.Scheduler)(nil),
|
||||
job.Retention: (*retention.Job)(nil),
|
||||
job.ImageScanJob: (*scan.ClairJob)(nil),
|
||||
job.ImageScanAllJob: (*scan.All)(nil),
|
||||
job.ImageGC: (*gc.GarbageCollector)(nil),
|
||||
job.Replication: (*replication.Replication)(nil),
|
||||
job.ReplicationScheduler: (*replication.Scheduler)(nil),
|
||||
job.Retention: (*retention.Job)(nil),
|
||||
scheduler.JobNameScheduler: (*scheduler.PeriodicJob)(nil),
|
||||
}); err != nil {
|
||||
// exit
|
||||
return nil, err
|
||||
|
@ -91,8 +91,8 @@ type launcher struct {
|
||||
}
|
||||
|
||||
type jobData struct {
|
||||
repository *res.Repository
|
||||
policy *lwp.Metadata
|
||||
repository res.Repository
|
||||
policy lwp.Metadata
|
||||
taskID int64
|
||||
}
|
||||
|
||||
@ -196,8 +196,8 @@ func (l *launcher) Launch(ply *policy.Metadata, executionID int64, isDryRun bool
|
||||
return 0, launcherError(err)
|
||||
}
|
||||
jobDatas = append(jobDatas, &jobData{
|
||||
repository: &repo,
|
||||
policy: p,
|
||||
repository: repo,
|
||||
policy: *p,
|
||||
taskID: taskID,
|
||||
})
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user