From a01f1b13973b29746f933b670c0c370e54124bdc Mon Sep 17 00:00:00 2001 From: Xinru Zhang Date: Mon, 21 Nov 2022 10:43:39 -0500 Subject: [PATCH] TEP-0114 Serve Custom Task Beta This commit reverts https://github.com/tektoncd/pipeline/pull/5736 because we've aligned on TEP-0121 about retries --- cmd/controller/main.go | 4 ++-- cmd/webhook/main.go | 3 +-- config/300-customrun.yaml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/controller/main.go b/cmd/controller/main.go index 36388cda3d6..7b7bd245396 100644 --- a/cmd/controller/main.go +++ b/cmd/controller/main.go @@ -24,6 +24,7 @@ import ( "github.com/tektoncd/pipeline/pkg/apis/pipeline" "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" + "github.com/tektoncd/pipeline/pkg/reconciler/customrun" "github.com/tektoncd/pipeline/pkg/reconciler/pipelinerun" "github.com/tektoncd/pipeline/pkg/reconciler/resolutionrequest" "github.com/tektoncd/pipeline/pkg/reconciler/run" @@ -108,8 +109,7 @@ func main() { pipelinerun.NewController(opts, clock.RealClock{}), run.NewController(), resolutionrequest.NewController(clock.RealClock{}), - // TODO(jerop, abayer) uncomment after we align on retries in customruns - // customrun.NewController(), + customrun.NewController(), ) } diff --git a/cmd/webhook/main.go b/cmd/webhook/main.go index a88ca678ba4..0a66ba12a87 100644 --- a/cmd/webhook/main.go +++ b/cmd/webhook/main.go @@ -59,8 +59,7 @@ var types = map[schema.GroupVersionKind]resourcesemantics.GenericCRD{ v1beta1.SchemeGroupVersion.WithKind("ClusterTask"): &v1beta1.ClusterTask{}, v1beta1.SchemeGroupVersion.WithKind("TaskRun"): &v1beta1.TaskRun{}, v1beta1.SchemeGroupVersion.WithKind("PipelineRun"): &v1beta1.PipelineRun{}, - // TODO(jerop, abayer) uncomment after we align on retries in customruns - // v1beta1.SchemeGroupVersion.WithKind("CustomRun"): &v1beta1.CustomRun{}, + v1beta1.SchemeGroupVersion.WithKind("CustomRun"): &v1beta1.CustomRun{}, // v1 v1.SchemeGroupVersion.WithKind("Task"): &v1.Task{}, v1.SchemeGroupVersion.WithKind("Pipeline"): &v1.Pipeline{}, diff --git a/config/300-customrun.yaml b/config/300-customrun.yaml index 677dd2e6c7d..7508b02eb12 100644 --- a/config/300-customrun.yaml +++ b/config/300-customrun.yaml @@ -26,7 +26,7 @@ spec: preserveUnknownFields: false versions: - name: v1beta1 - served: false + served: true storage: true schema: openAPIV3Schema: