fix: Fix supplied global workflow parameters, fixes

[dinever]

Signed-off-by: Peixuan Ding [email protected]

Hi, this PR fixes an issue where supplied workflow parameters are not correctly set in the global parameters. See #7563 for more details.

For example, in the following workflow template, the parameter name is supplied by UI or CLI. However, it will not be set in the global parameters because both valueFrom and value exist at the runtime. The workflow controller only looks for configMapKeyRef when valueFrom is set.

apiVersion: argoproj.io/v1alpha1
kind: WorkflowTemplate
metadata:
  name: workflow-template-whalesay-template
spec:
  arguments:
    parameters:
      - name: name
        valueFrom:
          supplied: {}
  entrypoint: whalesay-template
  templates:
  - name: whalesay-template
    container:
      image: docker/whalesay
      command: [cowsay]
      args: ["{{workflow.parameters.name}}"

Fixes #7563, also relates to #7476

Thanks!

[dinever]

Changed the if/else structure from

if param.ValueFrom != nil {
	if param.ValueFrom.ConfigMapKeyRef != nil {
		// ...
	}
} else {
	woc.globalParams["workflow.parameters."+param.Name] = param.Value.String()
}

to

if param.ValueFrom != nil && param.ValueFrom.ConfigMapKeyRef != nil {
	// ...
} else {
	woc.globalParams["workflow.parameters."+param.Name] = param.Value.String()
}

Similar to ProcessArgs:

argo-workflows/workflow/common/util.go

Lines 141 to 153 in dbb1bcf

	if inParam.ValueFrom != nil && inParam.ValueFrom.ConfigMapKeyRef != nil {
	if configMapInformer != nil {
	cmValue, err := GetConfigMapValue(configMapInformer, namespace, inParam.ValueFrom.ConfigMapKeyRef.Name, inParam.ValueFrom.ConfigMapKeyRef.Key)
	if err != nil {
	return nil, errors.Errorf(errors.CodeBadRequest, "unable to retrieve inputs.parameters.%s from ConfigMap: %s", inParam.Name, err)
	}
	inParam.Value = wfv1.AnyStringPtr(cmValue)
	}
	} else {
	if inParam.Value == nil {
	return nil, errors.Errorf(errors.CodeBadRequest, "inputs.parameters.%s was not supplied", inParam.Name)
	}
	}

[terrytangyuan]

Thanks for the fix!