From 48729826170621859c21840c7f265f4c505ec773 Mon Sep 17 00:00:00 2001
From: TheiLLeniumStudios
 <104288623+TheiLLeniumStudios@users.noreply.github.com>
Date: Wed, 14 Jan 2026 23:35:29 +0100
Subject: [PATCH] refactor: Move handle watch behavior to separate function

---
 test/e2e/README.md                           |  2 +-
 test/e2e/advanced/job_reload_test.go         | 14 ++--
 test/e2e/advanced/multi_container_test.go    | 12 +--
 test/e2e/advanced/regex_test.go              |  6 +-
 test/e2e/annotations/auto_reload_test.go     | 26 +++----
 test/e2e/annotations/combination_test.go     | 18 ++---
 test/e2e/annotations/exclude_test.go         | 16 ++--
 test/e2e/annotations/pause_period_test.go    |  6 +-
 test/e2e/annotations/resource_ignore_test.go |  4 +-
 test/e2e/annotations/search_match_test.go    | 12 +--
 test/e2e/argo/rollout_test.go                |  4 +-
 test/e2e/core/reference_methods_test.go      | 22 +++---
 test/e2e/core/workloads_test.go              | 80 ++++++++++----------
 test/e2e/csi/csi_test.go                     | 22 +++---
 test/e2e/flags/auto_reload_all_test.go       |  4 +-
 test/e2e/flags/ignore_resources_test.go      |  8 +-
 test/e2e/flags/ignored_workloads_test.go     |  2 +-
 test/e2e/flags/namespace_ignore_test.go      |  4 +-
 test/e2e/flags/namespace_selector_test.go    |  4 +-
 test/e2e/flags/reload_on_create_test.go      |  6 +-
 test/e2e/flags/reload_on_delete_test.go      |  6 +-
 test/e2e/flags/resource_selector_test.go     |  4 +-
 test/e2e/flags/watch_globally_test.go        |  6 +-
 test/e2e/utils/testenv.go                    |  2 +-
 test/e2e/utils/watch.go                      | 22 ++++--
 test/e2e/utils/workload_argo.go              | 16 +---
 test/e2e/utils/workload_cronjob.go           | 15 +---
 test/e2e/utils/workload_daemonset.go         | 11 +--
 test/e2e/utils/workload_deployment.go        | 21 +----
 test/e2e/utils/workload_job.go               | 14 ++--
 test/e2e/utils/workload_openshift.go         | 21 ++---
 test/e2e/utils/workload_statefulset.go       | 11 +--
 32 files changed, 189 insertions(+), 232 deletions(-)

diff --git a/test/e2e/README.md b/test/e2e/README.md
index bc1e929..ef9f2cd 100644
--- a/test/e2e/README.md
+++ b/test/e2e/README.md
@@ -405,7 +405,7 @@ DescribeTable("should reload when ConfigMap changes",
         Expect(err).NotTo(HaveOccurred())
 
         // Wait for ready
-        err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+        err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
         Expect(err).NotTo(HaveOccurred())
 
         // Update ConfigMap
diff --git a/test/e2e/advanced/job_reload_test.go b/test/e2e/advanced/job_reload_test.go
index 4bffebe..465d5b0 100644
--- a/test/e2e/advanced/job_reload_test.go
+++ b/test/e2e/advanced/job_reload_test.go
@@ -52,7 +52,7 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -80,7 +80,7 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
@@ -109,7 +109,7 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -138,7 +138,7 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -168,7 +168,7 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
@@ -215,12 +215,12 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			originalUID := string(job.UID)
 
 			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.DeploymentReady)
+			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForSPC(
-				ctx, csiClient, testNamespace, spcName, utils.DeploymentReady,
+				ctx, csiClient, testNamespace, spcName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("Found SPCPS: %s\n", spcpsName)
diff --git a/test/e2e/advanced/multi_container_test.go b/test/e2e/advanced/multi_container_test.go
index 003fd64..bcba8bd 100644
--- a/test/e2e/advanced/multi_container_test.go
+++ b/test/e2e/advanced/multi_container_test.go
@@ -47,7 +47,7 @@ var _ = Describe("Multi-Container Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -81,7 +81,7 @@ var _ = Describe("Multi-Container Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the first ConfigMap")
@@ -141,11 +141,11 @@ var _ = Describe("Multi-Container Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
@@ -188,11 +188,11 @@ var _ = Describe("Multi-Container Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
diff --git a/test/e2e/advanced/regex_test.go b/test/e2e/advanced/regex_test.go
index c6165e6..989bf0a 100644
--- a/test/e2e/advanced/regex_test.go
+++ b/test/e2e/advanced/regex_test.go
@@ -50,7 +50,7 @@ var _ = Describe("Regex Pattern Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the matching ConfigMap")
@@ -84,7 +84,7 @@ var _ = Describe("Regex Pattern Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-matching ConfigMap")
@@ -117,7 +117,7 @@ var _ = Describe("Regex Pattern Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the matching Secret")
diff --git a/test/e2e/annotations/auto_reload_test.go b/test/e2e/annotations/auto_reload_test.go
index e0465cd..9acb96c 100644
--- a/test/e2e/annotations/auto_reload_test.go
+++ b/test/e2e/annotations/auto_reload_test.go
@@ -54,7 +54,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -82,7 +82,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
@@ -115,7 +115,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -145,7 +145,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -181,7 +181,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -216,7 +216,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
@@ -259,11 +259,11 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("Found SPCPS: %s\n", spcpsName)
 
@@ -312,11 +312,11 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap (should NOT trigger reload with SPC auto only)")
@@ -367,11 +367,11 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
@@ -420,7 +420,7 @@ var _ = Describe("Auto Reload Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the second ConfigMap (auto-detected)")
diff --git a/test/e2e/annotations/combination_test.go b/test/e2e/annotations/combination_test.go
index 4517a79..b27c797 100644
--- a/test/e2e/annotations/combination_test.go
+++ b/test/e2e/annotations/combination_test.go
@@ -57,7 +57,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the auto-detected ConfigMap")
@@ -91,7 +91,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the explicitly listed ConfigMap (not mounted)")
@@ -125,7 +125,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the explicitly listed Secret")
@@ -162,7 +162,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded ConfigMap")
@@ -198,7 +198,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded ConfigMap")
@@ -233,7 +233,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded Secret")
@@ -266,7 +266,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the second ConfigMap")
@@ -296,7 +296,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the first Secret")
@@ -329,7 +329,7 @@ var _ = Describe("Combination Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
diff --git a/test/e2e/annotations/exclude_test.go b/test/e2e/annotations/exclude_test.go
index 3b0f1e5..ab9a610 100644
--- a/test/e2e/annotations/exclude_test.go
+++ b/test/e2e/annotations/exclude_test.go
@@ -62,7 +62,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded ConfigMap")
@@ -99,7 +99,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded ConfigMap")
@@ -137,7 +137,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the excluded Secret")
@@ -174,7 +174,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the non-excluded Secret")
@@ -221,7 +221,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the excluded ConfigMap")
@@ -292,11 +292,11 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady)
+			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
@@ -352,7 +352,7 @@ var _ = Describe("Exclude Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS for non-excluded SPC")
diff --git a/test/e2e/annotations/pause_period_test.go b/test/e2e/annotations/pause_period_test.go
index f1aa17b..f49d543 100644
--- a/test/e2e/annotations/pause_period_test.go
+++ b/test/e2e/annotations/pause_period_test.go
@@ -45,7 +45,7 @@ var _ = Describe("Pause Period Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -79,7 +79,7 @@ var _ = Describe("Pause Period Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -119,7 +119,7 @@ var _ = Describe("Pause Period Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
diff --git a/test/e2e/annotations/resource_ignore_test.go b/test/e2e/annotations/resource_ignore_test.go
index 8a9c163..132c91a 100644
--- a/test/e2e/annotations/resource_ignore_test.go
+++ b/test/e2e/annotations/resource_ignore_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Resource Ignore Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -76,7 +76,7 @@ var _ = Describe("Resource Ignore Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
diff --git a/test/e2e/annotations/search_match_test.go b/test/e2e/annotations/search_match_test.go
index a96f6c3..1000d50 100644
--- a/test/e2e/annotations/search_match_test.go
+++ b/test/e2e/annotations/search_match_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -74,7 +74,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -104,7 +104,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -146,9 +146,9 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for both Deployments to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName2, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName2, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -195,7 +195,7 @@ var _ = Describe("Search and Match Annotation Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
diff --git a/test/e2e/argo/rollout_test.go b/test/e2e/argo/rollout_test.go
index 65e0801..6e78136 100644
--- a/test/e2e/argo/rollout_test.go
+++ b/test/e2e/argo/rollout_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Argo Rollout Strategy Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Rollout to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, rolloutName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, rolloutName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -76,7 +76,7 @@ var _ = Describe("Argo Rollout Strategy Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Rollout to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, rolloutName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, rolloutName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/core/reference_methods_test.go b/test/e2e/core/reference_methods_test.go
index d717310..f3c0b8f 100644
--- a/test/e2e/core/reference_methods_test.go
+++ b/test/e2e/core/reference_methods_test.go
@@ -55,7 +55,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
@@ -104,7 +104,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -151,7 +151,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
@@ -193,7 +193,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -243,7 +243,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
@@ -293,7 +293,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -340,7 +340,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
@@ -382,7 +382,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -426,7 +426,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
@@ -468,7 +468,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -517,7 +517,7 @@ var _ = Describe("Reference Method Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap")
diff --git a/test/e2e/core/workloads_test.go b/test/e2e/core/workloads_test.go
index 39dd2c7..f51ba78 100644
--- a/test/e2e/core/workloads_test.go
+++ b/test/e2e/core/workloads_test.go
@@ -69,7 +69,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -110,7 +110,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
@@ -163,12 +163,12 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-				utils.DeploymentReady)
+				utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("Found SPCPS: %s\n", spcpsName)
 
@@ -221,7 +221,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap data")
@@ -263,7 +263,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the ConfigMap labels (no data change)")
@@ -305,7 +305,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the Secret labels (no data change)")
@@ -359,12 +359,12 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Finding the SPCPS created by CSI driver")
 				spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-					utils.DeploymentReady)
+					utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the SPCPS labels (no objects change)")
@@ -496,7 +496,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -536,7 +536,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
@@ -576,7 +576,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -627,7 +627,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for Deployment to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the second ConfigMap")
@@ -667,7 +667,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for Deployment to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the second Secret")
@@ -700,7 +700,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for Deployment to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("First update to ConfigMap")
@@ -759,7 +759,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for Deployment to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the Secret")
@@ -792,7 +792,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for Deployment to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating the ConfigMap data")
@@ -837,7 +837,7 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Updating the ConfigMap")
@@ -878,7 +878,7 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Updating the Secret")
@@ -919,7 +919,7 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Updating the ConfigMap")
@@ -971,12 +971,12 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Finding the SPCPS created by CSI driver")
 					spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace,
-						workloadName, utils.DeploymentReady)
+						workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Getting initial SPCPS version")
@@ -1037,12 +1037,12 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Finding the SPCPS created by CSI driver")
 					spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace,
-						workloadName, utils.DeploymentReady)
+						workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Getting initial SPCPS version")
@@ -1093,7 +1093,7 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Updating the ConfigMap")
@@ -1138,7 +1138,7 @@ var _ = Describe("Workload Reload Tests", func() {
 					DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 					By("Waiting for workload to be ready")
-					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+					err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 					Expect(err).NotTo(HaveOccurred())
 
 					By("Updating the Secret (not the ConfigMap)")
@@ -1224,7 +1224,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap data")
@@ -1268,7 +1268,7 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for workload to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret data")
@@ -1325,12 +1325,12 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Finding the SPCPS created by CSI driver")
 				spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-					utils.DeploymentReady)
+					utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Getting initial SPCPS version")
@@ -1384,7 +1384,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the ConfigMap labels")
@@ -1428,7 +1428,7 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the Secret labels")
@@ -1484,12 +1484,12 @@ var _ = Describe("Workload Reload Tests", func() {
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 				By("Waiting for workload to be ready")
-				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+				err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Finding the SPCPS created by CSI driver")
 				spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-					utils.DeploymentReady)
+					utils.WorkloadReadyTimeout)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Updating only the SPCPS labels (should NOT trigger reload)")
@@ -1540,12 +1540,12 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-				utils.DeploymentReady)
+				utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
@@ -1600,12 +1600,12 @@ var _ = Describe("Workload Reload Tests", func() {
 			DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-				utils.DeploymentReady)
+				utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
@@ -1657,12 +1657,12 @@ var _ = Describe("Workload Reload Tests", func() {
 			adapter := utils.NewDeploymentAdapter(kubeClient)
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, workloadName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, workloadName,
-				utils.DeploymentReady)
+				utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting initial SPCPS version")
diff --git a/test/e2e/csi/csi_test.go b/test/e2e/csi/csi_test.go
index 192a6e5..ef22491 100644
--- a/test/e2e/csi/csi_test.go
+++ b/test/e2e/csi/csi_test.go
@@ -59,12 +59,12 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS created by CSI driver")
 			spcpsName, err := utils.FindSPCPSForDeployment(
-				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady,
+				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("Found SPCPS: %s\n", spcpsName)
@@ -116,12 +116,12 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the SPCPS")
 			spcpsName, err := utils.FindSPCPSForDeployment(
-				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady,
+				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -150,12 +150,12 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(firstReloadValue).NotTo(BeEmpty())
 
 			By("Waiting for Deployment to stabilize")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Finding the NEW SPCPS after first reload (new pod = new SPCPS)")
 			newSpcpsName, err := utils.FindSPCPSForDeployment(
-				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady,
+				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("New SPCPS after first reload: %s\n", newSpcpsName)
@@ -207,7 +207,7 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap (should NOT trigger reload)")
@@ -226,7 +226,7 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 
 			By("Finding the SPCPS")
 			spcpsName, err := utils.FindSPCPSForDeployment(
-				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady,
+				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 
@@ -281,7 +281,7 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap (should trigger reload with auto=true)")
@@ -298,7 +298,7 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 			Expect(reloaded).To(BeTrue(), "Combined auto=true should trigger reload for ConfigMap changes")
 
 			By("Waiting for Deployment to stabilize")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Getting current annotation value")
@@ -308,7 +308,7 @@ var _ = Describe("CSI SecretProviderClass Tests", Label("csi"), func() {
 
 			By("Finding the NEW SPCPS after ConfigMap reload (new pod = new SPCPS)")
 			newSpcpsName, err := utils.FindSPCPSForDeployment(
-				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.DeploymentReady,
+				ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout,
 			)
 			Expect(err).NotTo(HaveOccurred())
 			GinkgoWriter.Printf("New SPCPS after ConfigMap reload: %s\n", newSpcpsName)
diff --git a/test/e2e/flags/auto_reload_all_test.go b/test/e2e/flags/auto_reload_all_test.go
index 3f94166..39ccb49 100644
--- a/test/e2e/flags/auto_reload_all_test.go
+++ b/test/e2e/flags/auto_reload_all_test.go
@@ -61,7 +61,7 @@ var _ = Describe("Auto Reload All Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, autoNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, autoNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -89,7 +89,7 @@ var _ = Describe("Auto Reload All Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, autoNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, autoNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/flags/ignore_resources_test.go b/test/e2e/flags/ignore_resources_test.go
index 330804c..70d0686 100644
--- a/test/e2e/flags/ignore_resources_test.go
+++ b/test/e2e/flags/ignore_resources_test.go
@@ -67,7 +67,7 @@ var _ = Describe("Ignore Resources Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
@@ -96,7 +96,7 @@ var _ = Describe("Ignore Resources Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -146,7 +146,7 @@ var _ = Describe("Ignore Resources Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -175,7 +175,7 @@ var _ = Describe("Ignore Resources Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, ignoreNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the Secret")
diff --git a/test/e2e/flags/ignored_workloads_test.go b/test/e2e/flags/ignored_workloads_test.go
index f704897..90d768d 100644
--- a/test/e2e/flags/ignored_workloads_test.go
+++ b/test/e2e/flags/ignored_workloads_test.go
@@ -96,7 +96,7 @@ var _ = Describe("Ignored Workloads Flag Tests", func() {
 			}()
 
 			By("Waiting for Deployment to be ready")
-			err = deploymentAdater.WaitReady(ctx, ignoreNS, deploymentName, utils.DeploymentReady)
+			err = deploymentAdater.WaitReady(ctx, ignoreNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/flags/namespace_ignore_test.go b/test/e2e/flags/namespace_ignore_test.go
index d653fbc..5fd2caa 100644
--- a/test/e2e/flags/namespace_ignore_test.go
+++ b/test/e2e/flags/namespace_ignore_test.go
@@ -69,7 +69,7 @@ var _ = Describe("Namespace Ignore Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, ignoredNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, ignoredNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -98,7 +98,7 @@ var _ = Describe("Namespace Ignore Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, watchedNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, watchedNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/flags/namespace_selector_test.go b/test/e2e/flags/namespace_selector_test.go
index c4acdff..da34927 100644
--- a/test/e2e/flags/namespace_selector_test.go
+++ b/test/e2e/flags/namespace_selector_test.go
@@ -70,7 +70,7 @@ var _ = Describe("Namespace Selector Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, matchingNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, matchingNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -98,7 +98,7 @@ var _ = Describe("Namespace Selector Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, nonMatchingNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, nonMatchingNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/flags/reload_on_create_test.go b/test/e2e/flags/reload_on_create_test.go
index bfdadb9..2ab6d58 100644
--- a/test/e2e/flags/reload_on_create_test.go
+++ b/test/e2e/flags/reload_on_create_test.go
@@ -58,7 +58,7 @@ var _ = Describe("Reload On Create Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating the ConfigMap that the Deployment references")
@@ -84,7 +84,7 @@ var _ = Describe("Reload On Create Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating the Secret that the Deployment references")
@@ -127,7 +127,7 @@ var _ = Describe("Reload On Create Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, createNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating the ConfigMap that the Deployment references")
diff --git a/test/e2e/flags/reload_on_delete_test.go b/test/e2e/flags/reload_on_delete_test.go
index 12c86d3..5ac3fce 100644
--- a/test/e2e/flags/reload_on_delete_test.go
+++ b/test/e2e/flags/reload_on_delete_test.go
@@ -63,7 +63,7 @@ var _ = Describe("Reload On Delete Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Deleting the ConfigMap")
@@ -92,7 +92,7 @@ var _ = Describe("Reload On Delete Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Deleting the Secret")
@@ -139,7 +139,7 @@ var _ = Describe("Reload On Delete Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, deleteNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Deleting the ConfigMap")
diff --git a/test/e2e/flags/resource_selector_test.go b/test/e2e/flags/resource_selector_test.go
index 2bd73f3..8d07136 100644
--- a/test/e2e/flags/resource_selector_test.go
+++ b/test/e2e/flags/resource_selector_test.go
@@ -68,7 +68,7 @@ var _ = Describe("Resource Label Selector Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, resourceNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, resourceNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the labeled ConfigMap")
@@ -96,7 +96,7 @@ var _ = Describe("Resource Label Selector Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, resourceNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, resourceNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the unlabeled ConfigMap")
diff --git a/test/e2e/flags/watch_globally_test.go b/test/e2e/flags/watch_globally_test.go
index e9d45fe..a2c655c 100644
--- a/test/e2e/flags/watch_globally_test.go
+++ b/test/e2e/flags/watch_globally_test.go
@@ -68,7 +68,7 @@ var _ = Describe("Watch Globally Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
@@ -96,7 +96,7 @@ var _ = Describe("Watch Globally Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, otherNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, otherNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap in the other namespace")
@@ -153,7 +153,7 @@ var _ = Describe("Watch Globally Flag Tests", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, globalNS, deploymentName, utils.DeploymentReady)
+			err = adapter.WaitReady(ctx, globalNS, deploymentName, utils.WorkloadReadyTimeout)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Updating the ConfigMap")
diff --git a/test/e2e/utils/testenv.go b/test/e2e/utils/testenv.go
index c1e28b5..b9d5dd1 100644
--- a/test/e2e/utils/testenv.go
+++ b/test/e2e/utils/testenv.go
@@ -159,7 +159,7 @@ func (e *TestEnvironment) DeployReloaderWithValues(values map[string]string) err
 func (e *TestEnvironment) WaitForReloader() error {
 	ginkgo.GinkgoWriter.Println("Waiting for Reloader to be ready...")
 	adapter := NewDeploymentAdapter(e.KubeClient)
-	return adapter.WaitReady(e.Ctx, e.Namespace, ReloaderDeploymentName(e.ReleaseName), DeploymentReady)
+	return adapter.WaitReady(e.Ctx, e.Namespace, ReloaderDeploymentName(e.ReleaseName), WorkloadReadyTimeout)
 }
 
 // DeployAndWait deploys Reloader with the given values and waits for it to be ready.
diff --git a/test/e2e/utils/watch.go b/test/e2e/utils/watch.go
index 3f9667a..bc160c7 100644
--- a/test/e2e/utils/watch.go
+++ b/test/e2e/utils/watch.go
@@ -13,16 +13,28 @@ import (
 
 // Timeout constants for watch operations.
 const (
-	DefaultInterval  = 1 * time.Second  // Polling interval (legacy, will be removed)
-	ShortTimeout     = 5 * time.Second  // Quick checks
-	NegativeTestWait = 3 * time.Second  // Wait before checking negative conditions
-	DeploymentReady  = 60 * time.Second // Workload readiness (buffer for CI)
-	ReloadTimeout    = 15 * time.Second // Time for reload to trigger
+	DefaultInterval      = 1 * time.Second  // Polling interval (legacy, will be removed)
+	ShortTimeout         = 5 * time.Second  // Quick checks
+	NegativeTestWait     = 3 * time.Second  // Wait before checking negative conditions
+	WorkloadReadyTimeout = 60 * time.Second // Workload readiness timeout (buffer for CI)
+	ReloadTimeout        = 15 * time.Second // Time for reload to trigger
 )
 
 // ErrWatchTimeout is returned when a watch times out waiting for condition.
 var ErrWatchTimeout = errors.New("watch timeout waiting for condition")
 
+// ErrUnsupportedOperation is returned when an operation is not supported for a workload type.
+var ErrUnsupportedOperation = errors.New("operation not supported for this workload type")
+
+// HandleWatchResult converts watch errors to the standard (bool, error) return pattern.
+// Returns (false, nil) for timeout, (true, nil) for success, (false, err) for other errors.
+func HandleWatchResult(err error) (bool, error) {
+	if errors.Is(err, ErrWatchTimeout) {
+		return false, nil
+	}
+	return err == nil, err
+}
+
 // WatchFunc is a function that starts a watch for a specific resource.
 type WatchFunc func(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error)
 
diff --git a/test/e2e/utils/workload_argo.go b/test/e2e/utils/workload_argo.go
index 4860d41..c599a6c 100644
--- a/test/e2e/utils/workload_argo.go
+++ b/test/e2e/utils/workload_argo.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	rolloutv1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
@@ -61,10 +60,7 @@ func (a *ArgoRolloutAdapter) WaitReloaded(ctx context.Context, namespace, name,
 		return a.rolloutsClient.ArgoprojV1alpha1().Rollouts(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(RolloutPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitEnvVar waits for the Argo Rollout to have a STAKATER_ env var using watches.
@@ -73,10 +69,7 @@ func (a *ArgoRolloutAdapter) WaitEnvVar(ctx context.Context, namespace, name, pr
 		return a.rolloutsClient.ArgoprojV1alpha1().Rollouts(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasEnvVarPrefix(RolloutContainers, prefix), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitRestartAt waits for the Argo Rollout to have the restartAt field set using watches.
@@ -86,10 +79,7 @@ func (a *ArgoRolloutAdapter) WaitRestartAt(ctx context.Context, namespace, name
 		return a.rolloutsClient.ArgoprojV1alpha1().Rollouts(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, IsReady(RolloutHasRestartAt), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // SupportsEnvVarStrategy returns true as Argo Rollouts support env var reload strategy.
diff --git a/test/e2e/utils/workload_cronjob.go b/test/e2e/utils/workload_cronjob.go
index 41fef04..f67cce5 100644
--- a/test/e2e/utils/workload_cronjob.go
+++ b/test/e2e/utils/workload_cronjob.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	batchv1 "k8s.io/api/batch/v1"
@@ -53,15 +52,12 @@ func (a *CronJobAdapter) WaitReloaded(ctx context.Context, namespace, name, anno
 		return a.client.BatchV1().CronJobs(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(CronJobPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
-// WaitEnvVar is not supported for CronJobs as they don't use env var reload strategy.
+// WaitEnvVar returns an error because CronJobs don't support env var reload strategy.
 func (a *CronJobAdapter) WaitEnvVar(ctx context.Context, namespace, name, prefix string, timeout time.Duration) (bool, error) {
-	return false, nil
+	return false, ErrUnsupportedOperation
 }
 
 // SupportsEnvVarStrategy returns false as CronJobs don't support env var reload strategy.
@@ -80,10 +76,7 @@ func (a *CronJobAdapter) WaitForTriggeredJob(ctx context.Context, namespace, cro
 		return a.client.BatchV1().Jobs(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, "", IsTriggeredJobForCronJob(cronJobName), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // buildCronJobOptions converts WorkloadConfig to CronJobOption slice.
diff --git a/test/e2e/utils/workload_daemonset.go b/test/e2e/utils/workload_daemonset.go
index 492f7b5..d1cffb5 100644
--- a/test/e2e/utils/workload_daemonset.go
+++ b/test/e2e/utils/workload_daemonset.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -53,10 +52,7 @@ func (a *DaemonSetAdapter) WaitReloaded(ctx context.Context, namespace, name, an
 		return a.client.AppsV1().DaemonSets(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(DaemonSetPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitEnvVar waits for the DaemonSet to have a STAKATER_ env var using watches.
@@ -65,10 +61,7 @@ func (a *DaemonSetAdapter) WaitEnvVar(ctx context.Context, namespace, name, pref
 		return a.client.AppsV1().DaemonSets(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasEnvVarPrefix(DaemonSetContainers, prefix), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // SupportsEnvVarStrategy returns true as DaemonSets support env var reload strategy.
diff --git a/test/e2e/utils/workload_deployment.go b/test/e2e/utils/workload_deployment.go
index 28f7f55..1323b03 100644
--- a/test/e2e/utils/workload_deployment.go
+++ b/test/e2e/utils/workload_deployment.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -53,10 +52,7 @@ func (a *DeploymentAdapter) WaitReloaded(ctx context.Context, namespace, name, a
 		return a.client.AppsV1().Deployments(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(DeploymentPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitEnvVar waits for the Deployment to have a STAKATER_ env var using watches.
@@ -65,10 +61,7 @@ func (a *DeploymentAdapter) WaitEnvVar(ctx context.Context, namespace, name, pre
 		return a.client.AppsV1().Deployments(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasEnvVarPrefix(DeploymentContainers, prefix), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitPaused waits for the Deployment to have the paused annotation using watches.
@@ -77,10 +70,7 @@ func (a *DeploymentAdapter) WaitPaused(ctx context.Context, namespace, name, ann
 		return a.client.AppsV1().Deployments(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasAnnotation(DeploymentAnnotations, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitUnpaused waits for the Deployment to NOT have the paused annotation using watches.
@@ -89,10 +79,7 @@ func (a *DeploymentAdapter) WaitUnpaused(ctx context.Context, namespace, name, a
 		return a.client.AppsV1().Deployments(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, NoAnnotation(DeploymentAnnotations, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // SupportsEnvVarStrategy returns true as Deployments support env var reload strategy.
diff --git a/test/e2e/utils/workload_job.go b/test/e2e/utils/workload_job.go
index 4daa781..88c18c4 100644
--- a/test/e2e/utils/workload_job.go
+++ b/test/e2e/utils/workload_job.go
@@ -49,19 +49,15 @@ func (a *JobAdapter) WaitReady(ctx context.Context, namespace, name string, time
 	return err
 }
 
-// WaitReloaded waits for the Job to be recreated (new UID) using watches.
-// For Jobs, Reloader recreates the Job rather than updating annotations.
+// WaitReloaded returns an error because Jobs are recreated, not updated.
+// Use the Recreatable interface (GetOriginalUID + WaitRecreated) instead.
 func (a *JobAdapter) WaitReloaded(ctx context.Context, namespace, name, annotationKey string, timeout time.Duration) (bool, error) {
-	// For Jobs, we check if it was recreated by looking for a new UID
-	// This requires storing the original UID before the test
-	// For simplicity, we use the same pattern as other workloads
-	// The test should verify recreation using WaitForRecreation instead
-	return false, nil
+	return false, ErrUnsupportedOperation
 }
 
-// WaitEnvVar is not supported for Jobs as they don't use env var reload strategy.
+// WaitEnvVar returns an error because Jobs don't support env var reload strategy.
 func (a *JobAdapter) WaitEnvVar(ctx context.Context, namespace, name, prefix string, timeout time.Duration) (bool, error) {
-	return false, nil
+	return false, ErrUnsupportedOperation
 }
 
 // WaitRecreated waits for the Job to be recreated with a different UID using watches.
diff --git a/test/e2e/utils/workload_openshift.go b/test/e2e/utils/workload_openshift.go
index 7bf774a..0ca607f 100644
--- a/test/e2e/utils/workload_openshift.go
+++ b/test/e2e/utils/workload_openshift.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	openshiftappsv1 "github.com/openshift/api/apps/v1"
@@ -12,8 +11,8 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 )
 
-// DCOption is a function that modifies a DeploymentConfig.
-type DCOption func(*openshiftappsv1.DeploymentConfig)
+// DeploymentConfigOption is a function that modifies a DeploymentConfig.
+type DeploymentConfigOption func(*openshiftappsv1.DeploymentConfig)
 
 // DeploymentConfigAdapter implements WorkloadAdapter for OpenShift DeploymentConfigs.
 type DeploymentConfigAdapter struct {
@@ -63,10 +62,7 @@ func (a *DeploymentConfigAdapter) WaitReloaded(ctx context.Context, namespace, n
 		return a.openshiftClient.AppsV1().DeploymentConfigs(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(DeploymentConfigPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitEnvVar waits for the DeploymentConfig to have a STAKATER_ env var using watches.
@@ -75,10 +71,7 @@ func (a *DeploymentConfigAdapter) WaitEnvVar(ctx context.Context, namespace, nam
 		return a.openshiftClient.AppsV1().DeploymentConfigs(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasEnvVarPrefix(DeploymentConfigContainers, prefix), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // SupportsEnvVarStrategy returns true as DeploymentConfigs support env var reload strategy.
@@ -117,9 +110,9 @@ func baseDeploymentConfig(name string) *openshiftappsv1.DeploymentConfig {
 	}
 }
 
-// buildDeploymentConfigOptions converts WorkloadConfig to DCOption slice.
-func buildDeploymentConfigOptions(cfg WorkloadConfig) []DCOption {
-	return []DCOption{
+// buildDeploymentConfigOptions converts WorkloadConfig to DeploymentConfigOption slice.
+func buildDeploymentConfigOptions(cfg WorkloadConfig) []DeploymentConfigOption {
+	return []DeploymentConfigOption{
 		func(dc *openshiftappsv1.DeploymentConfig) {
 			// Set annotations on DeploymentConfig level (where Reloader checks them)
 			if len(cfg.Annotations) > 0 {
diff --git a/test/e2e/utils/workload_statefulset.go b/test/e2e/utils/workload_statefulset.go
index feb7e06..70266e1 100644
--- a/test/e2e/utils/workload_statefulset.go
+++ b/test/e2e/utils/workload_statefulset.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"context"
-	"errors"
 	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
@@ -53,10 +52,7 @@ func (a *StatefulSetAdapter) WaitReloaded(ctx context.Context, namespace, name,
 		return a.client.AppsV1().StatefulSets(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasPodTemplateAnnotation(StatefulSetPodTemplate, annotationKey), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // WaitEnvVar waits for the StatefulSet to have a STAKATER_ env var using watches.
@@ -65,10 +61,7 @@ func (a *StatefulSetAdapter) WaitEnvVar(ctx context.Context, namespace, name, pr
 		return a.client.AppsV1().StatefulSets(namespace).Watch(ctx, opts)
 	}
 	_, err := WatchUntil(ctx, watchFunc, name, HasEnvVarPrefix(StatefulSetContainers, prefix), timeout)
-	if errors.Is(err, ErrWatchTimeout) {
-		return false, nil
-	}
-	return err == nil, err
+	return HandleWatchResult(err)
 }
 
 // SupportsEnvVarStrategy returns true as StatefulSets support env var reload strategy.