Merge branch 'master' into feat/update-behavior

Author: chansuke

pkg/argocd/update.go

@@ -291,18 +291,7 @@ func UpdateApplication(updateConf *UpdateConfiguration, state *SyncIterationStat
 			continue
 		}
 
-		// If the user has specified digest as update strategy, but the running
-		// image is configured to use a tag and no digest, we need to set an
-		// initial dummy digest, so that tag.Equals() will return false.
-		// TODO: Fix this. This is just a workaround.
-		if vc.Strategy == image.StrategyDigest {
-			if !updateableImage.ImageTag.IsDigest() {
-				log.Tracef("Setting dummy digest for image %s", updateableImage.GetFullNameWithTag())
-				updateableImage.ImageTag.TagDigest = "dummy"
-			}
-		}
-
-		if needsUpdate(updateableImage, applicationImage, latest) {
+		if needsUpdate(updateableImage, applicationImage, latest, vc.Strategy) {
 			appImageWithTag := applicationImage.WithTag(latest)
 			appImageFullNameWithTag := appImageWithTag.GetFullNameWithTag()
 
@@ -406,7 +395,17 @@ func UpdateApplication(updateConf *UpdateConfiguration, state *SyncIterationStat
 	return result
 }
 
-func needsUpdate(updateableImage *image.ContainerImage, applicationImage *image.ContainerImage, latest *tag.ImageTag) bool {
+func needsUpdate(updateableImage *image.ContainerImage, applicationImage *image.ContainerImage, latest *tag.ImageTag, strategy image.UpdateStrategy) bool {
+	if strategy == image.StrategyDigest {
+		if updateableImage.ImageTag == nil {
+			return true
+		}
+		// When using digest strategy, consider the digest even if the current image
+		// was referenced by tag. If either digest is missing or differs, we want an update.
+		if !updateableImage.ImageTag.IsDigest() || updateableImage.ImageTag.TagDigest != latest.TagDigest {
+			return true
+		}
+	}
 	// If the latest tag does not match image's current tag or the kustomize image is different, it means we have an update candidate.
 	return !updateableImage.ImageTag.Equals(latest) || applicationImage.KustomizeImage != nil && applicationImage.DiffersFrom(updateableImage, false)
 }

registry-scanner/pkg/log/log.go

@@ -9,6 +9,7 @@ package log
 // It might seem redundant, but we really want the different output streams.
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -178,6 +179,26 @@ func disableLogColors() bool {
 	return strings.ToLower(os.Getenv("ENABLE_LOG_COLORS")) == "false"
 }
 
+// A private key type is used to prevent collisions with context keys from other packages.
+type loggerKey struct{}
+
+// ContextWithLogger returns a new context.Context that carries the provided logrus Entry.
+// Use this to pass a contextual logger down through a call stack.
+func ContextWithLogger(ctx context.Context, logger *logrus.Entry) context.Context {
+	return context.WithValue(ctx, loggerKey{}, logger)
+}
+
+// LoggerFromContext retrieves the logrus Entry from the context.
+// If no logger is found in the context, it returns the global logger, ensuring
+// that a valid logger is always returned.
+func LoggerFromContext(ctx context.Context) *logrus.Entry {
+	if logger, ok := ctx.Value(loggerKey{}).(*logrus.Entry); ok {
+		return logger
+	}
+	// Fallback to the global logger if none is found in the context.
+	return logrus.NewEntry(Log())
+}
+
 // Initializes the logging subsystem with default values
 func init() {
 	logger = logrus.New()