zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-04 13:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: updated crons to have a manifest in db

Browse Source
This commit is contained in:
Andrey Melnikov
2020-04-30 14:52:26 -07:00
parent b0571f69c9
commit 1fe4201704
8 changed files with 487 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
server/cron_workflow_server.go
View File

@@ -23,24 +23,9 @@ func apiCronWorkflow(cwf *v1.CronWorkflow) (cronWorkflow *api.CronWorkflow) {
}
cronWorkflow = &api.CronWorkflow{
Name: cwf.Name,
Schedule: cwf.Schedule,
Timezone: cwf.Timezone,
Suspend: cwf.Suspend,
ConcurrencyPolicy: cwf.ConcurrencyPolicy,
Labels: converter.MappingToKeyValue(cwf.Labels),
}
if cwf.StartingDeadlineSeconds != nil {
cronWorkflow.StartingDeadlineSeconds = *cwf.StartingDeadlineSeconds
}
if cwf.SuccessfulJobsHistoryLimit != nil {
cronWorkflow.SuccessfulJobsHistoryLimit = *cwf.SuccessfulJobsHistoryLimit
}
if cwf.FailedJobsHistoryLimit != nil {
cronWorkflow.FailedJobsHistoryLimit = *cwf.FailedJobsHistoryLimit
Name: cwf.Name,
Labels: converter.MappingToKeyValue(cwf.Labels),
Manifest: cwf.Manifest,
}
if cwf.WorkflowExecution != nil {
@@ -78,15 +63,9 @@ func (c *CronWorkflowServer) CreateCronWorkflow(ctx context.Context, req *api.Cr
}
cronWorkflow := v1.CronWorkflow{
Schedule: req.CronWorkflow.Schedule,
Timezone: req.CronWorkflow.Timezone,
Suspend: req.CronWorkflow.Suspend,
ConcurrencyPolicy: req.CronWorkflow.ConcurrencyPolicy,
StartingDeadlineSeconds: &req.CronWorkflow.StartingDeadlineSeconds,
SuccessfulJobsHistoryLimit: &req.CronWorkflow.SuccessfulJobsHistoryLimit,
FailedJobsHistoryLimit: &req.CronWorkflow.FailedJobsHistoryLimit,
WorkflowExecution: workflow,
Labels: converter.APIKeyValueToLabel(req.CronWorkflow.Labels),
WorkflowExecution: workflow,
Manifest: req.CronWorkflow.Manifest,
Labels: converter.APIKeyValueToLabel(req.CronWorkflow.Labels),
}
cwf, err := client.CreateCronWorkflow(req.Namespace, &cronWorkflow)
@@ -117,15 +96,9 @@ func (c *CronWorkflowServer) UpdateCronWorkflow(ctx context.Context, req *api.Up
}
cronWorkflow := v1.CronWorkflow{
Schedule: req.CronWorkflow.Schedule,
Timezone: req.CronWorkflow.Timezone,
Suspend: req.CronWorkflow.Suspend,
ConcurrencyPolicy: req.CronWorkflow.ConcurrencyPolicy,
StartingDeadlineSeconds: &req.CronWorkflow.StartingDeadlineSeconds,
SuccessfulJobsHistoryLimit: &req.CronWorkflow.SuccessfulJobsHistoryLimit,
FailedJobsHistoryLimit: &req.CronWorkflow.FailedJobsHistoryLimit,
WorkflowExecution: workflow,
Labels: converter.APIKeyValueToLabel(req.CronWorkflow.Labels),
WorkflowExecution: workflow,
Manifest: req.CronWorkflow.Manifest,
Labels: converter.APIKeyValueToLabel(req.CronWorkflow.Labels),
}
cwf, err := client.UpdateCronWorkflow(req.Namespace, req.Name, &cronWorkflow)
@@ -159,7 +132,7 @@ func (c *CronWorkflowServer) ListCronWorkflows(ctx context.Context, req *api.Lis
}
paginator := pagination.NewRequest(req.Page, req.PageSize)
cronWorkflows, err := client.ListCronWorkflows(req.Namespace, req.WorkflowTemplateUid, &paginator)
cronWorkflows, err := client.ListCronWorkflows(req.Namespace, req.WorkflowTemplateName, &paginator)
if err != nil {
return nil, err
}
@@ -168,7 +141,7 @@ func (c *CronWorkflowServer) ListCronWorkflows(ctx context.Context, req *api.Lis
apiCronWorkflows = append(apiCronWorkflows, apiCronWorkflow(cwf))
}
count, err := client.CountCronWorkflows(req.Namespace, req.WorkflowTemplateUid)
count, err := client.CountCronWorkflows(req.Namespace, req.WorkflowTemplateName)
if err != nil {
return nil, err
}