pkg/apis: remove duplicate MergeStepsWithStepTemplate function

[vdemeester]

Changes

Remove duplicated function MergeStepsWithStepTemplate.

/kind misc

/cc @tektoncd/core-maintainers

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

• Includes tests (if functionality changed/added)
• Includes docs (if user facing)
• Commit messages follow commit message best practices
• Release notes block has been filled in or deleted (only if no user facing changes)

See the contribution guide for more details.

Double check this list of stuff that's easy to miss:

• If you are adding a new binary/image to the cmd dir, please update
  the release Task to build and release this image.

Reviewer Notes

If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.

Release Notes

NONE

[vdemeester]

/retest

[dlorenc]

/lgtm

[ghost]

Looks ok to me but just wanna check - is there a specific motivation for this change? I thought a lot of the code in the v1alpha1 package was intentionally duplicated / aliased?

[vdemeester]

Looks ok to me but just wanna check - is there a specific motivation for this change? I thought a lot of the code in the v1alpha1 package was intentionally duplicated / aliased?

No real motivation except I was looking at some code and this dead code / duplicated code bothered me. Some duplicated code was initially "intentional" when we were storing v1alpha1 object. Now it is less "intentional" and more "it's v1alpha1 so it is less important to modify".

[tekton-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbwsg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• pkg/apis/OWNERS [sbwsg]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment