fix: Use latest image tag when version is untagged. Fixes #8188 (#…

…8191) Signed-off-by: Alex Collins <[email protected]>
argoproj · Mar 18, 2022 · e2b2883 · e2b2883
1 parent 6d6d23d
commit e2b2883
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/version.go b/version.go
@@ -17,6 +17,15 @@ var (
 	gitTreeState = ""                     // determined from `git status --porcelain`. either 'clean' or 'dirty'
 )
 
+// ImageTag return the image tag.
+// GetVersion().Version adulterates the version making it useless as the image tag.
+func ImageTag() string {
+	if version != "untagged" {
+		return version
+	}
+	return "latest"
+}
+
 // GetVersion returns the version information
 func GetVersion() wfv1.Version {
 	var versionStr string

diff --git a/workflow/controller/config.go b/workflow/controller/config.go
@@ -102,7 +102,7 @@ func (wfc *WorkflowController) executorImage() string {
 	if v := wfc.Config.GetExecutor().Image; v != "" {
 		return v
 	}
-	return fmt.Sprintf("quay.io/argoproj/argoexec:" + argo.GetVersion().Version)
+	return fmt.Sprintf("quay.io/argoproj/argoexec:" + argo.ImageTag())
 }
 
 // executorImagePullPolicy returns the imagePullPolicy to use for the workflow executor