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

Adding a fix for deleting labels from CronWorklows and WorkflowExecutions.

Browse Source 
- WorkflowTemplates appears to be un-affected
This commit is contained in:
Aleksandr Melnikov
2020-04-02 17:16:31 -07:00
parent b32ceca18d
commit f71eb9d6ad
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/workflow_execution.go
View File

@@ -981,15 +981,15 @@ func (c *Client) SetWorkflowExecutionLabels(namespace, name, prefix string, keyV
label.DeleteWithPrefix(wf.Labels, prefix)
}
label.MergeLabelsPrefix(wf.Labels, keyValues, prefix+"/")
label.MergeLabelsPrefix(wf.Labels, keyValues, prefix)
wf, err = c.ArgoprojV1alpha1().Workflows(namespace).Update(wf)
if err != nil {
return nil, err
}
filteredMap := label.FilterByPrefix(prefix+"/", wf.Labels)
filteredMap = label.RemovePrefix(prefix+"/", filteredMap)
filteredMap := label.FilterByPrefix(prefix, wf.Labels)
filteredMap = label.RemovePrefix(prefix, filteredMap)
return filteredMap, nil
}
@@ -1015,15 +1015,15 @@ func (c *Client) SetWorkflowTemplateLabels(namespace, name, prefix string, keyVa
if wf.Labels == nil {
wf.Labels = make(map[string]string)
}
label.MergeLabelsPrefix(wf.Labels, keyValues, prefix+"/")
label.MergeLabelsPrefix(wf.Labels, keyValues, prefix)
wf, err = c.ArgoprojV1alpha1().WorkflowTemplates(namespace).Update(wf)
if err != nil {
return nil, err
}
filteredMap := label.FilterByPrefix(prefix+"/", wf.Labels)
filteredMap = label.RemovePrefix(prefix+"/", filteredMap)
filteredMap := label.FilterByPrefix(prefix, wf.Labels)
filteredMap = label.RemovePrefix(prefix, filteredMap)
return filteredMap, nil
}