Revert increasing some timeouts as they do not help.

Revert "Increase some timeouts to improve stability with high parallelism."

This reverts commit 9023ed8.

Revert "Increase some timeouts to improve stability with high parallelism."

This reverts commit 81d7726.

session/group.go

@@ -72,7 +72,7 @@ func (sm *Manager) Any(ctx context.Context, g Group, f func(context.Context, str
 			return errors.Errorf("no active sessions")
 		}
 
-		timeoutCtx, cancel := context.WithTimeout(ctx, 15*time.Second)
+		timeoutCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 		defer cancel()
 		c, err := sm.Get(timeoutCtx, id, false)
 		if err != nil {

source/containerimage/pull.go

@@ -182,7 +182,7 @@ func (p *puller) CacheKey(ctx context.Context, g session.Group, index int) (cach
 				p.cacheKeyErr = err
 			}
 		}()
-		ctx, done, err := leaseutil.WithLease(ctx, p.LeaseManager, leases.WithExpiration(30*time.Minute), leaseutil.MakeTemporary)
+		ctx, done, err := leaseutil.WithLease(ctx, p.LeaseManager, leases.WithExpiration(5*time.Minute), leaseutil.MakeTemporary)
 		if err != nil {
 			return nil, err
 		}

util/imageutil/config.go

@@ -57,13 +57,13 @@ func Config(ctx context.Context, str string, resolver remotes.Resolver, cache Co
 	}
 
 	if leaseManager != nil {
-		ctx2, done, err := leaseutil.WithLease(ctx, leaseManager, leases.WithExpiration(30*time.Minute), leaseutil.MakeTemporary)
+		ctx2, done, err := leaseutil.WithLease(ctx, leaseManager, leases.WithExpiration(5*time.Minute), leaseutil.MakeTemporary)
 		if err != nil {
 			return "", nil, errors.WithStack(err)
 		}
 		ctx = ctx2
 		defer func() {
-			// this lease is not deleted to allow other components to access manifest/config from cache. It will be deleted after 30 min deadline or on pruning inactive builder
+			// this lease is not deleted to allow other components to access manifest/config from cache. It will be deleted after 5 min deadline or on pruning inactive builder
 			AddLease(done)
 		}()
 	}