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

Added code to pass identifying Workflow labels.

Browse Source 
- CronWorkflow will pass these labels into any Workflow Executions that
are created.
- This means those Workflows will show up under the correct Workflow Template
page.
Fixed some code related to argo update.
This commit is contained in:
Aleksandr Melnikov
2020-04-03 16:52:01 -07:00
parent 9ce6e1f1d8
commit b668b54fd6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cron_workflow.go
View File

@@ -407,6 +407,7 @@ func (c *Client) createCronWorkflow(namespace string, workflowTemplateUid string
// return nil, err // return nil, err
//} //}
cwf.Spec.WorkflowMetadata = &metav1.ObjectMeta{Labels: *opts.Labels}
createdCronWorkflow, err = c.ArgoprojV1alpha1().CronWorkflows(namespace).Create(cwf) createdCronWorkflow, err = c.ArgoprojV1alpha1().CronWorkflows(namespace).Create(cwf)
if err != nil { if err != nil {
return nil, err return nil, err

4
pkg/workflow_execution.go
View File

@@ -256,7 +256,7 @@ func (c *Client) ValidateWorkflowExecution(namespace string, manifest []byte) (e
wftmplGetter := templateresolution.WrapWorkflowTemplateInterface(c.ArgoprojV1alpha1().WorkflowTemplates(namespace)) wftmplGetter := templateresolution.WrapWorkflowTemplateInterface(c.ArgoprojV1alpha1().WorkflowTemplates(namespace))
for _, wf := range workflows { for _, wf := range workflows {
c.injectAutomatedFields(namespace, &wf, &WorkflowExecutionOptions{}) c.injectAutomatedFields(namespace, &wf, &WorkflowExecutionOptions{})
err = validate.ValidateWorkflow(wftmplGetter, &wf, validate.ValidateOpts{}) _, err = validate.ValidateWorkflow(wftmplGetter, &wf, validate.ValidateOpts{})
if err != nil { if err != nil {
return return
} }
@@ -726,7 +726,7 @@ func (c *Client) ResubmitWorkflowExecution(namespace, name string) (workflow *Wo
} }
func (c *Client) ResumeWorkflowExecution(namespace, name string) (workflow *WorkflowExecution, err error) { func (c *Client) ResumeWorkflowExecution(namespace, name string) (workflow *WorkflowExecution, err error) {
err = argoutil.ResumeWorkflow(c.ArgoprojV1alpha1().Workflows(namespace), name) err = argoutil.ResumeWorkflow(c.ArgoprojV1alpha1().Workflows(namespace), name, "")
if err != nil { if err != nil {
return return
} }