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

fix consistency: updated workflow template labels to use dashes instead of underscores.

Browse Source
This commit is contained in:
Andrey Melnikov
2020-04-14 11:38:16 -07:00
parent 07a473c0ab
commit c0a4549d41
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/label/label.go
View File

@@ -7,8 +7,8 @@ import (
const ( const (
OnepanelPrefix = "onepanel.io/" OnepanelPrefix = "onepanel.io/"
TagPrefix = "tags.onepanel.io/" TagPrefix = "tags.onepanel.io/"
WorkflowTemplate = OnepanelPrefix + "workflow_template" WorkflowTemplate = OnepanelPrefix + "workflow-template"
WorkflowTemplateUid = OnepanelPrefix + "workflow_template_uid" WorkflowTemplateUid = OnepanelPrefix + "workflow-template-uid"
Version = OnepanelPrefix + "version" Version = OnepanelPrefix + "version"
VersionLatest = OnepanelPrefix + "version-latest" VersionLatest = OnepanelPrefix + "version-latest"
) )

5
pkg/workflow_template.go
View File

@@ -432,7 +432,7 @@ func createArgoWorkflowTemplate(workflowTemplate *WorkflowTemplate, version stri
// version "latest" will get the latest version. // version "latest" will get the latest version.
func (c *Client) getArgoWorkflowTemplate(namespace, workflowTemplateUid, version string) (*v1alpha1.WorkflowTemplate, error) { 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" { if version == "latest" {
labelSelect += "," + label.VersionLatest + "=true" labelSelect += "," + label.VersionLatest + "=true"
} else { } else {
@@ -459,8 +459,7 @@ func (c *Client) getArgoWorkflowTemplate(namespace, workflowTemplateUid, version
} }
func (c *Client) listArgoWorkflowTemplates(namespace, workflowTemplateUid string) (*[]v1alpha1.WorkflowTemplate, error) { 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{ workflowTemplates, err := c.ArgoprojV1alpha1().WorkflowTemplates(namespace).List(v1.ListOptions{
LabelSelector: labelSelect, LabelSelector: labelSelect,
}) })