- resolve merge conflicts

Signed-off-by: arpechenin <arpechenin@avito.ru>

Author: arpechenin

cmd/workflow-controller/main.go

@@ -46,23 +46,24 @@ const (
 // NewRootCommand returns an new instance of the workflow-controller main entrypoint
 func NewRootCommand() *cobra.Command {
 	var (
-		clientConfig            clientcmd.ClientConfig
-		configMap               string // --configmap
-		executorImage           string // --executor-image
-		executorImagePullPolicy string // --executor-image-pull-policy
-		logLevel                string // --loglevel
-		glogLevel               int    // --gloglevel
-		logFormat               string // --log-format
-		workflowWorkers         int    // --workflow-workers
-		workflowTTLWorkers      int    // --workflow-ttl-workers
-		podCleanupWorkers       int    // --pod-cleanup-workers
-		cronWorkflowWorkers     int    // --cron-workflow-workers
-		workflowArchiveWorkers  int    // --workflow-archive-workers
-		burst                   int
-		qps                     float32
-		namespaced              bool   // --namespaced
-		managedNamespace        string // --managed-namespace
-		executorPlugins         bool
+		clientConfig                 clientcmd.ClientConfig
+		configMap                    string // --configmap
+		executorImage                string // --executor-image
+		executorImagePullPolicy      string // --executor-image-pull-policy
+		logLevel                     string // --loglevel
+		glogLevel                    int    // --gloglevel
+		logFormat                    string // --log-format
+		workflowWorkers              int    // --workflow-workers
+		workflowTTLWorkers           int    // --workflow-ttl-workers
+		podCleanupWorkers            int    // --pod-cleanup-workers
+		cronWorkflowWorkers          int    // --cron-workflow-workers
+		workflowArchiveWorkers       int    // --workflow-archive-workers
+		burst                        int
+		qps                          float32
+		namespaced                   bool   // --namespaced
+		managedNamespace             string // --managed-namespace
+		executorPlugins              bool
+		workflowLevelExecutorPlugins bool
 	)
 
 	command := cobra.Command{