From c0a4549d41d3b53594e0159b235be58697a96f3a Mon Sep 17 00:00:00 2001 From: Andrey Melnikov Date: Tue, 14 Apr 2020 11:38:16 -0700 Subject: [PATCH] fix consistency: updated workflow template labels to use dashes instead of underscores. --- pkg/util/label/label.go | 4 ++-- pkg/workflow_template.go | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/util/label/label.go b/pkg/util/label/label.go index 2a1b466..c03e381 100644 --- a/pkg/util/label/label.go +++ b/pkg/util/label/label.go @@ -7,8 +7,8 @@ import ( const ( OnepanelPrefix = "onepanel.io/" TagPrefix = "tags.onepanel.io/" - WorkflowTemplate = OnepanelPrefix + "workflow_template" - WorkflowTemplateUid = OnepanelPrefix + "workflow_template_uid" + WorkflowTemplate = OnepanelPrefix + "workflow-template" + WorkflowTemplateUid = OnepanelPrefix + "workflow-template-uid" Version = OnepanelPrefix + "version" VersionLatest = OnepanelPrefix + "version-latest" ) diff --git a/pkg/workflow_template.go b/pkg/workflow_template.go index 814438c..76ba347 100644 --- a/pkg/workflow_template.go +++ b/pkg/workflow_template.go @@ -432,7 +432,7 @@ func createArgoWorkflowTemplate(workflowTemplate *WorkflowTemplate, version stri // version "latest" will get the latest version. func (c *Client) getArgoWorkflowTemplate(namespace, workflowTemplateUid, version string) (*v1alpha1.WorkflowTemplate, error) { - labelSelect := fmt.Sprintf("onepanel.io/workflow_template_uid=%v", workflowTemplateUid) + labelSelect := fmt.Sprintf("%v=%v", label.WorkflowTemplateUid, workflowTemplateUid) if version == "latest" { labelSelect += "," + label.VersionLatest + "=true" } else { @@ -459,8 +459,7 @@ func (c *Client) getArgoWorkflowTemplate(namespace, workflowTemplateUid, version } func (c *Client) listArgoWorkflowTemplates(namespace, workflowTemplateUid string) (*[]v1alpha1.WorkflowTemplate, error) { - labelSelect := fmt.Sprintf("onepanel.io/workflow_template_uid=%v", workflowTemplateUid) - + labelSelect := fmt.Sprintf("%v=%v", label.WorkflowTemplateUid, workflowTemplateUid) workflowTemplates, err := c.ArgoprojV1alpha1().WorkflowTemplates(namespace).List(v1.ListOptions{ LabelSelector: labelSelect, })