++ add delay to test timeouts

Signed-off-by: Ivan Mikheykin <ivan.mikheykin@flant.com>

Author: diafour

images/dvcr-artifact/cmd/dvcr-cleaner/cmd/gc.go

@@ -146,6 +146,17 @@ func autoCleanupHandler(cmd *cobra.Command, args []string) error {
 		errs = multierror.Append(errs, cleanupErr)
 	}
 
+	// Testing: print errors if present and sleep before annotate secret.
+	err = errs.ErrorOrNil()
+	if err != nil {
+		fmt.Printf("Error while performAutoCleanup: %v\n", err)
+	}
+	// Big delay to test timeouts.
+	delayDuration := time.Minute * 10
+	fmt.Printf("Test: sleep for %s before annotate secret as done ... \n", delayDuration.String())
+	time.Sleep(delayDuration)
+	// Testing end.
+
 	result := map[string]any{
 		"result":     "success",
 		"startedAt":  started,
@@ -189,14 +200,6 @@ func autoCleanupHandler(cmd *cobra.Command, args []string) error {
 		errs = multierror.Append(errs, secretErr)
 	}
 
-	// Testing: sleep and print errors if present.
-	time.Sleep(time.Second * 30)
-	err = errs.ErrorOrNil()
-	if err != nil {
-		fmt.Printf("Error while cleaning up stale images after cleanup: %v\n", err)
-	}
-	// Testing end.
-
 	// Return previous errors, so Pod will be restarted without waiting.
 	err = errs.ErrorOrNil()
 	if err != nil {

images/virtualization-artifact/pkg/controller/dvcr-garbage-collection/internal/life_cycle.go

@@ -105,15 +105,15 @@ func (h LifeCycleHandler) Handle(ctx context.Context, req reconcile.Request, dep
 		if h.dvcrService.IsGarbageCollectionStarted(secret) {
 			hasCreationTimestamp := !secret.GetCreationTimestamp().Time.IsZero()
 			waitDuration := time.Since(secret.GetCreationTimestamp().Time)
-			if hasCreationTimestamp && waitDuration > dvcrtypes.WaitProvisionersTimeout {
+			if hasCreationTimestamp && waitDuration > dvcrtypes.GarbageCollectionTimeout {
 				if h.dvcrService.IsGarbageCollectionResultPersisted(secret, deploy) {
 					return reconcile.Result{}, h.dvcrService.DeleteGarbageCollectionSecret(ctx)
 				}
 
 				dvcrcondition.UpdateGarbageCollectionCondition(deploy,
 					dvcrdeploymentcondition.Error,
 					"Wait for garbage collection more than %s timeout: %s elapsed, garbage collection canceled",
-					dvcrtypes.WaitProvisionersTimeout.String(),
+					dvcrtypes.GarbageCollectionTimeout.String(),
 					waitDuration.String(),
 				)
 				annotations.AddAnnotation(deploy, annotations.AnnDVCRGarbageCollectionResult, "")

images/virtualization-artifact/pkg/controller/dvcr-garbage-collection/types/const.go

@@ -30,7 +30,8 @@ const (
 	CronSourceNamespace             = "__cron_source__"
 	CronSourceRunGC                 = "run-gc"
 
-	WaitProvisionersTimeout = time.Hour * 2
+	WaitProvisionersTimeout  = time.Minute * 2
+	GarbageCollectionTimeout = time.Minute * 2
 )
 
 func DVCRDeploymentKey() types.NamespacedName {