From a25cbea797949d1e82cedefa0374666802a3641f Mon Sep 17 00:00:00 2001 From: Shivam Mukhade Date: Fri, 3 Sep 2021 10:41:30 +0530 Subject: [PATCH] Enable TektonInstallerSet on OpenShift This enable the installer set for openshift and in extension update the code to install resources directly instead of using common pkg which has prev install flow, which would break now as older condtions are used in common/install which are now removed for TektonPipeline. Signed-off-by: Shivam Mukhade --- cmd/openshift/operator/main.go | 2 ++ pkg/reconciler/openshift/tektonpipeline/extension.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/openshift/operator/main.go b/cmd/openshift/operator/main.go index dd5362b6ac..246f4208fc 100644 --- a/cmd/openshift/operator/main.go +++ b/cmd/openshift/operator/main.go @@ -17,6 +17,7 @@ limitations under the License. package main import ( + "github.com/tektoncd/operator/pkg/reconciler/kubernetes/tektoninstallerset" "github.com/tektoncd/operator/pkg/reconciler/openshift/tektonaddon" "github.com/tektoncd/operator/pkg/reconciler/openshift/tektonconfig" "github.com/tektoncd/operator/pkg/reconciler/openshift/tektonpipeline" @@ -30,5 +31,6 @@ func main() { tektontrigger.NewController, tektonaddon.NewController, tektonconfig.NewController, + tektoninstallerset.NewController, ) } diff --git a/pkg/reconciler/openshift/tektonpipeline/extension.go b/pkg/reconciler/openshift/tektonpipeline/extension.go index d973302fef..5c8c06ab0c 100644 --- a/pkg/reconciler/openshift/tektonpipeline/extension.go +++ b/pkg/reconciler/openshift/tektonpipeline/extension.go @@ -101,7 +101,8 @@ func (oe openshiftExtension) PreReconcile(ctx context.Context, tc v1alpha1.Tekto return err } - if err := common.Install(ctx, &oe.manifest, tc); err != nil { + // Apply the resources + if err := oe.manifest.Apply(); err != nil { return err }