pkg/apis: remove duplicate MergeStepsWithStepTemplate function

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
tektoncd · Dec 1, 2020 · ba2d2e7 · ba2d2e7
1 parent 6901140
commit ba2d2e7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 231 deletions.
diff --git a/pkg/apis/pipeline/v1alpha1/merge.go b/pkg/apis/pipeline/v1alpha1/merge.go
diff --git a/pkg/apis/pipeline/v1alpha1/merge_test.go b/pkg/apis/pipeline/v1alpha1/merge_test.go
diff --git a/pkg/apis/pipeline/v1alpha1/task_validation.go b/pkg/apis/pipeline/v1alpha1/task_validation.go
@@ -51,7 +51,7 @@ func (ts *TaskSpec) Validate(ctx context.Context) *apis.FieldError {
 	if err := validateDeclaredWorkspaces(ts.Workspaces, ts.Steps, ts.StepTemplate); err != nil {
 		return err
 	}
-	mergedSteps, err := MergeStepsWithStepTemplate(ts.StepTemplate, ts.Steps)
+	mergedSteps, err := v1beta1.MergeStepsWithStepTemplate(ts.StepTemplate, ts.Steps)
 	if err != nil {
 		return &apis.FieldError{
 			Message: fmt.Sprintf("error merging step template and steps: %s", err),