Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-v0.26.x] Revert "Follow naming conventions for resourceTemplates" #1694

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/triggerrun/testdata/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
- name: message
description: The message to print
default: This is the default message
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started/triggers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
description: The git repository url
- name: namespace
description: The namespace to create the resources
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
8 changes: 4 additions & 4 deletions docs/triggers-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -2517,7 +2517,7 @@ TriggerTemplateSpec
</tr>
<tr>
<td>
<code>resourceTemplates</code><br/>
<code>resourcetemplates</code><br/>
<em>
<a href="#triggers.tekton.dev/v1alpha1.TriggerResourceTemplate">
[]TriggerResourceTemplate
Expand Down Expand Up @@ -2575,7 +2575,7 @@ TriggerTemplateStatus
</tr>
<tr>
<td>
<code>resourceTemplates</code><br/>
<code>resourcetemplates</code><br/>
<em>
<a href="#triggers.tekton.dev/v1alpha1.TriggerResourceTemplate">
[]TriggerResourceTemplate
Expand Down Expand Up @@ -4634,7 +4634,7 @@ TriggerTemplateSpec
</tr>
<tr>
<td>
<code>resourceTemplates</code><br/>
<code>resourcetemplates</code><br/>
<em>
<a href="#triggers.tekton.dev/v1beta1.TriggerResourceTemplate">
[]TriggerResourceTemplate
Expand Down Expand Up @@ -4692,7 +4692,7 @@ TriggerTemplateStatus
</tr>
<tr>
<td>
<code>resourceTemplates</code><br/>
<code>resourcetemplates</code><br/>
<em>
<a href="#triggers.tekton.dev/v1beta1.TriggerResourceTemplate">
[]TriggerResourceTemplate
Expand Down
2 changes: 1 addition & 1 deletion docs/triggers.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ triggers:
spec:
params:
- name: "my-param-name"
resourceTemplates:
resourcetemplates:
- apiVersion: "tekton.dev/v1beta1"
kind: TaskRun
metadata:
Expand Down
4 changes: 2 additions & 2 deletions docs/triggertemplates.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down Expand Up @@ -96,7 +96,7 @@ A `TriggerTemplate` allows you to declare parameters supplied by the associated
* Tekton applies the value of the `default` field for each entry in the `params` array of your `TriggerTemplate` if it can't find a corresponding
value in the associated `TriggerBinding` or cannot successfully extract the value from an HTTP header or body payload.

* You can reference `tt.params` in the `resourceTemplates` section of your `TriggerTemplate` to make your `TriggerTemplate` reusable.
* You can reference `tt.params` in the `resourcetemplates` section of your `TriggerTemplate` to make your `TriggerTemplate` reusable.

* When you specify parameters in your resource template definitions, Tekton replaces the specified string with the parameter name, for example `$(tt.params.name)`.
Therefore, simple string and number value replacements work fine directly in your YAML file. However, if a string has a numerical prefix, such as `123abcd`,
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/bitbucket-server/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/embedded-trigger/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
params:
- name: sha
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
params:
- name: sha
- name: branch
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/gitlab/gitlab-push-listener.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/label-selector/triggers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/namespace-selector/03_trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/namespacedinterceptor/eventlistener.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/trigger-ref/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1alpha1/triggertemplates/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
- name: aws-codecommit-commit
- name: aws-codecommit-branch
- name: aws-codecommit-useridentity
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
- name: azurerepo-pullreq-html-url
- name: azurerepo-pullreq-title
- name: azurerepo-pullreq-user
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: azurerepo-url
- name: azurerepo-name
- name: pusher-name
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/bitbucket-cloud/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
- name: gitrepourl
- name: gitreponame
- name: pushername
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/bitbucket-server/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/embedded-trigger/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
params:
- name: sha
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
params:
- name: sha
- name: branch
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ metadata:
spec:
params:
- name: changedfiles
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ metadata:
spec:
params:
- name: changedfiles
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ metadata:
spec:
params:
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/gitlab/gitlab-push-listener.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
params:
- name: gitrevision
- name: gitrepositoryurl
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/label-selector/triggers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/namespace-selector/03_trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
spec:
params:
- name: response
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: TaskRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/trigger-ref/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/triggergroups/trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/v1beta1/triggertemplates/triggertemplate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
default: This is the default message
- name: contenttype
description: The Content-Type of the event
resourceTemplates:
resourcetemplates:
- apiVersion: tekton.dev/v1beta1
kind: PipelineRun
metadata:
Expand Down
Loading