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

Implementing more details for CreateCronWorkflow.

Browse Source 
- Added unmarshalCronWorkflows
- Tweaking how certain parameters are set
- WIP
This commit is contained in:
Aleksandr Melnikov
2020-03-25 16:58:08 -07:00
parent 4d66356c26
commit 9ea94f5bb1
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/cron_workflow.go
View File

@@ -2,9 +2,8 @@ package v1
import (
"fmt"
"github.com/argoproj/argo/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/onepanelio/core/api"
argojson "github.com/argoproj/pkg/json"
"github.com/onepanelio/core/pkg/util"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
@@ -16,6 +15,7 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
//todo get CronWorkflowTemplate?
//todo moving todo
workflow := cronWorkflow.WorkflowExecution
workflowTemplate, err := c.GetWorkflowTemplate(namespace, workflow.WorkflowTemplate.UID, workflow.WorkflowTemplate.Version)
if err != nil {
log.WithFields(log.Fields{
@@ -42,7 +42,7 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
}
(*opts.Labels)[workflowTemplateUIDLabelKey] = workflowTemplate.UID
(*opts.Labels)[workflowTemplateVersionLabelKey] = fmt.Sprint(workflowTemplate.Version)
workflows, err := unmarshalWorkflows([]byte(workflowTemplate.Manifest), true)
createdCronWorkflow, err := unmarshalCronWorkflows([]byte(workflowTemplate.Manifest), true)
if err != nil {
log.WithFields(log.Fields{
"Namespace": namespace,
@@ -52,26 +52,22 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
return nil, err
}
var createdWorkflows []*wfv1.Workflow
for _, wf := range workflows {
createdWorkflow, err := c.createWorkflow(namespace, &wf, opts)
if err != nil {
log.WithFields(log.Fields{
"Namespace": namespace,
"CronWorkflow": cronWorkflow,
"Error": err.Error(),
}).Error("Error parsing workflow.")
return nil, err
}
createdWorkflows = append(createdWorkflows, createdWorkflow)
argoCreatedCronWorkflow, err := c.createCronWorkflow(namespace, &createdCronWorkflow, opts)
if err != nil {
log.WithFields(log.Fields{
"Namespace": namespace,
"CronWorkflow": cronWorkflow,
"Error": err.Error(),
}).Error("Error parsing workflow.")
return nil, err
}
workflow.Name = createdWorkflows[0].Name
workflow.CreatedAt = createdWorkflows[0].CreationTimestamp.UTC()
workflow.UID = string(createdWorkflows[0].ObjectMeta.UID)
workflow.WorkflowTemplate = workflowTemplate
cronWorkflow.Name = argoCreatedCronWorkflow.Name
cronWorkflow.CreatedAt = argoCreatedCronWorkflow.CreationTimestamp.UTC()
cronWorkflow.UID = string(argoCreatedCronWorkflow.ObjectMeta.UID)
cronWorkflow.WorkflowExecution.WorkflowTemplate = workflowTemplate
// Manifests could get big, don't return them in this case.
workflow.WorkflowTemplate.Manifest = ""
cronWorkflow.WorkflowExecution.WorkflowTemplate.Manifest = ""
return cronWorkflow, nil
}
@@ -129,3 +125,16 @@ func (c *Client) createCronWorkflow(namespace string, cwf *wfv1.CronWorkflow, op
return
}
func unmarshalCronWorkflows(cwfBytes []byte, strict bool) (cwfs wfv1.CronWorkflow, err error) {
var cwf wfv1.CronWorkflow
var jsonOpts []argojson.JSONOpt
if strict {
jsonOpts = append(jsonOpts, argojson.DisallowUnknownFields)
}
err = argojson.Unmarshal(cwfBytes, &cwf, jsonOpts...)
if err == nil {
return cwf, nil
}
return
}