fix: Default value is ignored when loading params from configmap. Fixes

argoproj#8262 (argoproj#8271)

Signed-off-by: Yuan Tang <[email protected]>

test/e2e/workflow_configmap_substitution_test.go

@@ -138,6 +138,50 @@ spec:
 		WaitForWorkflow(fixtures.ToBeErrored)
 }
 
+func (s *WorkflowConfigMapSelectorSubstitutionSuite) TestDefaultParamValueWhenNotFound() {
+	s.Given().
+		Workflow(`apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: workflow-template-configmapkeyselector-wf-default-param-
+  label:
+    workflows.argoproj.io/test: "true"
+spec:
+  entrypoint: whalesay
+  arguments:
+    parameters:
+    - name: message
+      value: msg
+  templates:
+  - name: whalesay
+    inputs:
+      parameters:
+      - name: message
+        valueFrom:
+          default: "default-val"
+          configMapKeyRef:
+            name: cmref-parameters
+            key: not-existing-key
+    container:
+      image: argoproj/argosay:v2
+      args:
+        - echo
+        - "{{inputs.parameters.message}}"
+`).
+		When().
+		CreateConfigMap(
+			"cmref-parameters",
+			map[string]string{"msg": "hello world"},
+			map[string]string{"workflows.argoproj.io/configmap-type": "Parameter"}).
+		SubmitWorkflow().
+		WaitForWorkflow(fixtures.ToBeSucceeded).
+		DeleteConfigMap("cmref-parameters").
+		Then().
+		ExpectWorkflow(func(t *testing.T, metadata *metav1.ObjectMeta, status *wfv1.WorkflowStatus) {
+			assert.Equal(t, wfv1.WorkflowSucceeded, status.Phase)
+		})
+}
+
 func TestConfigMapKeySelectorSubstitutionSuite(t *testing.T) {
 	suite.Run(t, new(WorkflowConfigMapSelectorSubstitutionSuite))
 }

workflow/common/configmap.go

@@ -5,6 +5,8 @@ import (
 
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
+
+	"github.com/argoproj/argo-workflows/v3/errors"
 )
 
 // GetConfigMapValue retrieves a configmap value
@@ -25,10 +27,10 @@ func GetConfigMapValue(configMapInformer cache.SharedIndexInformer, namespace, n
 		}
 		cmValue, ok := cm.Data[key]
 		if !ok {
-			return "", fmt.Errorf("ConfigMap '%s' does not have the key '%s'", name, key)
+			return "", errors.Errorf(errors.CodeNotFound, "ConfigMap '%s' does not have the key '%s'", name, key)
 		}
 		return cmValue, nil
 	}
-	return "", fmt.Errorf("ConfigMap '%s' does not exist. Please make sure it has the label %s: %s to be detectable by the controller",
+	return "", errors.Errorf(errors.CodeNotFound, "ConfigMap '%s' does not exist. Please make sure it has the label %s: %s to be detectable by the controller",
 		name, LabelKeyConfigMapType, LabelValueTypeConfigMapParameter)
 }

workflow/common/util.go

@@ -151,9 +151,14 @@ func ProcessArgs(tmpl *wfv1.Template, args wfv1.ArgumentsProvider, globalParams,
 
 				cmValue, err := GetConfigMapValue(configMapInformer, namespace, cmName, cmKey)
 				if err != nil {
-					return nil, errors.Errorf(errors.CodeBadRequest, "unable to retrieve inputs.parameters.%s from ConfigMap: %s", inParam.Name, err)
+					if inParam.ValueFrom.Default != nil && errors.IsCode(errors.CodeNotFound, err) {
+						inParam.Value = inParam.ValueFrom.Default
+					} else {
+						return nil, errors.Errorf(errors.CodeBadRequest, "unable to retrieve inputs.parameters.%s from ConfigMap: %s", inParam.Name, err)
+					}
+				} else {
+					inParam.Value = wfv1.AnyStringPtr(cmValue)
 				}
-				inParam.Value = wfv1.AnyStringPtr(cmValue)
 			}
 		} else {
 			if inParam.Value == nil {