fix: Precedence of ContainerRuntimeExecutor and ContainerRuntimeExecutors (argoproj#7056)

Signed-off-by: Saravanan Balasubramanian <[email protected]>

Author: sarabala1979

workflow/controller/controller.go

@@ -1102,13 +1102,13 @@ func (wfc *WorkflowController) GetManagedNamespace() string {
 }
 
 func (wfc *WorkflowController) GetContainerRuntimeExecutor(labels labels.Labels) string {
-	if wfc.containerRuntimeExecutor != "" {
-		return wfc.containerRuntimeExecutor
-	}
 	executor, err := wfc.Config.GetContainerRuntimeExecutor(labels)
 	if err != nil {
 		log.WithError(err).Info("failed to determine container runtime executor")
 	}
+	if executor == "" && wfc.containerRuntimeExecutor != "" {
+		return wfc.containerRuntimeExecutor
+	}
 	return executor
 }
 

workflow/controller/operator_test.go

@@ -21,6 +21,7 @@ import (
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes/fake"
@@ -7413,6 +7414,26 @@ func TestBuildRetryStrategyLocalScope(t *testing.T) {
 	assert.Equal(t, "6", localScope[common.LocalVarRetriesLastDuration])
 }
 
+func TestGetContainerRuntimeExecutor(t *testing.T) {
+	cancel, controller := newController()
+	defer cancel()
+	controller.Config.ContainerRuntimeExecutor = "pns"
+	controller.Config.ContainerRuntimeExecutors = config.ContainerRuntimeExecutors{
+		{
+			Name: "emissary",
+			Selector: metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"workflows.argoproj.io/container-runtime-executor": "emissary",
+				},
+			},
+		},
+	}
+	executor := controller.GetContainerRuntimeExecutor(labels.Set{})
+	assert.Equal(t, common.ContainerRuntimeExecutorPNS, executor)
+	executor = controller.GetContainerRuntimeExecutor(labels.Set{"workflows.argoproj.io/container-runtime-executor": "emissary"})
+	assert.Equal(t, common.ContainerRuntimeExecutorEmissary, executor)
+}
+
 var exitHandlerWithRetryNodeParam = `
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow