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

Changed the order of tasks per feedback.

Browse Source 
The new structure is:
 sys-send-status -> service -> virtual service -> main task
If there are multiple sidecars for the same template, they
are displayed next to each other, vertically and in parallel.
This commit is contained in:
Aleksandr Melnikov
2020-11-10 12:13:36 -08:00
parent 5bd7f222cd
commit c699b5b2ba
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/workflow_execution.go
View File

@@ -457,6 +457,7 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
func (c *Client) injectAccessForSidecars(namespace string, wf *wfv1.Workflow) ([]wfv1.Template, error) {
var newTemplateOrder []wfv1.Template
taskSysSendStatusName := "sys-send-status"
for tIdx, t := range wf.Spec.Templates {
//Inject services, virtual routes
for _, s := range t.Sidecars {
@@ -600,22 +601,29 @@ func (c *Client) injectAccessForSidecars(namespace string, wf *wfv1.Workflow) ([
if t2.Name == wf.Spec.Entrypoint {
if t2.DAG != nil {
tasks := wf.Spec.Templates[i2].DAG.Tasks
for it, t := range tasks {
for _, d := range t.Dependencies {
if d == "sys-send-status" {
wf.Spec.Templates[i2].DAG.Tasks[it].Dependencies =
[]string{d, serviceAddTaskName, virtualServiceAddTaskName}
}
t := tasks[0]
sysDepFound := false
for _, d := range t.Dependencies {
if d == taskSysSendStatusName {
sysDepFound = true
wf.Spec.Templates[i2].DAG.Tasks[0].Dependencies =
[]string{virtualServiceAddTaskName}
}
}
if sysDepFound == false {
wf.Spec.Templates[i2].DAG.Tasks[0].Dependencies = append(wf.Spec.Templates[i2].DAG.Tasks[0].Dependencies, virtualServiceAddTaskName)
}
wf.Spec.Templates[i2].DAG.Tasks = append(tasks, []wfv1.DAGTask{
{
Name: serviceAddTaskName,
Template: serviceTemplateNameAdd,
Name: serviceAddTaskName,
Template: serviceTemplateNameAdd,
Dependencies: []string{taskSysSendStatusName},
},
{
Name: virtualServiceAddTaskName,
Template: virtualServiceTemplateNameAdd,
Name: virtualServiceAddTaskName,
Template: virtualServiceTemplateNameAdd,
Dependencies: []string{serviceAddTaskName},
},
}...)
}