zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-16 10:40:38 +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 = ""