[csc] Populate the ConfigMap with operator artifacts

On creation of a CatalogSourceConfig object with a list of packagies
IDs, query the internal datastore for CSVs, CRDs and packages for each
ID and add them to a ConfigMap's data section in a format understood by
OLM.
- Updated the Dockerfile to install root CA certificates.

Author: aravindhp

Dockerfile

@@ -5,6 +5,7 @@ COPY . .
 RUN make osbs-build
 
 FROM alpine:3.6
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 RUN useradd marketplace-operator
 USER marketplace-operator
 COPY --from=builder /go/src/github.com/operator-framework/operator-marketplace/tmp/_output/bin/marketplace-operator /usr/bin

deploy/catalogsourceconfig.cr.yaml

@@ -4,3 +4,4 @@ metadata:
   name: "example"
 spec:
   targetNamespace: "global"
+  packages: "operators/marketplace-operators"

pkg/catalogsourceconfig/catalogsourceconfig.go

@@ -1,5 +1,9 @@
 package catalogsourceconfig
 
-func NewHandler() Handler {
-	return &handler{}
+import (
+	"github.com/operator-framework/operator-marketplace/pkg/operatorsource"
+)
+
+func NewHandler(r operatorsource.DatastoreReader) Handler {
+	return &handler{reader: r}
 }

pkg/catalogsourceconfig/handler.go

@@ -2,6 +2,10 @@ package catalogsourceconfig
 
 import (
 	"context"
+	"fmt"
+	"strings"
+
+	opsrc "github.com/operator-framework/operator-marketplace/pkg/operatorsource"
 
 	olm "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
 	"github.com/operator-framework/operator-marketplace/pkg/apis/marketplace/v1alpha1"
@@ -12,12 +16,21 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// Copied from https://github.com/operator-framework/operator-lifecycle-manager/blob/master/pkg/controller/registry/configmap_loader.go#L18
+// TBD: Vendor in the folder once we require more than just these constants from the OLM registry code
+const (
+	ConfigMapCRDName     = "customResourceDefinitions"
+	ConfigMapCSVName     = "clusterServiceVersions"
+	ConfigMapPackageName = "packages"
+)
+
 // Handler is the interface that wraps the Handle method
 type Handler interface {
 	Handle(ctx context.Context, event sdk.Event) error
 }
 
 type handler struct {
+	reader opsrc.DatastoreReader
 }
 
 var log *logrus.Entry
@@ -31,13 +44,41 @@ func (h *handler) Handle(ctx context.Context, event sdk.Event) error {
 		log.Infof("Deleted")
 		return nil
 	}
-	return createCatalogSource(csc)
+	data, err := h.createCatalogData(csc)
+	if err != nil {
+		return err
+	}
+	return createCatalogSource(csc, data)
+}
+
+// createCatalogData constructs the ConfigMap data by reading the manifest information of all packages
+// from the datasource
+func (h *handler) createCatalogData(csc *v1alpha1.CatalogSourceConfig) (map[string]string, error) {
+	packageIDs := getPackageIDs(csc.Spec.Packages)
+	data := make(map[string]string)
+	if len(packageIDs) < 1 {
+		return data, fmt.Errorf("No packages specified in CatalogSourceConfig %s/%s", csc.Namespace, csc.Name)
+	}
+
+	// TBD: Do we create a CatalogSource per package?
+	for id := range packageIDs {
+		manifest, err := h.reader.Read(packageIDs[id])
+		if err != nil {
+			log.Errorf("Error \"%v\" getting manifest for package ID %s", err, packageIDs[id])
+			continue
+		}
+		// TODO: Add more error checking
+		data[ConfigMapCRDName] += manifest.Manifest.Data.CRDs
+		data[ConfigMapCSVName] += manifest.Manifest.Data.CSVs
+		data[ConfigMapPackageName] += manifest.Manifest.Data.Packages
+	}
+	return data, nil
 }
 
 // createCatalogSource creates a new CatalogSource CR and all the resources it requires
-func createCatalogSource(cr *v1alpha1.CatalogSourceConfig) error {
+func createCatalogSource(cr *v1alpha1.CatalogSourceConfig, data map[string]string) error {
 	// Create the ConfigMap that will be used by the CatalogSource
-	catalogConfigMap := newConfigMap(cr)
+	catalogConfigMap := newConfigMap(cr, data)
 	log.Infof("Creating %s ConfigMap", catalogConfigMap.Name)
 	err := sdk.Create(catalogConfigMap)
 	if err != nil && !errors.IsAlreadyExists(err) {
@@ -64,6 +105,11 @@ func getLoggerWithCatalogSourceConfigTypeFields(csc *v1alpha1.CatalogSourceConfi
 	})
 }
 
+// getPackageIDs returns a list of IDs from a comma separated string of IDs
+func getPackageIDs(csIDs string) []string {
+	return strings.Split(csIDs, ",")
+}
+
 // newCatalogSource returns a CatalogSource object
 func newCatalogSource(cr *v1alpha1.CatalogSourceConfig, configMapName string) *olm.CatalogSource {
 	name := v1alpha1.CatalogSourcePrefix + cr.Name
@@ -80,14 +126,17 @@ func newCatalogSource(cr *v1alpha1.CatalogSourceConfig, configMapName string) *o
 			},
 		},
 		Spec: olm.CatalogSourceSpec{
-			SourceType: "internal",
-			ConfigMap:  configMapName,
+			SourceType:  "internal",
+			ConfigMap:   configMapName,
+			DisplayName: cr.Name,
+			// TBD: Where do we get this information from?
+			Publisher: cr.Name,
 		},
 	}
 }
 
 // newConfigMap returns a new ConfigMap object
-func newConfigMap(cr *v1alpha1.CatalogSourceConfig) *corev1.ConfigMap {
+func newConfigMap(cr *v1alpha1.CatalogSourceConfig, data map[string]string) *corev1.ConfigMap {
 	name := v1alpha1.ConfigMapPrefix + cr.Name
 	return &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{
@@ -101,11 +150,6 @@ func newConfigMap(cr *v1alpha1.CatalogSourceConfig) *corev1.ConfigMap {
 				*metav1.NewControllerRef(cr, cr.GroupVersionKind()),
 			},
 		},
-		// Dummy placeholder data
-		Data: map[string]string{
-			"clusterServiceVersions":    "csvs",
-			"customResourceDefinitions": "crds",
-			"packages":                  "packs",
-		},
+		Data: data,
 	}
 }

pkg/stub/handler.go

@@ -13,8 +13,8 @@ import (
 )
 
 func NewHandler() sdk.Handler {
-	opsrcHandler, _ := operatorsource.NewHandler()
-	cscHandler := catalogsourceconfig.NewHandler()
+	opsrcHandler, reader := operatorsource.NewHandler()
+	cscHandler := catalogsourceconfig.NewHandler(reader)
 	return &Handler{
 		operatorSourceHandler:      opsrcHandler,
 		catalogSourceConfigHandler: cscHandler,

tmp/build/Dockerfile

@@ -1,5 +1,6 @@
 FROM alpine:3.6
 
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
 RUN adduser -D marketplace-operator
 USER marketplace-operator