fix(controller): Global parameter is not getting updated (#6401)

* fix(controller): Global parameter is not getting updated Signed-off-by: Saravanan Balasubramanian <sarabala1979@gmail.com>
argoproj · Jul 23, 2021 · 4da8fd9 · 4da8fd9
1 parent c4bdc21
commit 4da8fd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -3378,7 +3378,13 @@ func (woc *wfOperationCtx) mergedTemplateDefaultsInto(originalTmpl *wfv1.Templat
 }
 
 func (woc *wfOperationCtx) substituteGlobalVariables() error {
-	wfSpec, err := json.Marshal(woc.execWf.Spec)
+	execWfSpec := woc.execWf.Spec
+
+	// To Avoid the stale Global parameter value substitution to templates.
+	// Updated Global parameter values will be substituted in 'executetemplate' for templates.
+	execWfSpec.Templates = nil
+
+	wfSpec, err := json.Marshal(execWfSpec)
 	if err != nil {
 		return err
 	}

diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
@@ -6894,6 +6894,9 @@ func TestSubstituteGlobalVariables(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, woc.execWf)
 	assert.Equal(t, "mutex1", woc.execWf.Spec.Synchronization.Mutex.Name)
+	tempStr, err := json.Marshal(woc.execWf.Spec.Templates)
+	assert.NoError(t, err)
+	assert.Contains(t, string(tempStr), "{{workflow.parameters.message}}")
 }
 
 var wfPending = `