Merge PR #1395: Merge release v1.0.2 commits into release-1.0

This PR merges all commits prepared for the v1.0.2 release into the release-1.0 branch.

Author: dkarpele

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,5 +22,14 @@ Add any other context about the problem here.
 **Version**
 Please tell us about the version you encountered the issue with
 
+**Regression**
+Does this issue apply to (check all that apply):
+
+- [ ] Annotation-based configuration (versions starting with `0`, e.g., `0.17.0`)
+- [ ] CRD-based configuration (versions starting with `1`, e.g., `1.0.0`)
+
+**Latest working version (if applicable)**
+If you are reporting a regression, please specify the last version where this feature worked as expected.
+
 **Logs**
 Please paste any relevant logs here

.github/ISSUE_TEMPLATE/feature_request.md

@@ -16,5 +16,11 @@ A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
+**Version**
+This feature request applies to (check all that apply):
+
+- [ ] Annotation-based configuration (versions starting with `0`, e.g., `0.17.0`)
+- [ ] CRD-based configuration (versions starting with `1`, e.g., `1.0.0`)
+
 **Additional context**
 Add any other context or screenshots about the feature request here.

Makefile

@@ -1,3 +1,4 @@
+IMAGE_UPDATER_CONTROLLER_NAMESPACE?=argocd
 IMAGE_NAMESPACE?=quay.io/argoprojlabs
 IMAGE_NAME=argocd-image-updater
 ifdef IMAGE_NAMESPACE
@@ -196,11 +197,11 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image argocd-image-updater-controller=${IMG}
-	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -n ${IMAGE_UPDATER_CONTROLLER_NAMESPACE} -f -
 
 .PHONY: undeploy
 undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
+	$(KUSTOMIZE) build config/default | $(KUBECTL) delete -n ${IMAGE_UPDATER_CONTROLLER_NAMESPACE} --ignore-not-found=$(ignore-not-found) -f -
 
 ##@ Dependencies
 
@@ -218,7 +219,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.4.3
-CONTROLLER_TOOLS_VERSION ?= v0.16.1
+CONTROLLER_TOOLS_VERSION ?= v0.19.0
 ENVTEST_VERSION ?= release-0.19
 GOLANGCI_LINT_VERSION ?= v2.5.0
 

cmd/run.go

@@ -99,12 +99,16 @@ This enables a CRD-driven approach to automated image updates with Argo CD.
 				WithValues(logrusFieldsToLogrValues(common.ControllerLogFields)...)
 
 			setupLogger.Info("Controller runtime logger initialized.", "setAppLogLevel", cfg.LogLevel)
-			setupLogger.Info("starting",
-				"app", version.BinaryName()+": "+version.Version(),
+			logFields := []interface{}{
+				"app", version.BinaryName() + ": " + version.Version(),
 				"loglevel", strings.ToUpper(cfg.LogLevel),
 				"interval", argocd.GetPrintableInterval(cfg.CheckInterval),
 				"healthPort", probeAddr,
-			)
+			}
+			if cfg.ArgocdNamespace != "" {
+				logFields = append(logFields, "argocdNamespace", cfg.ArgocdNamespace)
+			}
+			setupLogger.Info("starting", logFields...)
 
 			// Create context with signal handling
 			ctx := ctrl.SetupSignalHandler()
@@ -170,6 +174,16 @@ This enables a CRD-driven approach to automated image updates with Argo CD.
 				return err
 			}
 
+			// isLeader is an atomic bool that will be set to true when the controller
+			// becomes the leader.
+			var isLeader atomic.Bool
+
+			// Start a goroutine that sets isLeader to true when leadership is acquired.
+			go func() {
+				<-mgr.Elected()
+				isLeader.Store(true)
+			}()
+
 			// Add the CacheWarmer as a Runnable to the manager.
 			setupLogger.Info("Adding cache warmer to the manager.")
 			warmupState := &WarmupStatus{
@@ -231,11 +245,11 @@ This enables a CRD-driven approach to automated image updates with Argo CD.
 			}
 
 			if err := mgr.AddReadyzCheck("warmup-check", func(req *http.Request) error {
-				if !warmupState.isCacheWarmed.Load() {
-					// If the cache is not yet warmed, the check fails.
+				// If we are the leader, we are ready only if the cache is warmed.
+				if isLeader.Load() && !warmupState.isCacheWarmed.Load() {
 					return fmt.Errorf("cache is not yet warmed")
 				}
-				// Once warmed, the check passes.
+				// If we are not the leader, we are always ready.
 				return nil
 			}); err != nil {
 				setupLogger.Error(err, "unable to set up ready check")
@@ -285,7 +299,7 @@ This enables a CRD-driven approach to automated image updates with Argo CD.
 	controllerCmd.Flags().StringVar(&cfg.RegistriesConf, "registries-conf-path", common.DefaultRegistriesConfPath, "path to registries configuration file")
 	controllerCmd.Flags().IntVar(&cfg.MaxConcurrentApps, "max-concurrent-apps", env.ParseNumFromEnv("MAX_CONCURRENT_APPS", 10, 1, 100), "maximum number of ArgoCD applications that can be updated concurrently (must be >= 1)")
 	controllerCmd.Flags().IntVar(&MaxConcurrentReconciles, "max-concurrent-reconciles", env.ParseNumFromEnv("MAX_CONCURRENT_RECONCILES", 1, 1, 10), "maximum number of concurrent Reconciles which can be run (must be >= 1)")
-	controllerCmd.Flags().StringVar(&cfg.ArgocdNamespace, "argocd-namespace", "", "namespace where ArgoCD runs in (current namespace by default)")
+	controllerCmd.Flags().StringVar(&cfg.ArgocdNamespace, "argocd-namespace", env.GetStringVal("ARGOCD_NAMESPACE", ""), "namespace where ArgoCD runs in (controller namespace by default)")
 	controllerCmd.Flags().BoolVar(&warmUpCache, "warmup-cache", true, "whether to perform a cache warm-up on startup")
 	controllerCmd.Flags().BoolVar(&cfg.DisableKubeEvents, "disable-kube-events", env.GetBoolVal("IMAGE_UPDATER_KUBE_EVENTS", false), "Disable kubernetes events")
 
@@ -420,6 +434,8 @@ func (ws *WebhookServerRunnable) Start(ctx context.Context) error {
 	return ws.webhookServer.Start(ctx)
 }
 
+// NeedLeaderElection tells the manager that this runnable should only be
+// run on the leader replica.
 func (ws *WebhookServerRunnable) NeedLeaderElection() bool {
 	return true
 }

cmd/run_test.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"os"
 	"strconv"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -49,7 +50,7 @@ func TestNewRunCommand(t *testing.T) {
 	asser.Equal(common.DefaultRegistriesConfPath, controllerCommand.Flag("registries-conf-path").Value.String())
 	asser.Equal(strconv.Itoa(env.ParseNumFromEnv("MAX_CONCURRENT_APPS", 10, 1, 100)), controllerCommand.Flag("max-concurrent-apps").Value.String())
 	asser.Equal(strconv.Itoa(env.ParseNumFromEnv("MAX_CONCURRENT_RECONCILES", 1, 1, 10)), controllerCommand.Flag("max-concurrent-reconciles").Value.String())
-	asser.Equal("", controllerCommand.Flag("argocd-namespace").Value.String())
+	asser.Equal(env.GetStringVal("ARGOCD_NAMESPACE", ""), controllerCommand.Flag("argocd-namespace").Value.String())
 	asser.Equal("true", controllerCommand.Flag("warmup-cache").Value.String())
 	asser.Equal(env.GetStringVal("GIT_COMMIT_USER", "argocd-image-updater"), controllerCommand.Flag("git-commit-user").Value.String())
 	asser.Equal(env.GetStringVal("GIT_COMMIT_EMAIL", "noreply@argoproj.io"), controllerCommand.Flag("git-commit-email").Value.String())
@@ -340,3 +341,68 @@ func TestReadyzCheckWithWarmupStatus(t *testing.T) {
 		assert.Equal(t, "cache is not yet warmed", err.Error())
 	})
 }
+
+// Assisted-by: Gemini AI
+// TestLeadershipAwareReadyzCheck verifies the behavior of the leadership-aware readiness probe.
+func TestLeadershipAwareReadyzCheck(t *testing.T) {
+	testCases := []struct {
+		name        string
+		isLeader    bool
+		isWarmed    bool
+		expectError bool
+		errorMsg    string
+	}{
+		{
+			name:        "Leader and not warmed",
+			isLeader:    true,
+			isWarmed:    false,
+			expectError: true,
+			errorMsg:    "cache is not yet warmed",
+		},
+		{
+			name:        "Leader and warmed",
+			isLeader:    true,
+			isWarmed:    true,
+			expectError: false,
+		},
+		{
+			name:        "Not leader and not warmed",
+			isLeader:    false,
+			isWarmed:    false,
+			expectError: false,
+		},
+		{
+			name:        "Not leader and warmed",
+			isLeader:    false,
+			isWarmed:    true,
+			expectError: false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			var isLeader atomic.Bool
+			isLeader.Store(tc.isLeader)
+
+			status := &WarmupStatus{Done: make(chan struct{})}
+			status.isCacheWarmed.Store(tc.isWarmed)
+
+			// This is the readiness check logic from cmd/run.go
+			readinessCheck := func(req *http.Request) error {
+				if isLeader.Load() && !status.isCacheWarmed.Load() {
+					return fmt.Errorf("cache is not yet warmed")
+				}
+				return nil
+			}
+
+			err := readinessCheck(nil)
+
+			if tc.expectError {
+				assert.Error(t, err)
+				assert.Equal(t, tc.errorMsg, err.Error())
+			} else {
+				assert.NoError(t, err)
+			}
+		})
+	}
+}

cmd/webhook.go

@@ -74,7 +74,7 @@ Supported registries:
 	webhookCmd.Flags().StringVar(&cfg.RegistriesConf, "registries-conf-path", common.DefaultRegistriesConfPath, "path to registries configuration file")
 	webhookCmd.Flags().IntVar(&cfg.MaxConcurrentApps, "max-concurrent-apps", env.ParseNumFromEnv("MAX_CONCURRENT_APPS", 10, 1, 100), "maximum number of ArgoCD applications that can be updated concurrently (must be >= 1)")
 	webhookCmd.Flags().IntVar(&MaxConcurrentUpdaters, "max-concurrent-updaters", env.ParseNumFromEnv("MAX_CONCURRENT_UPDATERS", 1, 1, 10), "maximum number of concurrent ImageUpdater CRs that can be processed (must be >= 1)")
-	webhookCmd.Flags().StringVar(&cfg.ArgocdNamespace, "argocd-namespace", "", "namespace where ArgoCD runs in (current namespace by default)")
+	webhookCmd.Flags().StringVar(&cfg.ArgocdNamespace, "argocd-namespace", env.GetStringVal("ARGOCD_NAMESPACE", ""), "namespace where ArgoCD runs in (controller namespace by default)")
 
 	webhookCmd.Flags().StringVar(&cfg.GitCommitUser, "git-commit-user", env.GetStringVal("GIT_COMMIT_USER", "argocd-image-updater"), "Username to use for Git commits")
 	webhookCmd.Flags().StringVar(&cfg.GitCommitMail, "git-commit-email", env.GetStringVal("GIT_COMMIT_EMAIL", "noreply@argoproj.io"), "E-Mail address to use for Git commits")

cmd/webhook_test.go

@@ -29,7 +29,7 @@ func TestNewWebhookCommand(t *testing.T) {
 	asser.Equal(common.DefaultRegistriesConfPath, controllerCommand.Flag("registries-conf-path").Value.String())
 	asser.Equal(strconv.Itoa(env.ParseNumFromEnv("MAX_CONCURRENT_APPS", 10, 1, 100)), controllerCommand.Flag("max-concurrent-apps").Value.String())
 	asser.Equal(strconv.Itoa(env.ParseNumFromEnv("MAX_CONCURRENT_UPDATERS", 1, 1, 10)), controllerCommand.Flag("max-concurrent-updaters").Value.String())
-	asser.Equal("", controllerCommand.Flag("argocd-namespace").Value.String())
+	asser.Equal(env.GetStringVal("ARGOCD_NAMESPACE", ""), controllerCommand.Flag("argocd-namespace").Value.String())
 	asser.Equal(env.GetStringVal("GIT_COMMIT_USER", "argocd-image-updater"), controllerCommand.Flag("git-commit-user").Value.String())
 	asser.Equal(env.GetStringVal("GIT_COMMIT_EMAIL", "noreply@argoproj.io"), controllerCommand.Flag("git-commit-email").Value.String())
 	asser.Equal(env.GetStringVal("GIT_COMMIT_SIGNING_KEY", ""), controllerCommand.Flag("git-commit-signing-key").Value.String())

config/crd/bases/argocd-image-updater.argoproj.io_imageupdaters.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: imageupdaters.argocd-image-updater.argoproj.io
 spec:
   group: argocd-image-updater.argoproj.io

config/default/kustomization.yaml

@@ -1,6 +1,3 @@
-# Adds namespace to all resources.
-namespace: argocd-image-updater-system
-
 # Labels to add to all resources and selectors.
 #labels:
 #- includeSelectors: true

config/default/metrics_service.yaml

@@ -6,7 +6,6 @@ metadata:
     app.kubernetes.io/name: argocd-image-updater
     app.kubernetes.io/managed-by: kustomize
   name: argocd-image-updater-controller-metrics-service
-  namespace: argocd-image-updater-system
 spec:
   ports:
   - name: https