Add internal direct bundle install method

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Author: Per Goncalves da Silva

cmd/operator-controller/main.go

@@ -24,10 +24,13 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"time"
 
+	bsemver "github.com/blang/semver/v4"
+	"github.com/distribution/reference"
 	"github.com/spf13/cobra"
 	"go.podman.io/image/v5/types"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -58,6 +61,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
+	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/action"
@@ -85,6 +89,11 @@ import (
 	"github.com/operator-framework/operator-controller/internal/shared/version"
 )
 
+const (
+	directBundleInstallImageAnnotation   = "olm.operatorframework.io/bundle-image"
+	directBundleInstallVersionAnnotation = "olm.operatorframework.io/bundle-version"
+)
+
 var (
 	setupLog               = ctrl.Log.WithName("setup")
 	defaultSystemNamespace = "olmv1-system"
@@ -394,7 +403,7 @@ func run() error {
 		return httputil.BuildHTTPClient(cpwCatalogd)
 	})
 
-	resolver := &resolve.CatalogResolver{
+	catalogResolver := &resolve.CatalogResolver{
 		WalkCatalogsFunc: resolve.CatalogWalker(
 			func(ctx context.Context, option ...client.ListOption) ([]ocv1.ClusterCatalog, error) {
 				var catalogs ocv1.ClusterCatalogList
@@ -410,6 +419,28 @@ func run() error {
 		},
 	}
 
+	var resolver resolve.Func = func(ctx context.Context, ext *ocv1.ClusterExtension, installedBundle *ocv1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
+		if features.OperatorControllerFeatureGate.Enabled(features.DirectBundleInstall) &&
+			ext.Annotations != nil && ext.Annotations[directBundleInstallImageAnnotation] != "" &&
+			ext.Annotations[directBundleInstallVersionAnnotation] != "" {
+			bundleImageRef := ext.Annotations[directBundleInstallImageAnnotation]
+
+			ref, err := reference.ParseNamed(bundleImageRef)
+			if err != nil {
+				return nil, nil, nil, err
+			}
+
+			packageName := path.Base(ref.Name())
+			bundleVersion := bsemver.MustParse(ext.Annotations[directBundleInstallVersionAnnotation])
+			return &declcfg.Bundle{
+				Package: packageName,
+				Image:   bundleImageRef,
+			}, &bundleVersion, nil, nil
+		} else {
+			return catalogResolver.Resolve(ctx, ext, installedBundle)
+		}
+	}
+
 	aeClient, err := apiextensionsv1client.NewForConfig(mgr.GetConfig())
 	if err != nil {
 		setupLog.Error(err, "unable to create apiextensions client")

internal/operator-controller/features/features.go

@@ -18,6 +18,7 @@ const (
 	WebhookProviderOpenshiftServiceCA featuregate.Feature = "WebhookProviderOpenshiftServiceCA"
 	HelmChartSupport                  featuregate.Feature = "HelmChartSupport"
 	BoxcutterRuntime                  featuregate.Feature = "BoxcutterRuntime"
+	DirectBundleInstall               featuregate.Feature = "DirectBundleInstall"
 )
 
 var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
@@ -80,6 +81,13 @@ var operatorControllerFeatureGates = map[featuregate.Feature]featuregate.Feature
 		PreRelease:    featuregate.Alpha,
 		LockToDefault: false,
 	},
+
+	// DirectBundleInstall allows for direct bundle installation via annotation
+	DirectBundleInstall: {
+		Default:       false,
+		PreRelease:    featuregate.Alpha,
+		LockToDefault: false,
+	},
 }
 
 var OperatorControllerFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()