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

fix: Cron update params and field types

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

4
pkg/cron_workflow.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/onepanelio/core/pkg/util/pagination"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
"gopkg.in/yaml.v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"regexp"
"strings"
@@ -52,6 +51,7 @@ func (c *Client) UpdateCronWorkflow(namespace string, name string, cronWorkflow
return nil, err
}
rawCronManifest := cronWorkflow.Manifest
workflowTemplateManifest := workflowTemplate.GetManifestBytes()
if err := cronWorkflow.AddToManifestSpec("workflowSpec", string(workflowTemplateManifest)); err != nil {
@@ -65,7 +65,7 @@ func (c *Client) UpdateCronWorkflow(namespace string, name string, cronWorkflow
(*opts.Labels)[workflowTemplateVersionLabelKey] = fmt.Sprint(workflowTemplate.Version)
var argoCronWorkflow wfv1.CronWorkflow
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
}
argoCronWorkflow.Spec = argoCronWorkflowSpec