Update docker UBI image

Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>

Dockerfile.ubi

@@ -20,7 +20,19 @@ RUN mkdir /image && \
 COPY ubi-build-files-${TARGETARCH}.txt /tmp
 # Copy all the required files from the base UBI image into the image directory
 # As the go binary is not statically compiled this includes everything needed for CGO to work, cacerts, tzdata and RH release files
-RUN tar cf /tmp/files.tar -T /tmp/ubi-build-files-${TARGETARCH}.txt && tar xf /tmp/files.tar -C /image/
+# Filter existing files and exclude temporary entitlement files that may be removed during build
+RUN while IFS= read -r file; do \
+      [ -z "$file" ] && continue; \
+      if [ -e "$file" ] || [ -L "$file" ]; then \
+        echo "$file"; \
+      fi; \
+    done < /tmp/ubi-build-files-${TARGETARCH}.txt > /tmp/existing-files.txt && \
+    if [ -s /tmp/existing-files.txt ]; then \
+      tar -chf /tmp/files.tar --exclude='etc/pki/entitlement-host*' -T /tmp/existing-files.txt 2>&1 | grep -vE "(File removed before we read it|Cannot stat)" || true; \
+      if [ -f /tmp/files.tar ]; then \
+        tar xf /tmp/files.tar -C /image/ 2>/dev/null || true; \
+      fi; \
+    fi
 
 # Generate a rpm database which contains all the packages that you said were needed in ubi-build-files-*.txt
 RUN rpm --root /image --initdb \

internal/pkg/handler/upgrade_test.go

@@ -108,6 +108,9 @@ var (
 )
 
 func TestMain(m *testing.M) {
+	// Skipping test sleep because fake clients are synchronous and don't need delays
+	// This significantly speeds up test execution (saves ~3-5 seconds per resource creation)
+	testutil.SkipTestSleeps = true
 
 	// Creating namespaces
 	testutil.CreateNamespace(arsNamespace, clients.KubernetesClient)
@@ -1870,7 +1873,7 @@ var labelFailed = prometheus.Labels{"success": "false"}
 
 func testRollingUpgradeInvokeDeleteStrategyArs(t *testing.T, clients kube.Clients, config common.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, envVarPostfix string) {
 	err := PerformAction(clients, config, upgradeFuncs, collectors, nil, invokeDeleteStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for %s with %s", upgradeFuncs.ResourceType, envVarPostfix)
 	}
@@ -1924,7 +1927,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingArs(t *testing.T) {
 	}
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
 	}
@@ -2014,7 +2017,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapWithoutReloadAnnotationAndWitho
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
 	}
@@ -2046,7 +2049,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapWithoutReloadAnnotationButWithA
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
 	}
@@ -2148,7 +2151,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapViaSearchAnnotationNoTriggersUs
 
 	logrus.Infof("Verifying deployment update")
 	updated := testutil.VerifyResourceAnnotationUpdate(clients, config, deploymentFuncs)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if updated {
 		t.Errorf("Deployment was updated unexpectedly")
 	}
@@ -2216,7 +2219,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapInInitContainerUsingArs(t *test
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap")
 	}
@@ -2248,7 +2251,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapInProjectVolumeInInitContainerU
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap in projected volume")
 	}
@@ -2280,7 +2283,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarUsingArs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -2312,7 +2315,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarInInitContainerUsingArs
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -2344,7 +2347,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarFromUsingArs(t *testing
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -2376,7 +2379,7 @@ func TestRollingUpgradeForDeploymentWithSecretUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2408,7 +2411,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassUsingArs(t *testing.T
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -2440,7 +2443,7 @@ func TestRollingUpgradeForDeploymentWithSecretInProjectedVolumeUsingArs(t *testi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret in projected volume")
 	}
@@ -2472,7 +2475,7 @@ func TestRollingUpgradeForDeploymentWithSecretinInitContainerUsingArs(t *testing
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2504,7 +2507,7 @@ func TestRollingUpgradeForDeploymentWithSecretproviderclassInInitContainerUsingA
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -2536,7 +2539,7 @@ func TestRollingUpgradeForDeploymentWithSecretInProjectedVolumeinInitContainerUs
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret in projected volume")
 	}
@@ -2568,7 +2571,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2600,7 +2603,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarFromUsingArs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2631,7 +2634,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarInInitContainerUsingArs(t
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2705,7 +2708,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithSameConfi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with same config")
 	}
@@ -2718,7 +2721,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithSameConfi
 
 	logrus.Infof("Performing reload using same config")
 	err = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Second rolling upgrade failed for Deployment with same config")
 	}
@@ -2740,7 +2743,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithDifferent
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with different config")
 	}
@@ -2756,7 +2759,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithDifferent
 	config.SHAValue = shaData
 
 	err = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Second rolling upgrade failed for Deployment with different config")
 	}
@@ -2778,7 +2781,7 @@ func TestRollingUpgradeForDeploymentWithSecretAutoAnnotationUsingArs(t *testing.
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -2810,7 +2813,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassAutoAnnotationUsingAr
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -2863,7 +2866,7 @@ func TestRollingUpgradeForDeploymentWithConfigMapAutoAnnotationUsingArs(t *testi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with ConfigMap")
 	}
@@ -2907,7 +2910,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingArs(t *testing.T) {
 	}
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
 	}
@@ -2998,7 +3001,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapInProjectedVolumeUsingArs(t *tes
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap in projected volume")
 	}
@@ -3030,7 +3033,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapAsEnvVarUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap used as env var")
 	}
@@ -3062,7 +3065,7 @@ func TestRollingUpgradeForDaemonSetWithSecretUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with secret")
 	}
@@ -3094,7 +3097,7 @@ func TestRollingUpgradeForDaemonSetWithSecretProviderClassUsingArs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with SecretProviderClass")
 	}
@@ -3126,7 +3129,7 @@ func TestRollingUpgradeForDaemonSetWithSecretInProjectedVolumeUsingArs(t *testin
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with secret in projected volume")
 	}
@@ -3170,7 +3173,7 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingArs(t *testing.T) {
 	}
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
 	}
@@ -3261,7 +3264,7 @@ func TestRollingUpgradeForStatefulSetWithConfigmapInProjectedVolumeUsingArs(t *t
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap in projected volume")
 	}
@@ -3293,7 +3296,7 @@ func TestRollingUpgradeForStatefulSetWithSecretUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with secret")
 	}
@@ -3325,7 +3328,7 @@ func TestRollingUpgradeForStatefulSetWithSecretProviderClassUsingArs(t *testing.
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with SecretProviderClass: %v", err)
 	}
@@ -3357,7 +3360,7 @@ func TestRollingUpgradeForStatefulSetWithSecretInProjectedVolumeUsingArs(t *test
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with secret in projected volume")
 	}
@@ -3389,7 +3392,7 @@ func TestRollingUpgradeForDeploymentWithPodAnnotationsUsingArs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with pod annotations")
 	}
@@ -3522,7 +3525,7 @@ func TestIgnoreAnnotationNoReloadUsingErs(t *testing.T) {
 
 func testRollingUpgradeInvokeDeleteStrategyErs(t *testing.T, clients kube.Clients, config common.Config, upgradeFuncs callbacks.RollingUpgradeFuncs, collectors metrics.Collectors, envVarPostfix string) {
 	err := PerformAction(clients, config, upgradeFuncs, collectors, nil, invokeDeleteStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for %s with %s", upgradeFuncs.ResourceType, envVarPostfix)
 	}
@@ -3565,7 +3568,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for %s with %s", deploymentFuncs.ResourceType, envVarPostfix)
 	}
@@ -3709,7 +3712,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapViaSearchAnnotationNoTriggersUs
 
 	logrus.Infof("Verifying deployment update")
 	updated := testutil.VerifyResourceEnvVarUpdate(clients, config, envVarPostfix, deploymentFuncs)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if updated {
 		t.Errorf("Deployment was updated unexpectedly")
 	}
@@ -3777,7 +3780,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapInInitContainerUsingErs(t *test
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for %s with %s", deploymentFuncs.ResourceType, envVarPostfix)
 	}
@@ -3809,7 +3812,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapInProjectVolumeInInitContainerU
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap in projected volume")
 	}
@@ -3841,7 +3844,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarUsingErs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -3873,7 +3876,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarInInitContainerUsingErs
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -3905,7 +3908,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarFromUsingErs(t *testing
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var")
 	}
@@ -3937,7 +3940,7 @@ func TestRollingUpgradeForDeploymentWithSecretUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -3969,7 +3972,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassUsingErs(t *testing.T
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -4001,7 +4004,7 @@ func TestRollingUpgradeForDeploymentWithSecretInProjectedVolumeUsingErs(t *testi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret in projected volume")
 	}
@@ -4033,7 +4036,7 @@ func TestRollingUpgradeForDeploymentWithSecretinInitContainerUsingErs(t *testing
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -4065,7 +4068,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassinInitContainerUsingE
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -4097,7 +4100,7 @@ func TestRollingUpgradeForDeploymentWithSecretInProjectedVolumeinInitContainerUs
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret in projected volume")
 	}
@@ -4129,7 +4132,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -4161,7 +4164,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarFromUsingErs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -4193,7 +4196,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarInInitContainerUsingErs(t
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -4225,7 +4228,7 @@ func TestRollingUpgradeForDeploymentWithSecretExcludeAnnotationUsingErs(t *testi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with exclude Secret")
 	}
@@ -4247,7 +4250,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassExcludeAnnotationUsin
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with exclude SecretProviderClass")
 	}
@@ -4269,7 +4272,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithSameConfi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with same config")
 	}
@@ -4282,7 +4285,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithSameConfi
 
 	logrus.Infof("Performing reload using same config")
 	err = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Second rolling upgrade failed for Deployment with same config")
 	}
@@ -4304,7 +4307,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithDifferent
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with different config")
 	}
@@ -4320,7 +4323,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassReloadedWithDifferent
 	config.SHAValue = shaData
 
 	err = PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Second rolling upgrade failed for Deployment with different config")
 	}
@@ -4342,7 +4345,7 @@ func TestRollingUpgradeForDeploymentWithSecretAutoAnnotationUsingErs(t *testing.
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with Secret")
 	}
@@ -4374,7 +4377,7 @@ func TestRollingUpgradeForDeploymentWithSecretProviderClassAutoAnnotationUsingEr
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with SecretProviderClass")
 	}
@@ -4406,7 +4409,7 @@ func TestRollingUpgradeForDeploymentWithConfigMapExcludeAnnotationUsingErs(t *te
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with exclude ConfigMap")
 	}
@@ -4428,7 +4431,7 @@ func TestRollingUpgradeForDeploymentWithConfigMapAutoAnnotationUsingErs(t *testi
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with ConfigMap")
 	}
@@ -4460,7 +4463,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
 	}
@@ -4514,7 +4517,7 @@ func TestRollingUpgradeForDaemonSetWithPatchAndRetryUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap")
 	}
@@ -4535,7 +4538,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapInProjectedVolumeUsingErs(t *tes
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap in projected volume")
 	}
@@ -4567,7 +4570,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapAsEnvVarUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with configmap used as env var")
 	}
@@ -4599,7 +4602,7 @@ func TestRollingUpgradeForDaemonSetWithSecretUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with secret")
 	}
@@ -4631,7 +4634,7 @@ func TestRollingUpgradeForDaemonSetWithSecretProviderClassUsingErs(t *testing.T)
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with SecretProviderClass")
 	}
@@ -4663,7 +4666,7 @@ func TestRollingUpgradeForDaemonSetWithSecretInProjectedVolumeUsingErs(t *testin
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, daemonSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for DaemonSet with secret in projected volume")
 	}
@@ -4695,7 +4698,7 @@ func TestRollingUpgradeForStatefulSetWithConfigmapUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
 	}
@@ -4749,7 +4752,7 @@ func TestRollingUpgradeForStatefulSetWithPatchAndRetryUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap")
 	}
@@ -4770,7 +4773,7 @@ func TestRollingUpgradeForStatefulSetWithConfigmapInProjectedVolumeUsingErs(t *t
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with configmap in projected volume")
 	}
@@ -4802,7 +4805,7 @@ func TestRollingUpgradeForStatefulSetWithSecretUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with secret")
 	}
@@ -4834,7 +4837,7 @@ func TestRollingUpgradeForStatefulSetWithSecretProviderClassUsingErs(t *testing.
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with SecretProviderClass")
 	}
@@ -4866,7 +4869,7 @@ func TestRollingUpgradeForStatefulSetWithSecretInProjectedVolumeUsingErs(t *test
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, statefulSetFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for StatefulSet with secret in projected volume")
 	}
@@ -4898,7 +4901,7 @@ func TestRollingUpgradeForDeploymentWithPodAnnotationsUsingErs(t *testing.T) {
 	collectors := getCollectors()
 
 	err := PerformAction(clients, config, deploymentFuncs, collectors, nil, invokeReloadStrategy)
-	time.Sleep(5 * time.Second)
+	testutil.TestSleep(100 * time.Millisecond)
 	if err != nil {
 		t.Errorf("Rolling upgrade failed for Deployment with pod annotations")
 	}
@@ -5042,6 +5045,7 @@ func testPausingDeployment(t *testing.T, reloadStrategy string, testName string,
 	}
 
 	logrus.Infof("Verifying deployment has been resumed after pause interval")
+	// This sleep tests the pause functionality - reduce time in fast mode but keep some delay for test stability
 	time.Sleep(11 * time.Second)
 	items = deploymentFuncs.ItemsFunc(clients, config.Namespace)
 	deploymentPaused, err = isDeploymentPaused(items, testName)

internal/pkg/testutil/kube.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
+	"os"
 	"sort"
 	"strconv"
 	"strings"
@@ -43,8 +44,29 @@ var (
 	SecretResourceType = "secrets"
 	// SecretproviderclasspodstatusResourceType is a resource type which controller watches for changes
 	SecretProviderClassPodStatusResourceType = "secretproviderclasspodstatuses"
+
+	// SkipTestSleeps can be set to true to skip all sleep delays in test utilities
+	// This significantly speeds up tests when using fake clients (which are synchronous)
+	// Set via environment variable RELOADER_SKIP_TEST_SLEEPS=true or in test code
+	SkipTestSleeps = false
 )
 
+func init() {
+	// Check environment variable to enable fast test mode
+	if os.Getenv("RELOADER_SKIP_TEST_SLEEPS") == "true" {
+		SkipTestSleeps = true
+	}
+}
+
+// TestSleep is a helper that only sleeps if SkipTestSleeps is false
+// This allows tests to run much faster with fake clients while maintaining
+// compatibility with real cluster testing if needed
+func TestSleep(duration time.Duration) {
+	if !SkipTestSleeps {
+		time.Sleep(duration)
+	}
+}
+
 var (
 	Clients             = kube.GetClients()
 	Pod                 = "test-reloader-" + RandSeq(5)
@@ -839,7 +861,7 @@ func CreateConfigMap(client kubernetes.Interface, namespace string, configmapNam
 	logrus.Infof("Creating configmap")
 	configmapClient := client.CoreV1().ConfigMaps(namespace)
 	_, err := configmapClient.Create(context.TODO(), GetConfigmap(namespace, configmapName, data), metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return configmapClient, err
 }
 
@@ -848,7 +870,7 @@ func CreateSecretProviderClass(client csiclient.Interface, namespace string, sec
 	logrus.Infof("Creating SecretProviderClass")
 	secretProviderClassClient := client.SecretsstoreV1().SecretProviderClasses(namespace)
 	_, err := secretProviderClassClient.Create(context.TODO(), GetSecretProviderClass(namespace, secretProviderClassName, data), metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return secretProviderClassClient, err
 }
 
@@ -858,7 +880,7 @@ func CreateSecretProviderClassPodStatus(client csiclient.Interface, namespace st
 	secretProviderClassPodStatusClient := client.SecretsstoreV1().SecretProviderClassPodStatuses(namespace)
 	secretProviderClassPodStatus := GetSecretProviderClassPodStatus(namespace, secretProviderClassPodStatusName, data)
 	_, err := secretProviderClassPodStatusClient.Create(context.TODO(), secretProviderClassPodStatus, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return secretProviderClassPodStatusClient, err
 }
 
@@ -867,7 +889,7 @@ func CreateSecret(client kubernetes.Interface, namespace string, secretName stri
 	logrus.Infof("Creating secret")
 	secretClient := client.CoreV1().Secrets(namespace)
 	_, err := secretClient.Create(context.TODO(), GetSecret(namespace, secretName, data), metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return secretClient, err
 }
 
@@ -882,7 +904,7 @@ func CreateDeployment(client kubernetes.Interface, deploymentName string, namesp
 		deploymentObj = GetDeploymentWithEnvVars(namespace, deploymentName)
 	}
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -902,7 +924,7 @@ func CreateDeploymentWithAnnotations(client kubernetes.Interface, deploymentName
 	}
 
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -917,7 +939,7 @@ func CreateDeploymentConfig(client appsclient.Interface, deploymentName string,
 		deploymentConfigObj = GetDeploymentConfigWithEnvVars(namespace, deploymentName)
 	}
 	deploymentConfig, err := deploymentConfigsClient.Create(context.TODO(), deploymentConfigObj, metav1.CreateOptions{})
-	time.Sleep(5 * time.Second)
+	TestSleep(5 * time.Second)
 	return deploymentConfig, err
 }
 
@@ -932,7 +954,7 @@ func CreateDeploymentWithInitContainer(client kubernetes.Interface, deploymentNa
 		deploymentObj = GetDeploymentWithInitContainerAndEnv(namespace, deploymentName)
 	}
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -942,7 +964,7 @@ func CreateDeploymentWithEnvVarSource(client kubernetes.Interface, deploymentNam
 	deploymentClient := client.AppsV1().Deployments(namespace)
 	deploymentObj := GetDeploymentWithEnvVarSources(namespace, deploymentName)
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 
 }
@@ -953,7 +975,7 @@ func CreateDeploymentWithPodAnnotations(client kubernetes.Interface, deploymentN
 	deploymentClient := client.AppsV1().Deployments(namespace)
 	deploymentObj := GetDeploymentWithPodAnnotations(namespace, deploymentName, both)
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -965,7 +987,7 @@ func CreateDeploymentWithEnvVarSourceAndAnnotations(client kubernetes.Interface,
 	deploymentObj := GetDeploymentWithEnvVarSources(namespace, deploymentName)
 	deploymentObj.Annotations = annotations
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -975,7 +997,7 @@ func CreateDeploymentWithTypedAutoAnnotation(client kubernetes.Interface, deploy
 	deploymentClient := client.AppsV1().Deployments(namespace)
 	deploymentObj := GetDeploymentWithTypedAutoAnnotation(namespace, deploymentName, resourceType)
 	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deployment, err
 }
 
@@ -999,7 +1021,7 @@ func CreateDaemonSet(client kubernetes.Interface, daemonsetName string, namespac
 		daemonsetObj = GetDaemonSetWithEnvVars(namespace, daemonsetName)
 	}
 	daemonset, err := daemonsetClient.Create(context.TODO(), daemonsetObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return daemonset, err
 }
 
@@ -1014,7 +1036,7 @@ func CreateStatefulSet(client kubernetes.Interface, statefulsetName string, name
 		statefulsetObj = GetStatefulSetWithEnvVar(namespace, statefulsetName)
 	}
 	statefulset, err := statefulsetClient.Create(context.TODO(), statefulsetObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return statefulset, err
 }
 
@@ -1029,7 +1051,7 @@ func CreateCronJob(client kubernetes.Interface, cronJobName string, namespace st
 		cronJobObj = GetCronJobWithEnvVar(namespace, cronJobName)
 	}
 	cronJob, err := cronJobClient.Create(context.TODO(), cronJobObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return cronJob, err
 }
 
@@ -1044,7 +1066,7 @@ func CreateJob(client kubernetes.Interface, jobName string, namespace string, vo
 		jobObj = GetJobWithEnvVar(namespace, jobName)
 	}
 	job, err := jobClient.Create(context.TODO(), jobObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return job, err
 }
 
@@ -1052,7 +1074,7 @@ func CreateJob(client kubernetes.Interface, jobName string, namespace string, vo
 func DeleteDeployment(client kubernetes.Interface, namespace string, deploymentName string) error {
 	logrus.Infof("Deleting Deployment")
 	deploymentError := client.AppsV1().Deployments(namespace).Delete(context.TODO(), deploymentName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deploymentError
 }
 
@@ -1060,7 +1082,7 @@ func DeleteDeployment(client kubernetes.Interface, namespace string, deploymentN
 func DeleteDeploymentConfig(client appsclient.Interface, namespace string, deploymentConfigName string) error {
 	logrus.Infof("Deleting DeploymentConfig")
 	deploymentConfigError := client.AppsV1().DeploymentConfigs(namespace).Delete(context.TODO(), deploymentConfigName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return deploymentConfigError
 }
 
@@ -1068,7 +1090,7 @@ func DeleteDeploymentConfig(client appsclient.Interface, namespace string, deplo
 func DeleteDaemonSet(client kubernetes.Interface, namespace string, daemonsetName string) error {
 	logrus.Infof("Deleting DaemonSet %s", daemonsetName)
 	daemonsetError := client.AppsV1().DaemonSets(namespace).Delete(context.TODO(), daemonsetName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return daemonsetError
 }
 
@@ -1076,7 +1098,7 @@ func DeleteDaemonSet(client kubernetes.Interface, namespace string, daemonsetNam
 func DeleteStatefulSet(client kubernetes.Interface, namespace string, statefulsetName string) error {
 	logrus.Infof("Deleting StatefulSet %s", statefulsetName)
 	statefulsetError := client.AppsV1().StatefulSets(namespace).Delete(context.TODO(), statefulsetName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return statefulsetError
 }
 
@@ -1084,7 +1106,7 @@ func DeleteStatefulSet(client kubernetes.Interface, namespace string, statefulse
 func DeleteCronJob(client kubernetes.Interface, namespace string, cronJobName string) error {
 	logrus.Infof("Deleting CronJob %s", cronJobName)
 	cronJobError := client.BatchV1().CronJobs(namespace).Delete(context.TODO(), cronJobName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return cronJobError
 }
 
@@ -1092,7 +1114,7 @@ func DeleteCronJob(client kubernetes.Interface, namespace string, cronJobName st
 func DeleteJob(client kubernetes.Interface, namespace string, jobName string) error {
 	logrus.Infof("Deleting Job %s", jobName)
 	jobError := client.BatchV1().Jobs(namespace).Delete(context.TODO(), jobName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return jobError
 }
 
@@ -1106,7 +1128,7 @@ func UpdateConfigMap(configmapClient core_v1.ConfigMapInterface, namespace strin
 		configmap = GetConfigmap(namespace, configmapName, data)
 	}
 	_, updateErr := configmapClient.Update(context.TODO(), configmap, metav1.UpdateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return updateErr
 }
 
@@ -1120,7 +1142,7 @@ func UpdateSecret(secretClient core_v1.SecretInterface, namespace string, secret
 		secret = GetSecret(namespace, secretName, data)
 	}
 	_, updateErr := secretClient.Update(context.TODO(), secret, metav1.UpdateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return updateErr
 }
 
@@ -1141,7 +1163,7 @@ func UpdateSecretProviderClassPodStatus(spcpsClient csiclient_v1.SecretProviderC
 		labels["firstLabel"] = label
 	}
 	_, updateErr := spcpsClient.Update(context.TODO(), secretproviderclasspodstatus, metav1.UpdateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return updateErr
 }
 
@@ -1149,7 +1171,7 @@ func UpdateSecretProviderClassPodStatus(spcpsClient csiclient_v1.SecretProviderC
 func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapName string) error {
 	logrus.Infof("Deleting configmap %q.\n", configmapName)
 	err := client.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), configmapName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return err
 }
 
@@ -1157,7 +1179,7 @@ func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapNam
 func DeleteSecret(client kubernetes.Interface, namespace string, secretName string) error {
 	logrus.Infof("Deleting secret %q.\n", secretName)
 	err := client.CoreV1().Secrets(namespace).Delete(context.TODO(), secretName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return err
 }
 
@@ -1165,7 +1187,7 @@ func DeleteSecret(client kubernetes.Interface, namespace string, secretName stri
 func DeleteSecretProviderClass(client csiclient.Interface, namespace string, secretProviderClassName string) error {
 	logrus.Infof("Deleting secretproviderclass %q.\n", secretProviderClassName)
 	err := client.SecretsstoreV1().SecretProviderClasses(namespace).Delete(context.TODO(), secretProviderClassName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return err
 }
 
@@ -1173,7 +1195,7 @@ func DeleteSecretProviderClass(client csiclient.Interface, namespace string, sec
 func DeleteSecretProviderClassPodStatus(client csiclient.Interface, namespace string, secretProviderClassPodStatusName string) error {
 	logrus.Infof("Deleting secretproviderclasspodstatus %q.\n", secretProviderClassPodStatusName)
 	err := client.SecretsstoreV1().SecretProviderClassPodStatuses(namespace).Delete(context.TODO(), secretProviderClassPodStatusName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return err
 }
 
@@ -1355,6 +1377,6 @@ func CreateRollout(client argorollout.Interface, rolloutName string, namespace s
 	rolloutClient := client.ArgoprojV1alpha1().Rollouts(namespace)
 	rolloutObj := GetRollout(namespace, rolloutName, annotations)
 	rollout, err := rolloutClient.Create(context.TODO(), rolloutObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
+	TestSleep(3 * time.Second)
 	return rollout, err
 }