use the most recent rukpak unpacker changes

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

api/core/v1alpha1/catalog_types.go

@@ -65,16 +65,27 @@ type CatalogList struct {
 type CatalogSpec struct {
 	// Source is the source of a Catalog that contains Operators' metadata in the FBC format
 	// https://olm.operatorframework.io/docs/reference/file-based-catalogs/#docs
-	Source source.BundleSource `json:"source"`
+	Source CatalogSource `json:"source"`
+}
+
+// CatalogSource contains the sourcing information for a Catalog
+type CatalogSource struct {
+	// Type defines the source type for this catalog.
+	Type source.SourceType `json:"type"`
+
+	Image      *source.ImageSource      `json:"image,omitempty"`
+	Git        *source.GitSource        `json:"git,omitempty"`
+	ConfigMaps []source.ConfigMapSource `json:"configMaps,omitempty"`
+	HTTP       *source.HTTPSource       `json:"http,omitempty"`
 }
 
 // CatalogStatus defines the observed state of Catalog
 type CatalogStatus struct {
 	// Conditions store the status conditions of the Catalog instances
 	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
 
-	ResolvedSource *source.BundleSource `json:"resolvedSource,omitempty"`
-	Phase          string               `json:"phase,omitempty"`
+	ResolvedSource *source.Source `json:"resolvedSource,omitempty"`
+	Phase          string         `json:"phase,omitempty"`
 }
 
 func init() {

cmd/manager/main.go

@@ -17,13 +17,13 @@ limitations under the License.
 package main
 
 import (
-	"crypto/x509"
 	"flag"
 	"fmt"
 	"os"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
+	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -106,35 +106,34 @@ func main() {
 		os.Exit(1)
 	}
 
-	unpackerOpts := source.DefaultUnpackerOptions{
-		Cluster: mgr,
-		RootCAs: &x509.CertPool{},
-		ImageUnpackerOptions: []source.ImageUnpackerOption{
-			source.WithBundleDir("/configs"),
-			source.WithFieldManager("catalogd-core"),
+	kubeClient, err := kubernetes.NewForConfig(mgr.GetConfig())
+	if err != nil {
+		setupLog.Error(err, "unable to setup kube client")
+		os.Exit(1)
+	}
+
+	unpacker := source.NewUnpacker(map[source.SourceType]source.Unpacker{
+		source.SourceTypeImage: source.NewImageUnpacker(
+			mgr.GetClient(),
+			kubeClient,
 			source.WithPodNamespace(sysNs),
+			source.WithFieldManager("catalogd-core"),
 			source.WithUnpackImage(unpackImage),
-		},
-		GitUnpackerOptions: []source.GitUnpackerOption{
+			source.WithDir("/configs"),
+		),
+		source.SourceTypeGit: source.NewGitUnpacker(
+			mgr.GetClient(),
 			source.WithGitSecretNamespace(sysNs),
-		},
-		ConfigMapUnpackerOptions: []source.ConfigMapUnpackerOption{
+		),
+		source.SourceTypeConfigMaps: source.NewConfigMapUnpacker(
+			mgr.GetClient(),
 			source.WithConfigMapNamespace(sysNs),
-		},
-		UploadUnpackerOptions: []source.UploadUnpackerOption{
-			source.WithBaseDownloadURL(""),
-			source.WithBearerToken(mgr.GetConfig().BearerToken),
-		},
-		HTTPUnpackerOptions: []source.HTTPUnpackerOption{
+		),
+		source.SourceTypeHTTP: source.NewHTTPUnpacker(
+			mgr.GetClient(),
 			source.WithHTTPSecretNamespace(sysNs),
-		},
-	}
-
-	unpacker, err := source.NewDefaultUnpacker(unpackerOpts)
-	if err != nil {
-		setupLog.Error(err, "unable to create unpacker")
-		os.Exit(1)
-	}
+		),
+	})
 
 	if err = (&corecontrollers.CatalogReconciler{
 		Client:   mgr.GetClient(),

config/crd/bases/catalogd.operatorframework.io_catalogs.yaml

@@ -39,8 +39,6 @@ spec:
                   metadata in the FBC format https://olm.operatorframework.io/docs/reference/file-based-catalogs/#docs
                 properties:
                   configMaps:
-                    description: ConfigMaps is a list of config map references and
-                      their relative directory paths that represent a bundle filesystem.
                     items:
                       properties:
                         configMap:
@@ -63,8 +61,6 @@ spec:
                       type: object
                     type: array
                   git:
-                    description: Git is the git repository that backs the content
-                      of this Bundle.
                     properties:
                       auth:
                         description: Auth configures the authorization method if necessary.
@@ -136,8 +132,6 @@ spec:
                     - repository
                     type: object
                   http:
-                    description: HTTP is the remote location that backs the content
-                      of this Bundle.
                     properties:
                       auth:
                         description: Auth configures the authorization method if necessary.
@@ -179,8 +173,6 @@ spec:
                     - url
                     type: object
                   image:
-                    description: Image is the bundle image that backs the content
-                      of this bundle.
                     properties:
                       pullSecret:
                         description: ImagePullSecretName contains the name of the
@@ -195,15 +187,8 @@ spec:
                     - ref
                     type: object
                   type:
-                    description: Type defines the kind of Bundle content being sourced.
+                    description: Type defines the source type for this catalog.
                     type: string
-                  upload:
-                    description: Upload is a source that enables this Bundle's content
-                      to be uploaded via Rukpak's bundle upload service. This source
-                      type is primarily useful with bundle development workflows because
-                      it enables bundle developers to inject a local bundle directly
-                      into the cluster.
-                    type: object
                 required:
                 - type
                 type: object
@@ -286,11 +271,10 @@ spec:
               phase:
                 type: string
               resolvedSource:
-                description: 'TODO: Rename this. Source?'
                 properties:
                   configMaps:
                     description: ConfigMaps is a list of config map references and
-                      their relative directory paths that represent a bundle filesystem.
+                      their relative directory paths that represent a source filesystem.
                     items:
                       properties:
                         configMap:
@@ -314,7 +298,7 @@ spec:
                     type: array
                   git:
                     description: Git is the git repository that backs the content
-                      of this Bundle.
+                      of this Source.
                     properties:
                       auth:
                         description: Auth configures the authorization method if necessary.
@@ -387,7 +371,7 @@ spec:
                     type: object
                   http:
                     description: HTTP is the remote location that backs the content
-                      of this Bundle.
+                      of this Source.
                     properties:
                       auth:
                         description: Auth configures the authorization method if necessary.
@@ -429,8 +413,8 @@ spec:
                     - url
                     type: object
                   image:
-                    description: Image is the bundle image that backs the content
-                      of this bundle.
+                    description: Image is the image that backs the content of this
+                      Source.
                     properties:
                       pullSecret:
                         description: ImagePullSecretName contains the name of the
@@ -445,10 +429,10 @@ spec:
                     - ref
                     type: object
                   type:
-                    description: Type defines the kind of Bundle content being sourced.
+                    description: Type defines the kind of Source content being sourced.
                     type: string
                   upload:
-                    description: Upload is a source that enables this Bundle's content
+                    description: Upload is a source that enables this Source's content
                       to be uploaded via Rukpak's bundle upload service. This source
                       type is primarily useful with bundle development workflows because
                       it enables bundle developers to inject a local bundle directly

config/crd/patches/catalog_validation.yaml

@@ -8,8 +8,6 @@
     - image
   - required:
     - configMaps
-  - required:
-    - upload
   - required:
     - http
 

pkg/controllers/core/catalog_controller.go

@@ -112,7 +112,14 @@ func (r *CatalogReconciler) SetupWithManager(mgr ctrl.Manager) error {
 }
 
 func (r *CatalogReconciler) reconcile(ctx context.Context, catalog *v1alpha1.Catalog) (ctrl.Result, error) {
-	unpackResult, err := r.Unpacker.Unpack(ctx, &catalog.Spec.Source, catalog)
+	src := &source.Source{
+		Type:       catalog.Spec.Source.Type,
+		Image:      catalog.Spec.Source.Image,
+		Git:        catalog.Spec.Source.Git,
+		ConfigMaps: catalog.Spec.Source.ConfigMaps,
+		HTTP:       catalog.Spec.Source.HTTP,
+	}
+	unpackResult, err := r.Unpacker.Unpack(ctx, src, catalog)
 	if err != nil {
 		return ctrl.Result{}, updateStatusUnpackFailing(&catalog.Status, fmt.Errorf("source bundle content: %v", err))
 	}
@@ -129,7 +136,7 @@ func (r *CatalogReconciler) reconcile(ctx context.Context, catalog *v1alpha1.Cat
 		//   as the already unpacked content. If it does, we should skip this rest
 		//   of the unpacking steps.
 
-		fbc, err := declcfg.LoadFS(unpackResult.Bundle)
+		fbc, err := declcfg.LoadFS(unpackResult.FS)
 		if err != nil {
 			return ctrl.Result{}, updateStatusUnpackFailing(&catalog.Status, fmt.Errorf("load FBC from filesystem: %v", err))
 		}

pkg/controllers/core/catalog_controller_test.go

@@ -33,7 +33,7 @@ type MockSource struct {
 	shouldError bool
 }
 
-func (ms *MockSource) Unpack(_ context.Context, _ *source.BundleSource, _ client.Object) (*source.Result, error) {
+func (ms *MockSource) Unpack(_ context.Context, _ *source.Source, _ client.Object) (*source.Result, error) {
 	if ms.shouldError {
 		return nil, errors.New("mocksource error")
 	}
@@ -96,7 +96,7 @@ var _ = Describe("Catalogd Controller Test", func() {
 				catalog = &v1alpha1.Catalog{
 					ObjectMeta: metav1.ObjectMeta{Name: cKey.Name},
 					Spec: v1alpha1.CatalogSpec{
-						Source: source.BundleSource{
+						Source: v1alpha1.CatalogSource{
 							Type: "invalid-source",
 						},
 					},
@@ -132,7 +132,7 @@ var _ = Describe("Catalogd Controller Test", func() {
 				catalog = &v1alpha1.Catalog{
 					ObjectMeta: metav1.ObjectMeta{Name: cKey.Name},
 					Spec: v1alpha1.CatalogSpec{
-						Source: source.BundleSource{
+						Source: v1alpha1.CatalogSource{
 							Type: source.SourceTypeImage,
 							Image: &source.ImageSource{
 								Ref: "somecatalog:latest",
@@ -246,9 +246,12 @@ var _ = Describe("Catalogd Controller Test", func() {
 
 					mockSource.shouldError = false
 					mockSource.result = &source.Result{
-						ResolvedSource: &catalog.Spec.Source,
-						State:          source.StateUnpacked,
-						Bundle:         filesys,
+						ResolvedSource: &source.Source{
+							Type:  catalog.Spec.Source.Type,
+							Image: catalog.Spec.Source.Image,
+						},
+						State: source.StateUnpacked,
+						FS:    filesys,
 					}
 
 					// reconcile

test/e2e/unpack_test.go

@@ -40,7 +40,7 @@ var _ = Describe("Catalog Unpacking", func() {
 					Name: catalogName,
 				},
 				Spec: catalogd.CatalogSpec{
-					Source: source.BundleSource{
+					Source: catalogd.CatalogSource{
 						Type: source.SourceTypeImage,
 						Image: &source.ImageSource{
 							Ref: catalogRef,