Repository: tektoncd/operator
Pull request #247 (2021-03-08 07:59:33)

remove all the pipelineresources bases addons
this removed all the task, pipeline templates, pipeline samples
and task snippets which uses pipelineresources

aslo update tasks snippet with MINORVERSION removed

# Changes

<!-- 🎉🎉🎉 Thank you for the PR!!! 🎉🎉🎉 -->

<!-- Describe your changes here- ideally you can get that description straight from
your descriptive commit message(s)! -->

# Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

- [ ] Includes [tests](https://github.com/tektoncd/community/blob/master/standards.md#principles) (if functionality changed/added)
- [ ] Includes [docs](https://github.com/tektoncd/community/blob/master/standards.md#principles) (if user facing)
- [ ] Commit messages follow [commit message best practices](https://github.com/tektoncd/community/blob/master/standards.md#commit-messages)

_See [the contribution guide](https://github.com/tektoncd/operator/blob/master/CONTRIBUTING.md) for more details._

# Release Notes

<!--
Describe any user facing changes here, or delete this block.

Examples of user facing changes:
- API changes
- Bug fixes
- Any changes in behavior
- Changes requiring upgrade notices or deprecation warnings

For pull requests with a release note:

```release-note
Your release note here
```

For pull requests that require additional action from users switching to the new release, include the string "action required" (case insensitive) in the release note:

```release-note
action required: your release note here
```

For pull requests that don't need to be mentioned at release time, use the `/release-note-none` Prow command to add the `release-note-none` label to the PR. You can also write the string "NONE" as a release note in your PR description:

```release-note
NONE
```
-->


tekton-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by:
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **houshengbo**
You can assign the PR to them by writing `/assign @houshengbo` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=tektoncd%2Foperator).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/tektoncd/operator/blob/main/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["houshengbo"]} -->
tekton-robot: The following is the coverage report on the affected files.
Say `/test pull-tekton-operator-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go](https://storage.cloud.google.com/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-go-coverage/1368833770622291968/artifacts/line-cov.html#file0) | 88.5% | 86.2% | -2.3

tekton-robot: The following is the coverage report on the affected files.
Say `/test pull-tekton-operator-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go](https://storage.cloud.google.com/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-go-coverage/1368854657975193602/artifacts/line-cov.html#file0) | 88.5% | 86.2% | -2.3

tekton-robot: The following is the coverage report on the affected files.
Say `/test pull-tekton-operator-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go](https://storage.cloud.google.com/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-go-coverage/1369245861166452737/artifacts/line-cov.html#file0) | 88.5% | 86.2% | -2.3

tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-integration-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-integration-tests/1369245861162258433/) | `/test pull-tekton-operator-integration-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/247). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-integration-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-integration-tests/1369245861162258433/) | `/test pull-tekton-operator-integration-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/247). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-unit-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-unit-tests/1369245861166452736/) | `/test pull-tekton-operator-unit-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/247). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-build-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-build-tests/1369245861162258432/) | `/test pull-tekton-operator-build-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/247). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: @pradeepitm12: The following tests **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-integration-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-integration-tests/1369245861162258433/) | `/test pull-tekton-operator-integration-tests`
pull-tekton-operator-unit-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-unit-tests/1369245861166452736/) | `/test pull-tekton-operator-unit-tests`
pull-tekton-operator-build-tests | a0d7c92fc634162df22c42f879c310232e77d651 | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-build-tests/1369245861162258432/) | `/test pull-tekton-operator-build-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/247). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/tektoncd/operator/pull/247#pullrequestreview-608911581" title="Approved">vdemeester</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=tektoncd%2Foperator).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/tektoncd/operator/blob/main/OWNERS)~~ [vdemeester]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
pradeepitm12: /hold

nikhil-thomas: /lgtm
tekton-robot: New changes are detected. LGTM label has been removed.
pradeepitm12: /hold cancel

tekton-robot: The following is the coverage report on the affected files.
Say `/test pull-tekton-operator-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go](https://storage.cloud.google.com/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-go-coverage/1370352151909371904/artifacts/line-cov.html#file0) | 88.5% | 86.2% | -2.3

tekton-robot: The following is the coverage report on the affected files.
Say `/test pull-tekton-operator-go-coverage` to re-run this coverage report

File | Old Coverage | New Coverage | Delta
---- |:------------:|:------------:|:-----:
[pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go](https://storage.cloud.google.com/tekton-prow/pr-logs/pull/tektoncd_operator/247/pull-tekton-operator-go-coverage/1370366370734149633/artifacts/line-cov.html#file0) | 88.5% | 86.2% | -2.3

nikhil-thomas: /lgtm

Patch:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-task-snippet.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
similarity index 88%
rename from cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-task-snippet.yaml
rename to cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
index 548c41e5f..b4b5d0676 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-task-snippet.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
@@ -2,14 +2,14 @@
 apiVersion: console.openshift.io/v1
 kind: ConsoleYAMLSample
 metadata:
-  name: s2i-java-8-snippet
+  name: s2i-java-snippet
 spec:
   targetResource:
     apiVersion: tekton.dev/v1beta1
     kind: Pipeline
-  title: S2I-Java-8 Workspace based Task
+  title: S2I-Java Workspace based Task
   description: |
-    An s2i task to build java 8 based source.
+    An s2i task to build java based source.
     Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
     S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
     The base S2I container images contains the language runtime and build tools needed for building and running the source code.
@@ -17,7 +17,7 @@ spec:
   yaml: |
     - name: build
       taskRef:
-        name: s2i-java-8
+        name: s2i-java
         kind: ClusterTask
       workspaces:
         - name: source
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-task-snippet.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
similarity index 81%
rename from cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-task-snippet.yaml
rename to cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
index ff89bc2ad..2a66f24c5 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-task-snippet.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
@@ -2,14 +2,14 @@
 apiVersion: console.openshift.io/v1
 kind: ConsoleYAMLSample
 metadata:
-  name: s2i-python-3-snippet
+  name: s2i-python-snippet
 spec:
   targetResource:
     apiVersion: tekton.dev/v1beta1
     kind: Pipeline
-  title: S2I-Python-3 Workspace based Task
+  title: S2I-Python Workspace based Task
   description: |
-    An s2i task to build python 3 based source.
+    An s2i task to build python based source.
     Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
     S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
     The base S2I container images contains the language runtime and build tools needed for building and running the source code.
@@ -17,7 +17,7 @@ spec:
   yaml: |
     - name: build
       taskRef:
-        name: s2i-python-3
+        name: s2i-python
         kind: ClusterTask
       workspaces:
         - name: source
@@ -25,8 +25,8 @@ spec:
       params:
         - name: IMAGE
           value: $(params.IMAGE_NAME)
-        - name: MINOR_VERSION
-          value: "6"
+        - name: VERSION
+          value: "3.8-ubi8"
         - name: PATH_CONTEXT
           value: .
         - name: TLSVERIFY
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-task.yaml
deleted file mode 100644
index d40fbcffc..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/buildah-pr/0.1/buildah-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: buildah-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.14.3"
-    tekton.dev/tags: buildah
-    tekton.dev/displayName: "buildah pipelineresource"
-spec:
-  description: >-
-    Buildah task builds source into a container image and
-    then pushes it to a container registry.
-
-    Buildah Task builds source into a container image using Project Atomic's
-    Buildah build tool.It uses Buildah's support for building from Dockerfiles,
-    using its buildah bud command.This command executes the directives in the
-    Dockerfile to assemble a container image, then pushes that image to a
-    container registry.
-
-  params:
-    - name: BUILDER_IMAGE
-      description: The location of the buildah builder image.
-      default: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-    - name: DOCKERFILE
-      description: Path to the Dockerfile to build.
-      default: ./Dockerfile
-    - name: CONTEXT
-      description: Path to the directory to use as context.
-      default: .
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-    - name: FORMAT
-      description: The format of the built container, oci or docker
-      default: "oci"
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-
-  steps:
-    - name: build
-      image: $(params.BUILDER_IMAGE)
-      workingDir: /workspace/source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--format=$(params.FORMAT)', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '$(params.DOCKERFILE)', '-t', '$(resources.outputs.image.url)', '$(params.CONTEXT)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-    - name: push
-      image: $(params.BUILDER_IMAGE)
-      workingDir: /workspace/source
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-v0-19-0-task.yaml
deleted file mode 100644
index a4987d229..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah-pr/buildah-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/buildah-pr/0.1/buildah-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: buildah-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.14.3"
-    tekton.dev/tags: buildah
-    tekton.dev/displayName: "buildah pipelineresource"
-spec:
-  description: >-
-    Buildah task builds source into a container image and
-    then pushes it to a container registry.
-
-    Buildah Task builds source into a container image using Project Atomic's
-    Buildah build tool.It uses Buildah's support for building from Dockerfiles,
-    using its buildah bud command.This command executes the directives in the
-    Dockerfile to assemble a container image, then pushes that image to a
-    container registry.
-
-  params:
-    - name: BUILDER_IMAGE
-      description: The location of the buildah builder image.
-      default: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-    - name: DOCKERFILE
-      description: Path to the Dockerfile to build.
-      default: ./Dockerfile
-    - name: CONTEXT
-      description: Path to the directory to use as context.
-      default: .
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-    - name: FORMAT
-      description: The format of the built container, oci or docker
-      default: "oci"
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-
-  steps:
-    - name: build
-      image: $(params.BUILDER_IMAGE)
-      workingDir: /workspace/source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--format=$(params.FORMAT)', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '$(params.DOCKERFILE)', '-t', '$(resources.outputs.image.url)', '$(params.CONTEXT)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-    - name: push
-      image: $(params.BUILDER_IMAGE)
-      workingDir: /workspace/source
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-task.yaml
index 83da7246f..8c9f959c4 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-task.yaml
@@ -9,9 +9,9 @@ kind: ClusterTask
 metadata:
   name: buildah
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: image-build
 spec:
   description: >-
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
index 291617be1..7d5afd19b 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/buildah/buildah-v0-19-0-task.yaml
@@ -9,9 +9,9 @@ kind: ClusterTask
 metadata:
   name: buildah-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: image-build
 spec:
   description: >-
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-task.yaml
index 655e9b35d..1da120d45 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-task.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/version: "0.2"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: git
     tekton.dev/displayName: "git clone"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-v0-19-0-task.yaml
index f7a36bf1f..904fa41c1 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/git-clone/git-clone-v0-19-0-task.yaml
@@ -10,7 +10,7 @@ metadata:
   labels:
     app.kubernetes.io/version: "0.2"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: git
     tekton.dev/displayName: "git clone"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-task.yaml
index fb3c50a58..57e8f9898 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: kn
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
 spec:
   description: >-
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-v0-19-0-task.yaml
index dc00a452b..1ca8bc369 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/kn/kn-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: kn-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
 spec:
   description: >-
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-task.yaml
index 6c3a26435..23cf0ff3b 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-task.yaml
@@ -9,9 +9,9 @@ kind: ClusterTask
 metadata:
   name: openshift-client
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
     tekton.dev/displayName: "openshift client"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-v0-19-0-task.yaml
index 94fe6df2e..4654534be 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/openshift-client/openshift-client-v0-19-0-task.yaml
@@ -9,9 +9,9 @@ kind: ClusterTask
 metadata:
   name: openshift-client-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
     tekton.dev/displayName: "openshift client"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml
deleted file mode 100644
index 6144511e4..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-dotnet-3-pr/0.1/s2i-dotnet-3-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-dotnet-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, dotnet
-    tekton.dev/displayName: "s2i dotnet pipelineresource"
-spec:
-  description: >-
-    s2i-dotnet-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a .NET Core builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of .NET imagestream for .NET version
-      default: '3.1-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/dotnet:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml
deleted file mode 100644
index b7a96a0ac..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-dotnet-3-pr/0.1/s2i-dotnet-3-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-dotnet-3-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, dotnet
-    tekton.dev/displayName: "s2i dotnet 3 pipelineresource"
-spec:
-  description: >-
-    s2i-dotnet-3-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a .NET Core 3 builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of .NET imagestream for .NET version
-      default: '3.1-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/dotnet:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
index 3b0f40694..c022dccdc 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-dotnet
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, dotnet, workspace
     tekton.dev/displayName: "s2i dotnet"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
index 58e391518..ac878631d 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-dotnet-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, dotnet, workspace
     tekton.dev/displayName: "s2i dotnet"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-task.yaml
deleted file mode 100644
index 0ee47a7bf..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-go-pr/0.1/s2i-go-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-go-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, go
-    tekton.dev/displayName: "s2i go pipelineresource"
-spec:
-  description: >-
-    s2i-go-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Go builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of go imagestream for go version
-      default: '1.13.4-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/golang:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-v0-19-0-task.yaml
deleted file mode 100644
index da7a280da..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go-pr/s2i-go-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-go-pr/0.1/s2i-go-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-go-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, go
-    tekton.dev/displayName: "s2i go pipelineresource"
-spec:
-  description: >-
-    s2i-go-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Go builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of go imagestream for go version
-      default: '1.13.4-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/golang:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-task.yaml
index 9965bcd2d..820637167 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-go
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, go, workspace
     tekton.dev/displayName: "s2i go"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of go imagestream for go version
-      default: '1.13.4-ubi8'
+      default: '1.14.7-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-v0-19-0-task.yaml
index 8bd931147..09e530548 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-go/s2i-go-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-go-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, go, workspace
     tekton.dev/displayName: "s2i go"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of go imagestream which for go version
-      default: '1.13.4-ubi8'
+      default: '1.14.7-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml
deleted file mode 100644
index 0c12bf8e9..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-java-11-pr/0.1/s2i-java-11-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-java-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, java
-    tekton.dev/displayName: "s2i java pipelineresource"
-spec:
-  description: >-
-    s2i-java-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Java builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of java imagestream for java version
-      default: 'openjdk-11-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-    - name: MAVEN_ARGS_APPEND
-      description: Additional Maven arguments
-      default: ""
-      type: string
-    - name: MAVEN_CLEAR_REPO
-      description: Remove the Maven repository after the artifact is built
-      default: "false"
-      type: string
-    - name: MAVEN_MIRROR_URL
-      description: The base URL of a mirror used for retrieving artifacts
-      default: ""
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: gen-env-file
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /env-params
-      command:
-        - '/bin/sh'
-        - '-c'
-      args:
-        - |-
-          echo "MAVEN_CLEAR_REPO=$(params.MAVEN_CLEAR_REPO)" > env-file
-
-          [[ '$(params.MAVEN_ARGS_APPEND)' != "" ]] &&
-            echo "MAVEN_ARGS_APPEND=$(params.MAVEN_ARGS_APPEND)" >> env-file
-
-          [[ '$(params.MAVEN_MIRROR_URL)' != "" ]] &&
-            echo "MAVEN_MIRROR_URL=$(params.MAVEN_MIRROR_URL)" >> env-file
-
-          echo "Generated Env file"
-          echo "------------------------------"
-          cat env-file
-          echo "------------------------------"
-      volumeMounts:
-        - name: envparams
-          mountPath: /env-params
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command:
-        - 's2i'
-        - 'build'
-        - '$(params.PATH_CONTEXT)'
-        - 'image-registry.openshift-image-registry.svc:5000/openshift/java:$(params.VERSION)'
-        - '--image-scripts-url'
-        - 'image:///usr/local/s2i'
-        - '--as-dockerfile'
-        - '/gen-source/Dockerfile.gen'
-        - '--environment-file'
-        - '/env-params/env-file'
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-        - name: envparams
-          mountPath: /env-params
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
-    - name: envparams
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml
deleted file mode 100644
index 70d9ac82f..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-java-11-pr/0.1/s2i-java-11-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-java-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, java
-    tekton.dev/displayName: "s2i java pipelineresource"
-spec:
-  description: >-
-    s2i-java-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Java builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of java imagestream for java version
-      default: 'openjdk-11-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-    - name: MAVEN_ARGS_APPEND
-      description: Additional Maven arguments
-      default: ""
-      type: string
-    - name: MAVEN_CLEAR_REPO
-      description: Remove the Maven repository after the artifact is built
-      default: "false"
-      type: string
-    - name: MAVEN_MIRROR_URL
-      description: The base URL of a mirror used for retrieving artifacts
-      default: ""
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: gen-env-file
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /env-params
-      command:
-        - '/bin/sh'
-        - '-c'
-      args:
-        - |-
-          echo "MAVEN_CLEAR_REPO=$(params.MAVEN_CLEAR_REPO)" > env-file
-
-          [[ '$(params.MAVEN_ARGS_APPEND)' != "" ]] &&
-            echo "MAVEN_ARGS_APPEND=$(params.MAVEN_ARGS_APPEND)" >> env-file
-
-          [[ '$(params.MAVEN_MIRROR_URL)' != "" ]] &&
-            echo "MAVEN_MIRROR_URL=$(params.MAVEN_MIRROR_URL)" >> env-file
-
-          echo "Generated Env file"
-          echo "------------------------------"
-          cat env-file
-          echo "------------------------------"
-      volumeMounts:
-        - name: envparams
-          mountPath: /env-params
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command:
-        - 's2i'
-        - 'build'
-        - '$(params.PATH_CONTEXT)'
-        - 'image-registry.openshift-image-registry.svc:5000/openshift/java:$(params.VERSION)'
-        - '--image-scripts-url'
-        - 'image:///usr/local/s2i'
-        - '--as-dockerfile'
-        - '/gen-source/Dockerfile.gen'
-        - '--environment-file'
-        - '/env-params/env-file'
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-        - name: envparams
-          mountPath: /env-params
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
-    - name: envparams
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
index d3697e154..5c5c8784d 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-java
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, java, workspace
     tekton.dev/displayName: "s2i java"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
index 4737311d2..c0449a871 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-java-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, java, workspace
     tekton.dev/displayName: "s2i java"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml
deleted file mode 100644
index b7492c3ff..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-nodejs-pr/0.1/s2i-nodejs-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-nodejs-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, nodejs
-    tekton.dev/displayName: "s2i nodejs pipelineresource"
-spec:
-  description: >-
-    s2i-nodejs-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a nodejs builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of nodejs imagestream for nodejs version
-      default: '12-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/nodejs:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml
deleted file mode 100644
index 2ff65ea3b..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-nodejs-pr/0.1/s2i-nodejs-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-nodejs-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, nodejs
-    tekton.dev/displayName: "s2i nodejs pipelineresource"
-spec:
-  description: >-
-    s2i-nodejs-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a nodejs builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of nodejs imagestream for nodejs version
-      default: '12-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/nodejs:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
index 3bed784f7..ed491e0b1 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-nodejs
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, nodejs, workspace
     tekton.dev/displayName: "s2i nodejs"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12-ubi8'
+      default: '14-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
index 8d2e34b1e..aea417112 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-nodejs-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, nodejs, workspace
     tekton.dev/displayName: "s2i nodejs"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12-ubi8'
+      default: '14-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml
deleted file mode 100644
index 68b4c0c19..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-perl-pr/0.1/s2i-perl-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-perl-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, perl
-    tekton.dev/displayName: "s2i perl pipelineresource"
-spec:
-  description: >-
-    s2i-perl-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Perl builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of perl imagestream for perl version
-      default: '5.30-el7'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/perl:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml
deleted file mode 100644
index 089d556ef..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-perl-pr/0.1/s2i-perl-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-perl-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, perl
-    tekton.dev/displayName: "s2i perl pipelineresource"
-spec:
-  description: >-
-    s2i-perl-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Perl builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of perl imagestream for perl version
-      default: '5.30-el7'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/perl:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
index 7f0bff908..fa81d8e96 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-perl
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, perl, workspace
     tekton.dev/displayName: "s2i perl"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30-el7'
+      default: '5.30-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
index 2ea29ab56..60a6eb2ba 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-perl-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, perl, workspace
     tekton.dev/displayName: "s2i perl"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30-el7'
+      default: '5.30-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml
deleted file mode 100644
index 41443895c..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-php-pr/0.1/s2i-php-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-php-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, php
-    tekton.dev/displayName: "s2i php pipelineresource"
-spec:
-  description: >-
-    s2i-php-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a PHP builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of php imagestream for php version
-      default: '7.3-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/php:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml
deleted file mode 100644
index effdd7313..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-php-pr/0.1/s2i-php-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-php-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, php
-    tekton.dev/displayName: "s2i php pipelineresource"
-spec:
-  description: >-
-    s2i-php-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a PHP builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of php imagestream for php version
-      default: '7.3-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/php:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
index cfa3151b1..70272fefb 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-php
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, php, workspace
     tekton.dev/displayName: "s2i php"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3-ubi8'
+      default: '7.4-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
index 5ab7e24b5..b797991da 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-php-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, php, workspace
     tekton.dev/displayName: "s2i php"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3-ubi8'
+      default: '7.4-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml
deleted file mode 100644
index db5b9b1f2..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-python-3-pr/0.1/s2i-python-3-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-python-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, python
-    tekton.dev/displayName: "s2i python 3 pipelineresource"
-spec:
-  description: >-
-    s2i-python-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Python builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of python imagestream for python version
-      default: '3.8-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/python:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml
deleted file mode 100644
index 437d70b83..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-python-3-pr/0.1/s2i-python-3-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-python-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, python
-    tekton.dev/displayName: "s2i python pipelineresource"
-spec:
-  description: >-
-    s2i-python-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Python builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of python imagestream for python version
-      default: '3.8-ubi8'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/python:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
index 258207b7d..eb736429d 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-python
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, python, workspace
     tekton.dev/displayName: "s2i python"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
index da6a4a9d4..e35800bec 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-python-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, python, workspace
     tekton.dev/displayName: "s2i python"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml
deleted file mode 100644
index 72f2dcbb3..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-ruby-pr/0.1/s2i-ruby-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-ruby-pr
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, ruby
-    tekton.dev/displayName: "s2i ruby pipelineresource"
-spec:
-  description: >-
-    s2i-ruby-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Ruby builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of ruby imagestream for ruby version
-      default: '2.7-ubi7'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/ruby:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml
deleted file mode 100644
index fb0eac429..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# auto generated by script/update-tasks.sh
-# DO NOT EDIT: use the script instead
-# source: https://raw.githubusercontent.com/openshift/pipelines-catalog/release-v0.19/task/s2i-ruby-pr/0.1/s2i-ruby-pr.yaml
-#
----
-apiVersion: tekton.dev/v1beta1
-kind: ClusterTask
-metadata:
-  name: s2i-ruby-pr-v0-19-0
-  labels:
-    app.kubernetes.io/version: "0.1"
-  annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
-    tekton.dev/tags: s2i, ruby
-    tekton.dev/displayName: "s2i ruby pipelineresource"
-spec:
-  description: >-
-    s2i-ruby-pr task fetches a Git repository and builds and
-    pushes a container image using S2I and a Ruby builder image.
-
-  params:
-    - name: VERSION
-      description: The tag of ruby imagestream for ruby version
-      default: '2.7-ubi7'
-      type: string
-    - name: PATH_CONTEXT
-      description: The location of the path to run s2i from.
-      default: .
-      type: string
-    - name: TLSVERIFY
-      description: Verify the TLS on the registry endpoint (for push/pull to a non-TLS registry)
-      default: "true"
-      type: string
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: image
-        type: image
-  steps:
-    - name: generate
-      image: registry.redhat.io/ocp-tools-43-tech-preview/source-to-image-rhel8@sha256:9c761a0a0bb607913fbc04d3d435c70a6f90900583b52bd0e6a6187dad3f90cb
-      workingDir: /workspace/source
-      command: ['s2i', 'build', '$(params.PATH_CONTEXT)', 'image-registry.openshift-image-registry.svc:5000/openshift/ruby:$(params.VERSION)', '--as-dockerfile', '/gen-source/Dockerfile.gen']
-      volumeMounts:
-        - name: gen-source
-          mountPath: /gen-source
-    - name: build
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      workingDir: /gen-source
-      command: ['buildah', 'bud', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '$(resources.outputs.image.url)', '.']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-        - name: gen-source
-          mountPath: /gen-source
-    - name: push
-      image: registry.redhat.io/rhel8/buildah@sha256:785f0d039113ba978c4ee467f0554de7b72411b5c555a16abe60062759799497
-      command: ['buildah', 'push', '--storage-driver=vfs', '--tls-verify=$(params.TLSVERIFY)', '$(resources.outputs.image.url)', 'docker://$(resources.outputs.image.url)']
-      volumeMounts:
-        - name: varlibcontainers
-          mountPath: /var/lib/containers
-  volumes:
-    - name: varlibcontainers
-      emptyDir: {}
-    - name: gen-source
-      emptyDir: {}
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
index 0b3ecef23..284c672e5 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-ruby
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, ruby, workspace
     tekton.dev/displayName: "s2i ruby"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7-ubi7'
+      default: '2.7-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
index f4e646130..c9b391c79 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: s2i-ruby-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.11.3"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: s2i, ruby, workspace
     tekton.dev/displayName: "s2i ruby"
 spec:
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7-ubi7'
+      default: '2.7-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-task.yaml
index 8e81e7dda..6364ab8d4 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: skopeo-copy
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
     tekton.dev/displayName: "skopeo copy"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-v0-19-0-task.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-v0-19-0-task.yaml
index 2b6f907ba..70e73581e 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-v0-19-0-task.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/addons/02-clustertasks/skopeo-copy/skopeo-copy-v0-19-0-task.yaml
@@ -8,9 +8,9 @@ kind: ClusterTask
 metadata:
   name: skopeo-copy-v0-19-0
   labels:
-    app.kubernetes.io/version: "0.1"
+    app.kubernetes.io/version: "1.4.0"
   annotations:
-    tekton.dev/pipelines.minVersion: "0.12.1"
+    tekton.dev/pipelines.minVersion: "0.19"
     tekton.dev/tags: cli
     tekton.dev/displayName: "skopeo copy"
 spec:
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/docker_build_deploy_pr.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/docker_build_deploy_pr.yaml
deleted file mode 100644
index 9e8d578dc..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/docker_build_deploy_pr.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: docker-build-and-deploy-pipeline-pr
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: docker-build-and-deploy-pipeline-using-pipeline-resource
-  description: An example of docker build and deploy pipeline using Pipeline Resource
-  snippet: false
-  yaml: |
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-    metadata:
-      name: docker-build-and-deploy-pr
-    spec:
-      params:
-        - name: IMAGE_NAME
-          type: string
-      resources:
-        - name: app-source
-          type: git
-        - name: app-image
-          type: image
-
-      tasks:
-        - name: build
-          taskRef:
-            name: buildah-pr
-            kind: ClusterTask
-          resources:
-            inputs:
-              - name: source
-                resource: app-source
-            outputs:
-              - name: image
-                resource: app-image
-          params:
-            - name: TLSVERIFY
-              value: "false"
-
-        - name: deploy
-          taskRef:
-            name: openshift-client
-            kind: ClusterTask
-          runAfter:
-            - build
-          params:
-            - name: ARGS
-              value:
-                - "new-app"
-                - "--docker-image"
-                - "$(params.IMAGE_NAME)"
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/s2i_build_deploy-pr.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/s2i_build_deploy-pr.yaml
deleted file mode 100644
index 4d0449c4b..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/pipelinesamples/s2i_build_deploy-pr.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: s2i-build-and-deploy-pipeline-pr
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: s2i-build-and-deploy-pipeline-using-pipeline-resource
-  description: An example of s2i build and deploy pipeline using Pipeline Resource
-  snippet: false
-  yaml: |
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-    metadata:
-      name: s2i-build-and-deploy-pr
-    spec:
-      params:
-        - name: IMAGE_NAME
-          type: string
-      resources:
-        - name: app-source
-          type: git
-        - name: app-image
-          type: image
-
-      tasks:
-        - name: build
-          taskRef:
-            name: s2i-java-8-pr
-            kind: ClusterTask
-          resources:
-            inputs:
-              - name: source
-                resource: app-source
-            outputs:
-              - name: image
-                resource: app-image
-          params:
-            - name: TLSVERIFY
-              value: "false"
-
-        - name: deploy
-          taskRef:
-            name: openshift-client
-            kind: ClusterTask
-          runAfter:
-            - build
-          params:
-            - name: ARGS
-              value:
-                - "new-app"
-                - "--docker-image"
-                - "$(params.IMAGE_NAME)"
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/buildah-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/buildah-pr-task-snippet.yaml
deleted file mode 100644
index 4a6e530a1..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/buildah-pr-task-snippet.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: buildah-pr-snippet
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: Buildah Pipeline Resource based Task
-  description: |
-    Buildash task builds the source into a container image Project Atomic's Buildah build tool.
-    It uses Buildah's support for building from Dockerfiles, using its buildah bud command.
-    This command executes the directives in the Dockerfile to assemble a container image, then pushes that image to a container registry.
-  snippet: true
-  yaml: |
-    - name: build
-      taskRef:
-        name: buildah-pr
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-        params:
-          - name: BUILDER_IMAGE
-            value: registry.redhat.io/rhel8/buildah
-          - name: DOCKERFILE
-            value: ./Dockerfile
-          - name: TLSVERIFY
-            value: "true"
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-pr-task-snippet.yaml
deleted file mode 100644
index c3cea003e..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-pr-task-snippet.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: s2i-java-11-pr-snippet
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: S2I-Java-11 Pipeline Resource based Task
-  description: |
-    An s2i task to build java 11 based source.
-    Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
-    S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
-    The base S2I container images contains the language runtime and build tools needed for building and running the source code.
-  snippet: true
-  yaml: |
-    - name: build
-      taskRef:
-        name: s2i-java-11-pr
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-        - name: PATH_CONTEXT
-          value: .
-        - name: TLSVERIFY
-          value: "true"
-        - name: MAVEN_ARGS_APPEND
-          value: ""
-        - name: MAVEN_CLEAR_REPO
-          value: "false"
-        - name: MAVEN_MIRROR_URL
-          value: ""
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-pr-task-snippet.yaml
deleted file mode 100644
index 7db4b5f50..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-8-pr-task-snippet.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: s2i-java-8-pr-snippet
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: S2I-Java-8 Pipeline Resource based Task
-  description: |
-    An s2i task to build java 8 based source.
-    Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
-    S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
-    The base S2I container images contains the language runtime and build tools needed for building and running the source code.
-  snippet: true
-  yaml: |
-    - name: build
-      taskRef:
-        name: s2i-java-8-pr
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-        - name: PATH_CONTEXT
-          value: .
-        - name: TLSVERIFY
-          value: "true"
-        - name: MAVEN_ARGS_APPEND
-          value: ""
-        - name: MAVEN_CLEAR_REPO
-          value: "false"
-        - name: MAVEN_MIRROR_URL
-          value: ""
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
similarity index 88%
rename from cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-task-snippet.yaml
rename to cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
index f2530c8a4..b4b5d0676 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-11-task-snippet.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-java-task-snippet.yaml
@@ -2,14 +2,14 @@
 apiVersion: console.openshift.io/v1
 kind: ConsoleYAMLSample
 metadata:
-  name: s2i-java-11-snippet
+  name: s2i-java-snippet
 spec:
   targetResource:
     apiVersion: tekton.dev/v1beta1
     kind: Pipeline
-  title: S2I-Java-11 Workspace based Task
+  title: S2I-Java Workspace based Task
   description: |
-    An s2i task to build java 11 based source.
+    An s2i task to build java based source.
     Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
     S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
     The base S2I container images contains the language runtime and build tools needed for building and running the source code.
@@ -17,7 +17,7 @@ spec:
   yaml: |
     - name: build
       taskRef:
-        name: s2i-java-11
+        name: s2i-java
         kind: ClusterTask
       workspaces:
         - name: source
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-pr-task-snippet.yaml
deleted file mode 100644
index cb596059d..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-pr-task-snippet.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: s2i-nodejs-pr-snippet
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: S2I-Nodejs Task
-  description: |
-    An s2i task to build nodejs based source.
-    Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
-    S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
-    The base S2I container images contains the language runtime and build tools needed for building and running the source code.
-  snippet: true
-  yaml: |
-    - name: build
-      taskRef:
-        name: s2i-nodejs-pr
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-          - name: VERSION
-            value: "8"
-          - name: PATH_CONTEXT
-            value: .
-          - name: TLSVERIFY
-            value: "true"
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-task-snippet.yaml
index c5a30c99d..fe1ca6639 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-task-snippet.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-nodejs-task-snippet.yaml
@@ -26,7 +26,7 @@ spec:
         - name: IMAGE
           value: $(params.IMAGE_NAME)
         - name: VERSION
-          value: "8"
+          value: "14-ubi8"
         - name: PATH_CONTEXT
           value: .
         - name: TLSVERIFY
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-pr-task-snippet.yaml
deleted file mode 100644
index c200e4558..000000000
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-3-pr-task-snippet.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-apiVersion: console.openshift.io/v1
-kind: ConsoleYAMLSample
-metadata:
-  name: s2i-python-3-pr-snippet
-spec:
-  targetResource:
-    apiVersion: tekton.dev/v1beta1
-    kind: Pipeline
-  title: S2I-Python-3 Pipeline Resource based Task
-  description: |
-    An s2i task to build python 3 based source.
-    Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
-    S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
-    The base S2I container images contains the language runtime and build tools needed for building and running the source code.
-  snippet: true
-  yaml: |
-    - name: build
-      taskRef:
-        name: s2i-python-3-pr
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-        - name: MINOR_VERSION
-          value: "6"
-        - name: PATH_CONTEXT
-          value: .
-        - name: TLSVERIFY
-          value: "true"
diff --git a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-go-pr-task-snippet.yaml b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
similarity index 70%
rename from cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-go-pr-task-snippet.yaml
rename to cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
index 6906abbb0..2a66f24c5 100644
--- a/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-go-pr-task-snippet.yaml
+++ b/cmd/openshift/operator/kodata/tekton-addon/0.0.1/optional/samples/tasksnippets/s2i-python-task-snippet.yaml
@@ -2,32 +2,31 @@
 apiVersion: console.openshift.io/v1
 kind: ConsoleYAMLSample
 metadata:
-  name: s2i-go-pr-snippet
+  name: s2i-python-snippet
 spec:
   targetResource:
     apiVersion: tekton.dev/v1beta1
     kind: Pipeline
-  title: S2I-Go Pipeline Resource based Task
+  title: S2I-Python Workspace based Task
   description: |
-    An s2i task to build go based source.
+    An s2i task to build python based source.
     Source-to-Image (S2I) is a toolkit and workflow for building reproducible container images from source code.
     S2I produces images by injecting source code into a base S2I container image and letting the container prepare that source code for execution.
     The base S2I container images contains the language runtime and build tools needed for building and running the source code.
-
   snippet: true
   yaml: |
     - name: build
       taskRef:
-        name: s2i-go-pr
+        name: s2i-python
         kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
+      workspaces:
+        - name: source
+          workspace: workspace
       params:
+        - name: IMAGE
+          value: $(params.IMAGE_NAME)
+        - name: VERSION
+          value: "3.8-ubi8"
         - name: PATH_CONTEXT
           value: .
         - name: TLSVERIFY
diff --git a/cmd/openshift/operator/kodata/tekton-pipeline-template/pipeline_using_resource.yaml b/cmd/openshift/operator/kodata/tekton-pipeline-template/pipeline_using_resource.yaml
deleted file mode 100644
index b1cb2aa66..000000000
--- a/cmd/openshift/operator/kodata/tekton-pipeline-template/pipeline_using_resource.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: tekton.dev/v1beta1
-kind: Pipeline
-metadata:
-  namespace: openshift
-spec:
-  params:
-    - name: APP_NAME
-      type: string
-    - name: PATH_CONTEXT
-      type: string
-      default: .
-  resources:
-    - name: app-source
-      type: git
-    - name: app-image
-      type: image
-
-  tasks:
-    - name: build
-      taskRef:
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-        - name: TLSVERIFY
-          value: "false"
-
-    - name: deploy
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
index 397344f4d..a4da7bd76 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
@@ -50,13 +50,13 @@ const (
 var (
 	Runtimes = map[string]RuntimeSpec{
 		"s2i-dotnet": {Runtime: "dotnet", Version: "$(params.VERSION)", Default: "3.1-ubi8"},
-		"s2i-go":     {Runtime: "golang", Version: "$(params.VERSION)", Default: "1.13.4-ubi8"},
+		"s2i-go":     {Runtime: "golang", Version: "$(params.VERSION)", Default: "1.14.7-ubi8"},
 		"s2i-java":   {Runtime: "java", Version: "$(params.VERSION)", Default: "openjdk-11-ubi8"},
-		"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "12-ubi8"},
-		"s2i-perl":   {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30-el7"},
-		"s2i-php":    {Runtime: "php", Version: "$(params.VERSION)", Default: "7.3-ubi8"},
+		"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "14-ubi8"},
+		"s2i-perl":   {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30-ubi8"},
+		"s2i-php":    {Runtime: "php", Version: "$(params.VERSION)", Default: "7.4-ubi8"},
 		"s2i-python": {Runtime: "python", Version: "$(params.VERSION)", Default: "3.8-ubi8"},
-		"s2i-ruby":   {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7-ubi7"},
+		"s2i-ruby":   {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7-ubi8"},
 		"buildah":    {},
 	}
 )
@@ -81,21 +81,6 @@ func GeneratePipelineTemplates(templatePath string, manifest *mf.Manifest) error
 	}
 	pipelines = append(pipelines, wps...)
 
-	resourcedTemplate, err := mf.NewManifest(path.Join(templatePath, "pipeline_using_resource.yaml"))
-	if err != nil {
-		return err
-	}
-
-	resourcedTaskGenerators := []taskGenerator{
-		&pipeline{environment: "openshift", nameSuffix: "", generateDeployTask: openshiftDeployTask},
-		&pipeline{environment: "kubernetes", nameSuffix: "-deployment", generateDeployTask: kubernetesDeployTask},
-		&pipeline{environment: "knative", nameSuffix: "-knative", generateDeployTask: knativeResourcedDeployTask},
-	}
-	rps, err := generateBasePipeline(resourcedTemplate, resourcedTaskGenerators, usingPipelineResource)
-	if err != nil {
-		return err
-	}
-	pipelines = append(pipelines, rps...)
 	generatedPipelines, err := mf.ManifestFrom(mf.Slice(pipelines), mf.UseClient(manifest.Client))
 	if err != nil {
 		return err
@@ -158,19 +143,6 @@ func knativeDeployTask(deployTask map[string]interface{}) map[string]interface{}
 	return deployTask
 }
 
-func knativeResourcedDeployTask(deployTask map[string]interface{}) map[string]interface{} {
-	deployTask["name"] = "kn-service-create"
-	deployTask["taskRef"] = map[string]interface{}{"name": "kn", "kind": "ClusterTask"}
-	deployTask["runAfter"] = []interface{}{"build"}
-	deployTask["resources"] = map[string]interface{}{
-		"inputs": []interface{}{map[string]interface{}{"name": "image", "resource": "app-image", "from": []interface{}{"build"}}},
-	}
-	deployTask["params"] = []interface{}{
-		map[string]interface{}{"name": "ARGS", "value": []interface{}{"service", "create", "$(params.APP_NAME)", "--image=$(resources.inputs.image.url)", "--force"}},
-	}
-	return deployTask
-}
-
 func generateBasePipeline(template mf.Manifest, taskGenerators []taskGenerator, usingPipelineResource bool) ([]unstructured.Unstructured, error) {
 	var pipelines []unstructured.Unstructured
 
@@ -203,10 +175,6 @@ func generateBasePipeline(template mf.Manifest, taskGenerators []taskGenerator,
 
 		taskName := name
 		var index = 1
-		if usingPipelineResource {
-			index = 0
-			taskName += "-pr"
-		}
 
 		taskBuild := tasks.([]interface{})[index].(map[string]interface{})
 		taskBuild["taskRef"] = map[string]interface{}{"name": taskName, "kind": "ClusterTask"}


Test patch:
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates_test.go b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates_test.go
index 9abcd38be..e331505fa 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates_test.go
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates_test.go
@@ -17,7 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
-func TestSomething(t *testing.T) {
+func TestGeneratePipelineTemplates(t *testing.T) {
 	addonLocation := filepath.Join("testdata")
 	var (
 		configName = "cluster"
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-deployment-pr.golden
deleted file mode 100644
index bc4a1396d..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/strategy":"docker","pipeline.openshift.io/type":"kubernetes"},"name":"buildah-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"CONTEXT","value":"$(params.PATH_CONTEXT)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"buildah-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-knative-pr.golden
deleted file mode 100644
index bf2530647..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/strategy":"docker","pipeline.openshift.io/type":"knative"},"name":"buildah-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"CONTEXT","value":"$(params.PATH_CONTEXT)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"buildah-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-pr.golden
deleted file mode 100644
index 96b8394a3..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/buildah-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/strategy":"docker","pipeline.openshift.io/type":"openshift"},"name":"buildah-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"CONTEXT","value":"$(params.PATH_CONTEXT)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"buildah-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/pipeline_using_resource.yaml b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/pipeline_using_resource.yaml
deleted file mode 100644
index b1cb2aa66..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/pipeline_using_resource.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-apiVersion: tekton.dev/v1beta1
-kind: Pipeline
-metadata:
-  namespace: openshift
-spec:
-  params:
-    - name: APP_NAME
-      type: string
-    - name: PATH_CONTEXT
-      type: string
-      default: .
-  resources:
-    - name: app-source
-      type: git
-    - name: app-image
-      type: image
-
-  tasks:
-    - name: build
-      taskRef:
-        kind: ClusterTask
-      resources:
-        inputs:
-          - name: source
-            resource: app-source
-        outputs:
-          - name: image
-            resource: app-image
-      params:
-        - name: TLSVERIFY
-          value: "false"
-
-    - name: deploy
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden
deleted file mode 100644
index ddefd9a14..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden
deleted file mode 100644
index 8987d5c88..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden
deleted file mode 100644
index 742e911d9..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"openshift"},"name":"s2i-dotnet-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment-pr.golden
deleted file mode 100644
index 6dbf5d185..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-go-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-go-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment.golden
index 182be8fb8..3b6f6ea23 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-go-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-go-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.14.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative-pr.golden
deleted file mode 100644
index 636a8da7d..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"knative"},"name":"s2i-go-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-go-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative.golden
index 7f40a1c42..832ede9ac 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"knative"},"name":"s2i-go-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"knative"},"name":"s2i-go-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.14.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-pr.golden
deleted file mode 100644
index ba6af327f..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"openshift"},"name":"s2i-go-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-go-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go.golden
index 8795d9369..0c1f1b469 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-go.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"openshift"},"name":"s2i-go","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.13.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"golang","pipeline.openshift.io/type":"openshift"},"name":"s2i-go","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"1.14.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-go"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden
deleted file mode 100644
index d096d0391..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-java-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden
deleted file mode 100644
index 239b9d394..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden
deleted file mode 100644
index cb089f2a2..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"openshift"},"name":"s2i-java-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden
deleted file mode 100644
index 72edb0a7b..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
index ebe16e0fd..8c28dc637 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"14-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden
deleted file mode 100644
index 5a359cb7f..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
index 220cceec9..3bfef590f 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"14-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
index d1b3b646c..fb18cf1fb 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"14-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden
deleted file mode 100644
index cfac51057..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
index 0c2dd3d80..56021d3ca 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden
deleted file mode 100644
index 4a0c0ce52..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
index ce64d2ba2..5d8d66b0f 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
index 1af20f128..5c586fedb 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden
deleted file mode 100644
index c0b18281c..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
index b7eb000fd..991c495a8 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden
deleted file mode 100644
index 2ac4ab58d..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
index cd4e0073b..d06feb121 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
index 68d162ba5..b5d57aa24 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.4-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden
deleted file mode 100644
index 2960acb42..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-python-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden
deleted file mode 100644
index de953f944..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"knative"},"name":"s2i-python-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden
deleted file mode 100644
index 896f3a681..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"openshift"},"name":"s2i-python-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden
deleted file mode 100644
index 2247d8ef5..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
index f196aa74b..daaaa9555 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden
deleted file mode 100644
index b3097a6c7..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
index 73c5860bc..bde21e27f 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden
deleted file mode 100644
index 0c352e62e..000000000
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden
+++ /dev/null
@@ -1,1 +0,0 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
index 85282647e..617df8f30 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}