Skip to content

Commit a8f5e62

Browse files
authored
Merge pull request #3093 from robnester-rh/revert_EC_1425
Revert "remove deprecated TIMEOUT parameter from tasks"
2 parents 264a12e + 5815a0f commit a8f5e62

8 files changed

Lines changed: 29 additions & 0 deletions

File tree

docs/modules/ROOT/pages/verify-conforma-konflux-ta.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ paths can be provided by using the `:` separator.
5353
+
5454
*Default*: `now`
5555
*EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
56+
*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.)
57+
5658
*WORKERS* (`string`):: Number of parallel workers to use for policy evaluation.
5759

5860
+

docs/modules/ROOT/pages/verify-conforma-vsa-release-ta.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ registries/Rekor. Multiple paths can be provided using `:`.
5050
*Default*: `now`
5151
*EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Syntax: key=val,key2=val2
5252

53+
*TIMEOUT* (`string`):: Deprecated; ignored by the task. EC is run without a timeout (use Tekton timeouts).
54+
5355
*WORKERS* (`string`):: Number of parallel workers to use for policy evaluation.
5456
+
5557
*Default*: `4`

docs/modules/ROOT/pages/verify-enterprise-contract.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ paths can be provided by using the `:` separator.
6464
+
6565
*Default*: `now`
6666
*EXTRA_RULE_DATA* (`string`):: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
67+
*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.)
68+
6769
*WORKERS* (`string`):: Number of parallel workers to use for policy evaluation.
6870
+
6971
*Default*: `1`

tasks/verify-conforma-konflux-ta/0.1/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ kubectl apply -f https://raw.githubusercontent.com/conforma/cli/main/tasks/verif
3131
* **HOMEDIR**: Value for the HOME environment variable. (default: "/tekton/home")
3232
* **EFFECTIVE_TIME**: Run policy checks with the provided time. (default: "now")
3333
* **EXTRA_RULE_DATA**: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." (default: "")
34+
* **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: "")
3435
* **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")
3536
* **SINGLE_COMPONENT**: Reduce the Snapshot to only the component whose build caused the Snapshot to be created (default: "false")
3637
* **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")

tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ spec:
118118
description: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
119119
default: ""
120120

121+
- name: TIMEOUT
122+
type: string
123+
description: >
124+
This param is deprecated and will be removed in future. Its value is ignored. EC will
125+
be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.)
126+
default: ""
127+
121128
- name: WORKERS
122129
type: string
123130
description: >

tasks/verify-conforma-konflux-vsa-ta/0.1/verify-conforma-konflux-vsa-ta.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,13 @@ spec:
132132
key=val,key2=val2
133133
default: ""
134134

135+
- name: TIMEOUT
136+
type: string
137+
description: >
138+
Deprecated; ignored by the task. EC is run without a timeout (use
139+
Tekton timeouts).
140+
default: ""
141+
135142
- name: WORKERS
136143
type: string
137144
description: Number of parallel workers to use for policy evaluation.

tasks/verify-enterprise-contract/0.1/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ kubectl apply -f https://raw.githubusercontent.com/conforma/cli/main/tasks/verif
4040
* **HOMEDIR**: Value for the HOME environment variable. (default: "/tekton/home")
4141
* **EFFECTIVE_TIME**: Run policy checks with the provided time. (default: "now")
4242
* **EXTRA_RULE_DATA**: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..." (default: "")
43+
* **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: "")
4344
* **WORKERS**: Number of parallel workers to use for policy evaluation. (default: "1")
4445
* **SINGLE_COMPONENT**: Reduce the Snapshot to only the component whose build caused the Snapshot to be created (default: "false")
4546
* **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")

tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ spec:
125125
description: Merge additional Rego variables into the policy data. Use syntax "key=value,key2=value2..."
126126
default: ""
127127

128+
- name: TIMEOUT
129+
type: string
130+
description: >
131+
This param is deprecated and will be removed in future. Its value is ignored. EC will
132+
be run without a timeout. (If you do want to apply a timeout use the Tekton task timeout.)
133+
default: ""
134+
128135
- name: WORKERS
129136
type: string
130137
description: Number of parallel workers to use for policy evaluation.

0 commit comments

Comments
 (0)