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

fix: issue where nil param values caused dereference errors

Browse Source
This commit is contained in:
Andrey Melnikov
2020-07-29 22:27:53 -07:00
parent 7e41f5e538
commit 7e63fa28d0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/workflow_execution.go
View File

@@ -184,7 +184,7 @@ func injectContainerResourceQuotas(wf *wfv1.Workflow, template *wfv1.Template, s
parts := strings.Split(strings.Replace(value, "}}", "", -1), ".") parts := strings.Split(strings.Replace(value, "}}", "", -1), ".")
paramName := parts[len(parts)-1] paramName := parts[len(parts)-1]
for _, param := range wf.Spec.Arguments.Parameters { for _, param := range wf.Spec.Arguments.Parameters {
if param.Name == paramName { if param.Name == paramName && param.Value != nil {
value = *param.Value value = *param.Value
break break
} }

4
server/workflow_template_server.go
View File

@@ -18,9 +18,11 @@ func NewWorkflowTemplateServer() *WorkflowTemplateServer {
} }
func apiWorkflowTemplate(wft *v1.WorkflowTemplate) *api.WorkflowTemplate { func apiWorkflowTemplate(wft *v1.WorkflowTemplate) *api.WorkflowTemplate {
var aParams []*api.Parameter var aParams []*api.Parameter
for _, p := range wft.Parameters { for _, p := range wft.Parameters {
if p.Value == nil {
continue
}
ap := api.Parameter{ ap := api.Parameter{
Name: p.Name, Name: p.Name,
Value: *p.Value, Value: *p.Value,