fix: remove non-transient logs on missing artifact-repo configmaps

Fixes #9085 by eliminating log-messages for override ConfigMaps which do not have to exist. Signed-off-by: Thor K. Høgås <[email protected]>
argoproj · Aug 30, 2024 · 75edb7a · 75edb7a
1 parent 3d41fb2
commit 75edb7a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/util/errors/errors.go b/util/errors/errors.go
@@ -23,12 +23,31 @@ func IgnoreContainerNotFoundErr(err error) error {
 	return err
 }
 
+// IsTransientErr reports whether the error is transient and logs it.
 func IsTransientErr(err error) bool {
+	isTransient := IsTransientErrQuiet(err)
+	if !isTransient {
+		log.Warnf("Non-transient error: %v", err)
+	}
+	return isTransient
+}
+
+// IsTransientErrQuiet reports whether the error is transient and logs only if it is.
+func IsTransientErrQuiet(err error) bool {
+	isTransient := isTransientErr(err)
+	if isTransient {
+		log.Infof("Transient error: %v", err)
+	}
+	return isTransient
+}
+
+// isTransientErr reports whether the error is transient.
+func isTransientErr(err error) bool {
 	if err == nil {
 		return false
 	}
 	err = argoerrs.Cause(err)
-	isTransient := isExceededQuotaErr(err) ||
+	return isExceededQuotaErr(err) ||
 		apierr.IsTooManyRequests(err) ||
 		isResourceQuotaConflictErr(err) ||
 		isResourceQuotaTimeoutErr(err) ||
@@ -39,12 +58,6 @@ func IsTransientErr(err error) bool {
 		matchTransientErrPattern(err) ||
 		errors.Is(err, NewErrTransient("")) ||
 		isTransientSqbErr(err)
-	if isTransient {
-		log.Infof("Transient error: %v", err)
-	} else {
-		log.Warnf("Non-transient error: %v", err)
-	}
-	return isTransient
 }
 
 func matchTransientErrPattern(err error) bool {

diff --git a/workflow/artifactrepositories/artifactrepositories.go b/workflow/artifactrepositories/artifactrepositories.go
@@ -90,7 +90,7 @@ func (s *artifactRepositories) get(ctx context.Context, ref *wfv1.ArtifactReposi
 	err := waitutil.Backoff(retry.DefaultRetry, func() (bool, error) {
 		var err error
 		cm, err = s.kubernetesInterface.CoreV1().ConfigMaps(namespace).Get(ctx, configMap, metav1.GetOptions{})
-		return !errorsutil.IsTransientErr(err), err
+		return !errorsutil.IsTransientErrQuiet(err), err
 	})
 	if err != nil {
 		return nil, err