[bot] Update main from openshift-pipelines/manual-approval-gate to 6336d097d795b40568f2e98240c77d887e62d0b8

    $ git diff --stat 6336d097d795b40568f2e98240c77d887e62d0b8..ac0d2c063bc84d1ab28c1a3cae27aba3ae1adb6b
     .../auto-merge-upstream-manual-approval-gate.yaml  |  2 +-
     .github/workflows/latest.yml                       |  6 +++---
     .github/workflows/release.yml                      |  2 +-
     .../update-sources-manual-approval-gate.yaml       |  2 +-
     pkg/reconciler/approvaltask/approvaltask.go        | 23 ----------------------
     5 files changed, 6 insertions(+), 29 deletions(-)

https://github.com/openshift-pipelines/manual-approval-gate/compare/6336d097d795b40568f2e98240c77d887e62d0b8..ac0d2c063bc84d1ab28c1a3cae27aba3ae1adb6b

Author: openshift-pipelines-bot

head

@@ -1 +1 @@
-ac0d2c063bc84d1ab28c1a3cae27aba3ae1adb6b
+6336d097d795b40568f2e98240c77d887e62d0b8

upstream/.github/workflows/auto-merge-upstream-manual-approval-gate.yaml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
     - name: Checkout the current repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: auto-merge-upstream-manual-approval-gate
       run: |
         gh auth status

upstream/.github/workflows/latest.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
@@ -43,7 +43,7 @@ jobs:
       with:
         go-version: 1.21
     - uses: imjasonh/[email protected]
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: actions/cache@v4
       with:
         path: |
@@ -72,7 +72,7 @@ jobs:
     - uses: actions/setup-go@v5
       with:
         go-version: 1.21
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: actions/cache@v4
       with:
         path: |

upstream/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       repository-projects: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: docker/login-action@v3
         with:
           registry: ghcr.io

upstream/.github/workflows/update-sources-manual-approval-gate.yaml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
     - name: Checkout the current repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         ref: main
 

upstream/pkg/reconciler/approvaltask/approvaltask.go

@@ -59,6 +59,7 @@ const (
 	allApprovers      = "approvers"
 	approvalsRequired = "numberOfApprovalsRequired"
 	description       = "description"
+	timeout           = "timeout"
 
 	// CustomRunLabelKey is used as the label identifier for a ApprovalTask
 	CustomRunLabelKey = "tekton.dev/customRun"
@@ -135,6 +136,24 @@ func (c *Reconciler) ReconcileKind(ctx context.Context, run *v1beta1.CustomRun)
 		return nil
 	}
 
+	// Parse timeout parameter from params if provided
+	if run.Spec.Timeout == nil {
+		for _, param := range run.Spec.Params {
+			if param.Name == timeout {
+				duration, err := time.ParseDuration(param.Value.StringVal)
+				if err != nil {
+					logger.Errorf("Invalid timeout parameter value '%s' for Run %s/%s: %v", param.Value.StringVal, run.Namespace, run.Name, err)
+					run.Status.MarkCustomRunFailed(approvaltaskv1alpha1.ApprovalTaskRunReasonFailedValidation.String(),
+						fmt.Sprintf("Invalid timeout parameter: %s", err.Error()))
+					return nil
+				}
+				run.Spec.Timeout = &metav1.Duration{Duration: duration}
+				logger.Infof("Set timeout from parameter to %v for Run %s/%s", duration, run.Namespace, run.Name)
+				break
+			}
+		}
+	}
+
 	// Store the condition before reconcile
 	beforeCondition := run.Status.GetCondition(apis.ConditionSucceeded)
 
@@ -214,6 +233,10 @@ func (r *Reconciler) reconcile(ctx context.Context, run *v1beta1.CustomRun, stat
 	if approvalTask.Status.StartTime != nil {
 		elapsed := r.clock.Since(approvalTask.Status.StartTime.Time)
 		waitTime := timeout.Duration - elapsed
+		// If waitTime is negative or very small, requeue immediately to check timeout
+		if waitTime <= 0 {
+			waitTime = time.Second
+		}
 		return controller.NewRequeueAfter(waitTime)
 	}