zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-11-02 20:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Using GenerateUID to clean up the names.

Browse Source
This commit is contained in:
Aleksandr Melnikov
2020-05-11 16:27:53 -07:00
committed by rushtehrani
parent 184bb1247d
commit 18a795f129
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cron_workflow.go
View File

@@ -38,8 +38,11 @@ func (c *Client) UpdateCronWorkflow(namespace string, name string, cronWorkflow
// TODO: Need to pull system parameters from k8s config/secret here, example: HOST
opts := &WorkflowExecutionOptions{}
re, _ := regexp.Compile(`[^a-zA-Z0-9-]{1,}`)
opts.GenerateName = strings.ToLower(re.ReplaceAllString(workflowTemplate.Name, `-`)) + "-"
opts.GenerateName, err = uid.GenerateUID(workflowTemplate.Name)
if err != nil {
return nil, err
}
opts.GenerateName += "-"
for _, param := range workflow.Parameters {
opts.Parameters = append(opts.Parameters, Parameter{
Name: param.Name,
@@ -228,7 +231,11 @@ func (c *Client) CreateCronWorkflow(namespace string, cronWorkflow *CronWorkflow
cronWorkflow.Name = argoCreatedCronWorkflow.Name
cronWorkflow.CreatedAt = argoCreatedCronWorkflow.CreationTimestamp.UTC()
cronWorkflow.UID = string(argoCreatedCronWorkflow.ObjectMeta.UID)
cronWorkflow.UID, err = uid.GenerateUID(argoCreatedCronWorkflow.Name)
if err != nil {
return nil, err
}
cronWorkflow.WorkflowExecution.WorkflowTemplate = workflowTemplate
// Manifests could get big, don't return them in this case.
cronWorkflow.WorkflowExecution.WorkflowTemplate.Manifest = ""

6
pkg/workflow_execution.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/onepanelio/core/pkg/util/label"
"github.com/onepanelio/core/pkg/util/pagination"
"github.com/onepanelio/core/pkg/util/ptr"
uid2 "github.com/onepanelio/core/pkg/util/uid"
"io"
"io/ioutil"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -248,7 +249,10 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateId uint64, wor
return 0, nil, err
}
uid := wf.Labels[label.WorkflowUid]
uid, err := uid2.GenerateUID(createdWorkflow.Name)
if err != nil {
return 0, nil, err
}
//Create an entry for workflow_executions statistic
//CURL code will hit the API endpoint that will update the db row
newDbId, err = c.insertPreWorkflowExecutionStatistic(namespace, createdWorkflow.Name, workflowTemplateVersionId, createdWorkflow.CreationTimestamp.UTC(), uid, opts.Parameters)