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 <[email protected]>
tektoncd · Sep 3, 2021 · de79b56 · de79b56
1 parent 6f76b77
commit de79b56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
 	}