From e73ce0398f8857d5735c7baeb11a731a8965b3dd Mon Sep 17 00:00:00 2001 From: Rob Nester Date: Fri, 23 Jan 2026 11:23:33 -0500 Subject: [PATCH] remove deprecated TIMEOUT parameter from tasks This commit removes the deprecated TIMEOUT task parameter from the following tasks: - `verify-conforma-konflux-ta` - `verify-conforma-konflux-vsa-ta` - `verify-enterprise-contract` This commit also updates the associated documentation and README files. Ref: EC-1425 Signed-off-by: Rob Nester --- docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc | 2 -- .../modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc | 2 -- docs/modules/ROOT/pages/verify-enterprise-contract.adoc | 2 -- tasks/verify-conforma-konflux-ta/0.1/README.md | 1 - .../0.1/verify-conforma-konflux-ta.yaml | 7 ------- .../0.1/verify-conforma-konflux-vsa-ta.yaml | 7 ------- tasks/verify-enterprise-contract/0.1/README.md | 1 - .../0.1/verify-enterprise-contract.yaml | 7 ------- 8 files changed, 29 deletions(-) diff --git a/docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc b/docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc index ad1168b09..8b63de1c9 100644 --- a/docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc +++ b/docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc @@ -53,8 +53,6 @@ paths can be provided by using the `:` separator. + *Default*: `now` *EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." -*TIMEOUT* (`string`):: This param is deprecated and will be removed in future. Its value is ignored. EC will be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) - *WORKERS* (`string`):: Number of parallel workers to use for policy evaluation. + diff --git a/docs/modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc b/docs/modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc index 0eddb303f..7c532cb0a 100644 --- a/docs/modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc +++ b/docs/modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc @@ -50,8 +50,6 @@ registries/Rekor. Multiple paths can be provided using `:`. *Default*: `now` *EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Syntax: key=val,key2=val2 -*TIMEOUT* (`string`):: Deprecated; ignored by the task. EC is run without a timeout (use Tekton timeouts). - *WORKERS* (`string`):: Number of parallel workers to use for policy evaluation. + *Default*: `4` diff --git a/docs/modules/ROOT/pages/verify-enterprise-contract.adoc b/docs/modules/ROOT/pages/verify-enterprise-contract.adoc index 3dbff6999..8af4427e3 100644 --- a/docs/modules/ROOT/pages/verify-enterprise-contract.adoc +++ b/docs/modules/ROOT/pages/verify-enterprise-contract.adoc @@ -64,8 +64,6 @@ paths can be provided by using the `:` separator. + *Default*: `now` *EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." -*TIMEOUT* (`string`):: This param is deprecated and will be removed in future. Its value is ignored. EC will be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) - *WORKERS* (`string`):: Number of parallel workers to use for policy evaluation. + *Default*: `1` diff --git a/tasks/verify-conforma-konflux-ta/0.1/README.md b/tasks/verify-conforma-konflux-ta/0.1/README.md index ae556eb12..5fda36c63 100644 --- a/tasks/verify-conforma-konflux-ta/0.1/README.md +++ b/tasks/verify-conforma-konflux-ta/0.1/README.md @@ -31,7 +31,6 @@ kubectl apply -f https://raw.githubusercontent.com/conforma/cli/main/tasks/verif * **HOMEDIR**: Value for the HOME environment variable. (default: "/tekton/home") * **EFFECTIVE_TIME**: Run policy checks with the provided time. (default: "now") * **EXTRA_RULE_DATA**: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." (default: "") -* **TIMEOUT**: This param is deprecated and will be removed in future. Its value is ignored. EC will be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) (default: "") * **WORKERS**: Number of parallel workers to use for policy evaluation. This parameter is currently not used. All policy evaluations are run with 35 workers. (default: "35") * **SINGLE_COMPONENT**: Reduce the Snapshot to only the component whose build caused the Snapshot to be created (default: "false") * **SINGLE_COMPONENT_CUSTOM_RESOURCE**: Name, including kind, of the Kubernetes resource to query for labels when single component mode is enabled, e.g. pr/somepipeline. (default: "unknown") diff --git a/tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml b/tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml index 61ee1da93..ca7b4589a 100644 --- a/tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml +++ b/tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml @@ -118,13 +118,6 @@ spec: description: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." default: "" - - name: TIMEOUT - type: string - description: > - This param is deprecated and will be removed in future. Its value is ignored. EC will - be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) - default: "" - - name: WORKERS type: string description: > diff --git a/tasks/verify-conforma-konflux-vsa-ta/0.1/verify-conforma-konflux-vsa-ta.yaml b/tasks/verify-conforma-konflux-vsa-ta/0.1/verify-conforma-konflux-vsa-ta.yaml index 0f4b612f3..d0e17851c 100644 --- a/tasks/verify-conforma-konflux-vsa-ta/0.1/verify-conforma-konflux-vsa-ta.yaml +++ b/tasks/verify-conforma-konflux-vsa-ta/0.1/verify-conforma-konflux-vsa-ta.yaml @@ -132,13 +132,6 @@ spec: key=val,key2=val2 default: "" - - name: TIMEOUT - type: string - description: > - Deprecated; ignored by the task. EC is run without a timeout (use - Tekton timeouts). - default: "" - - name: WORKERS type: string description: Number of parallel workers to use for policy evaluation. diff --git a/tasks/verify-enterprise-contract/0.1/README.md b/tasks/verify-enterprise-contract/0.1/README.md index 5b863daa9..358bb1fed 100644 --- a/tasks/verify-enterprise-contract/0.1/README.md +++ b/tasks/verify-enterprise-contract/0.1/README.md @@ -40,7 +40,6 @@ kubectl apply -f https://raw.githubusercontent.com/conforma/cli/main/tasks/verif * **HOMEDIR**: Value for the HOME environment variable. (default: "/tekton/home") * **EFFECTIVE_TIME**: Run policy checks with the provided time. (default: "now") * **EXTRA_RULE_DATA**: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." (default: "") -* **TIMEOUT**: This param is deprecated and will be removed in future. Its value is ignored. EC will be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) (default: "") * **WORKERS**: Number of parallel workers to use for policy evaluation. (default: "1") * **SINGLE_COMPONENT**: Reduce the Snapshot to only the component whose build caused the Snapshot to be created (default: "false") * **SINGLE_COMPONENT_CUSTOM_RESOURCE**: Name, including kind, of the Kubernetes resource to query for labels when single component mode is enabled, e.g. pr/somepipeline. (default: "unknown") diff --git a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml index 80670c99b..dd53433d7 100644 --- a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml +++ b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml @@ -125,13 +125,6 @@ spec: description: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." default: "" - - name: TIMEOUT - type: string - description: > - This param is deprecated and will be removed in future. Its value is ignored. EC will - be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.) - default: "" - - name: WORKERS type: string description: Number of parallel workers to use for policy evaluation.