Adding a fix for deleting labels from CronWorklows and WorkflowExecutions.

- 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

View File

@@ -532,7 +532,7 @@ func (s *WorkflowServer) AddWorkflowExecutionLabels(ctx context.Context, req *ap
keyValues[item.Key] = item.Value
}
labels, err := client.SetWorkflowExecutionLabels(req.Namespace, req.Name, "tags.onepanel.io", keyValues, false)
labels, err := client.SetWorkflowExecutionLabels(req.Namespace, req.Name, "tags.onepanel.io/", keyValues, false)
if err != nil {
return nil, err
}
@@ -557,7 +557,7 @@ func (s *WorkflowServer) ReplaceWorkflowExecutionLabels(ctx context.Context, req
keyValues[item.Key] = item.Value
}
labels, err := client.SetWorkflowExecutionLabels(req.Namespace, req.Name, "tags.onepanel.io", keyValues, true)
labels, err := client.SetWorkflowExecutionLabels(req.Namespace, req.Name, "tags.onepanel.io/", keyValues, true)
if err != nil {
return nil, err
}
@@ -582,6 +582,16 @@ func (s *WorkflowServer) DeleteWorkflowExecutionLabel(ctx context.Context, req *
return nil, err
}
keyValues := make(map[string]string)
for key, val := range labels {
keyValues[key] = val
}
labels, err = client.SetWorkflowExecutionLabels(req.Namespace, req.Name, "", keyValues, true)
if err != nil {
return nil, err
}
resp := &api.GetLabelsResponse{
Labels: mapToKeyValue(labels),
}
@@ -622,7 +632,7 @@ func (s *WorkflowServer) AddWorkflowTemplateLabels(ctx context.Context, req *api
keyValues[item.Key] = item.Value
}
labels, err := client.SetWorkflowTemplateLabels(req.Namespace, req.Name, "tags.onepanel.io", keyValues, false)
labels, err := client.SetWorkflowTemplateLabels(req.Namespace, req.Name, "tags.onepanel.io/", keyValues, false)
if err != nil {
return nil, err
}
@@ -647,7 +657,7 @@ func (s *WorkflowServer) ReplaceWorkflowTemplateLabels(ctx context.Context, req
keyValues[item.Key] = item.Value
}
labels, err := client.SetWorkflowTemplateLabels(req.Namespace, req.Name, "tags.onepanel.io", keyValues, true)
labels, err := client.SetWorkflowTemplateLabels(req.Namespace, req.Name, "tags.onepanel.io/", keyValues, true)
if err != nil {
return nil, err
}