fix(controller): Force main container name to be "main" as per v3.0. F…

…ixes #6405 (#6408) Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Jul 27, 2021 · adc17ff · adc17ff
1 parent 069816a
commit adc17ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/workflow/controller/workflowpod.go b/workflow/controller/workflowpod.go
@@ -165,7 +165,7 @@ func (woc *wfOperationCtx) createWorkflowPod(ctx context.Context, nodeName strin
 	wfSpec := woc.execWf.Spec.DeepCopy()
 
 	for i, c := range mainCtrs {
-		if c.Name == "" {
+		if c.Name == "" || tmpl.GetType() != wfv1.TemplateTypeContainerSet {
 			c.Name = common.MainContainerName
 		}
 		// Allow customization of main container resources.

diff --git a/workflow/controller/workflowpod_test.go b/workflow/controller/workflowpod_test.go
@@ -580,6 +580,13 @@ func Test_createWorkflowPod_rateLimited(t *testing.T) {
 	}
 }
 
+func Test_createWorkflowPod_containerName(t *testing.T) {
+	woc := newWoc()
+	pod, err := woc.createWorkflowPod(context.Background(), "", []apiv1.Container{{Name: "invalid"}}, &wfv1.Template{}, &createWorkflowPodOpts{})
+	assert.NoError(t, err)
+	assert.Equal(t, common.MainContainerName, pod.Spec.Containers[1].Name)
+}
+
 func Test_createWorkflowPod_emissary(t *testing.T) {
 	t.Run("NoCommand", func(t *testing.T) {
 		woc := newWoc()