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

fix: cron manifest parsing issue

Browse Source
This commit is contained in:
Andrey Melnikov
2020-05-02 17:39:36 -07:00
parent 912c492272
commit 5dfbf98ec4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cron_workflow.go
View File

@@ -174,6 +174,7 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
return nil, err return nil, err
} }
rawCronManifest := cronWorkflow.Manifest
workflowTemplateManifest := workflowTemplate.GetManifestBytes() workflowTemplateManifest := workflowTemplate.GetManifestBytes()
if err := cronWorkflow.AddToManifestSpec("workflowSpec", string(workflowTemplateManifest)); err != nil { if err := cronWorkflow.AddToManifestSpec("workflowSpec", string(workflowTemplateManifest)); err != nil {
@@ -189,7 +190,7 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
var argoCronWorkflow wfv1.CronWorkflow var argoCronWorkflow wfv1.CronWorkflow
var argoCronWorkflowSpec wfv1.CronWorkflowSpec var argoCronWorkflowSpec wfv1.CronWorkflowSpec
if err := yaml.Unmarshal([]byte(cronWorkflow.Manifest), &argoCronWorkflowSpec); err != nil { if err := argojson.UnmarshalStrict([]byte(rawCronManifest), &argoCronWorkflowSpec); err != nil {
return nil, err return nil, err
} }
argoCronWorkflow.Spec = argoCronWorkflowSpec argoCronWorkflow.Spec = argoCronWorkflowSpec