feat: Use pinned executor version. (#8165)

Signed-off-by: Alex Collins <[email protected]>
argoproj · Mar 17, 2022 · 2b5e4a1 · 2b5e4a1
1 parent 715f6ce
commit 2b5e4a1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 29 deletions.
diff --git a/manifests/base/workflow-controller/workflow-controller-deployment.yaml b/manifests/base/workflow-controller/workflow-controller-deployment.yaml
@@ -25,11 +25,7 @@ spec:
                 - ALL
           command:
             - workflow-controller
-          args:
-            - --configmap
-            - workflow-controller-configmap
-            - --executor-image
-            - quay.io/argoproj/argoexec:latest
+          args: [ ]
           env:
             - name: LEADER_ELECTION_IDENTITY
               valueFrom:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -1093,11 +1093,7 @@ spec:
         app: workflow-controller
     spec:
       containers:
-      - args:
-        - --configmap
-        - workflow-controller-configmap
-        - --executor-image
-        - quay.io/argoproj/argoexec:latest
+      - args: []
         command:
         - workflow-controller
         env:

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -993,10 +993,6 @@ spec:
     spec:
       containers:
       - args:
-        - --configmap
-        - workflow-controller-configmap
-        - --executor-image
-        - quay.io/argoproj/argoexec:latest
         - --namespaced
         command:
         - workflow-controller

diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
@@ -1414,10 +1414,6 @@ spec:
     spec:
       containers:
       - args:
-        - --configmap
-        - workflow-controller-configmap
-        - --executor-image
-        - quay.io/argoproj/argoexec:latest
         - --namespaced
         command:
         - workflow-controller

diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
@@ -1503,10 +1503,6 @@ spec:
     spec:
       containers:
       - args:
-        - --configmap
-        - workflow-controller-configmap
-        - --executor-image
-        - quay.io/argoproj/argoexec:latest
         - --namespaced
         command:
         - workflow-controller

diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
@@ -1495,10 +1495,6 @@ spec:
     spec:
       containers:
       - args:
-        - --configmap
-        - workflow-controller-configmap
-        - --executor-image
-        - quay.io/argoproj/argoexec:latest
         - --namespaced
         command:
         - workflow-controller

diff --git a/test/e2e/manifests/stress/workflow-controller-deployment.yaml b/test/e2e/manifests/stress/workflow-controller-deployment.yaml
@@ -10,8 +10,6 @@ spec:
         - name: workflow-controller
           args:
             - --loglevel=warn
-            - --configmap=workflow-controller-configmap
-            - --executor-image=argoproj/argoexec:latest
             - --namespaced
             - --burst=2048
             - --qps=512

diff --git a/workflow/controller/config.go b/workflow/controller/config.go
@@ -2,13 +2,15 @@ package controller
 
 import (
 	"context"
+	"fmt"
 
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/time/rate"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/yaml"
 
+	"github.com/argoproj/argo-workflows/v3"
 	"github.com/argoproj/argo-workflows/v3/config"
 	"github.com/argoproj/argo-workflows/v3/persist/sqldb"
 	"github.com/argoproj/argo-workflows/v3/util/instanceid"
@@ -80,6 +82,11 @@ func (wfc *WorkflowController) updateConfig(v interface{}) error {
 	wfc.hydrator = hydrator.New(wfc.offloadNodeStatusRepo)
 	wfc.updateEstimatorFactory()
 	wfc.rateLimiter = wfc.newRateLimiter()
+
+	log.WithField("executorImage", wfc.executorImage()).
+		WithField("executorImagePullPolicy", wfc.executorImagePullPolicy()).
+		WithField("managedNamespace", wfc.GetManagedNamespace()).
+		Info()
 	return nil
 }
 
@@ -92,7 +99,10 @@ func (wfc *WorkflowController) executorImage() string {
 	if wfc.cliExecutorImage != "" {
 		return wfc.cliExecutorImage
 	}
-	return wfc.Config.GetExecutor().Image
+	if v := wfc.Config.GetExecutor().Image; v != "" {
+		return v
+	}
+	return fmt.Sprintf("quay.io/argoproj/argoexec:" + argo.GetVersion().Version)
 }
 
 // executorImagePullPolicy returns the imagePullPolicy to use for the workflow executor