some refactoring and cleanup

2026-08-23 22:16:45 +00:00 · 2026-07-15 12:33:40 +05:00
parent e9e09e8900
commit 6195dd91e1
12 changed files with 263 additions and 151 deletions
@@ -0,0 +1,115 @@
+package flags
+
+import (
+	"fmt"
+	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"github.com/stakater/Reloader/test/e2e/utils"
+)
+
+var _ = Describe("Watch Namespaces (scoped mode) Flag Tests", Serial, func() {
+	var (
+		deploymentName string
+		configMapName  string
+		watchedNS      string
+		unwatchedNS    string
+		adapter        *utils.DeploymentAdapter
+	)
+
+	BeforeEach(func() {
+		deploymentName = utils.RandName("deploy")
+		configMapName = utils.RandName("cm")
+		watchedNS = "watched-" + utils.RandName("ns")
+		unwatchedNS = "unwatched-" + utils.RandName("ns")
+		adapter = utils.NewDeploymentAdapter(kubeClient)
+
+		// The watched namespace must exist before install: in scoped mode the
+		// chart creates a Role/RoleBinding in it.
+		Expect(utils.CreateNamespace(ctx, kubeClient, watchedNS)).To(Succeed())
+		Expect(utils.CreateNamespace(ctx, kubeClient, unwatchedNS)).To(Succeed())
+
+		err := deployReloaderWithFlags(map[string]string{
+			"reloader.watchGlobally": "false",
+			"reloader.namespaces":    fmt.Sprintf("{%s}", watchedNS),
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		Expect(waitForReloaderReady()).To(Succeed())
+	})
+
+	AfterEach(func() {
+		_ = utils.DeleteDeployment(ctx, kubeClient, watchedNS, deploymentName)
+		_ = utils.DeleteConfigMap(ctx, kubeClient, watchedNS, configMapName)
+		_ = utils.DeleteDeployment(ctx, kubeClient, unwatchedNS, deploymentName)
+		_ = utils.DeleteConfigMap(ctx, kubeClient, unwatchedNS, configMapName)
+		_ = undeployReloader()
+		_ = utils.DeleteNamespace(ctx, kubeClient, watchedNS)
+		_ = utils.DeleteNamespace(ctx, kubeClient, unwatchedNS)
+	})
+
+	It("should reload workloads in a watched namespace", func() {
+		By("Creating a ConfigMap in the watched namespace")
+		_, err := utils.CreateConfigMap(ctx, kubeClient, watchedNS, configMapName,
+			map[string]string{"key": "initial"}, nil)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Creating a Deployment in the watched namespace with auto annotation")
+		_, err = utils.CreateDeployment(ctx, kubeClient, watchedNS, deploymentName,
+			utils.WithConfigMapEnvFrom(configMapName),
+			utils.WithAnnotations(utils.BuildAutoTrueAnnotation()),
+		)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Waiting for Deployment to be ready")
+		Expect(adapter.WaitReady(ctx, watchedNS, deploymentName, utils.WorkloadReadyTimeout)).To(Succeed())
+
+		By("Updating the ConfigMap")
+		// Capture the reload-annotation baseline before the trigger to avoid the
+		// TOCTOU race where Reloader reloads before WaitReloaded records its baseline.
+		priorReload, err := adapter.GetPodTemplateAnnotation(ctx, watchedNS, deploymentName, utils.AnnotationLastReloadedFrom)
+		Expect(err).NotTo(HaveOccurred())
+		err = utils.UpdateConfigMap(ctx, kubeClient, watchedNS, configMapName, map[string]string{"key": "updated"})
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Waiting for Deployment to be reloaded (watched namespace should work)")
+		reloaded, err := adapter.WaitReloadedFrom(ctx, watchedNS, deploymentName,
+			utils.AnnotationLastReloadedFrom, priorReload, utils.ReloadTimeout)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(reloaded).To(BeTrue(), "Deployment in a watched namespace should reload")
+	})
+
+	It("should NOT reload workloads in an unwatched namespace", func() {
+		By("Creating a ConfigMap in an unwatched namespace")
+		_, err := utils.CreateConfigMap(ctx, kubeClient, unwatchedNS, configMapName,
+			map[string]string{"key": "initial"}, nil)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Creating a Deployment in an unwatched namespace with auto annotation")
+		_, err = utils.CreateDeployment(ctx, kubeClient, unwatchedNS, deploymentName,
+			utils.WithConfigMapEnvFrom(configMapName),
+			utils.WithAnnotations(utils.BuildAutoTrueAnnotation()),
+		)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Waiting for Deployment to be ready")
+		Expect(adapter.WaitReady(ctx, unwatchedNS, deploymentName, utils.WorkloadReadyTimeout)).To(Succeed())
+
+		By("Updating the ConfigMap in the unwatched namespace")
+		// Capture the reload-annotation baseline before the trigger to avoid the
+		// TOCTOU race where Reloader reloads before WaitReloaded records its baseline.
+		priorReload, err := adapter.GetPodTemplateAnnotation(ctx, unwatchedNS, deploymentName, utils.AnnotationLastReloadedFrom)
+		Expect(err).NotTo(HaveOccurred())
+		err = utils.UpdateConfigMap(ctx, kubeClient, unwatchedNS, configMapName, map[string]string{"key": "updated"})
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Verifying Deployment was NOT reloaded (namespace not in --namespaces)")
+		time.Sleep(utils.NegativeTestWait)
+		reloaded, err := adapter.WaitReloadedFrom(ctx, unwatchedNS, deploymentName,
+			utils.AnnotationLastReloadedFrom, priorReload, utils.ShortTimeout)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(reloaded).To(BeFalse(), "Deployment in an unwatched namespace should NOT reload")
+	})
+})