[wip] rebase of bundle unpacking

deploy/chart/values.yaml

@@ -25,7 +25,7 @@ olm:
 
 catalog:
   replicaCount: 1
-  commandArgs: -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
+  commandArgs: -configmapServerImage=ecordell/configmap-operator-registry:latest
   image:
     ref: quay.io/operator-framework/olm:master
     pullPolicy: Always

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
 	github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
 	github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
-	github.com/operator-framework/operator-registry v1.5.1
+	github.com/operator-framework/operator-registry v1.5.3
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
 	github.com/sirupsen/logrus v1.4.2

pkg/api/apis/operators/installplan_types.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -83,6 +84,7 @@ type InstallPlanStatus struct {
 	CatalogSources              []string
 	Plan                        []*Step
 	AttenuatedServiceAccountRef *corev1.ObjectReference
+	BundleLookups               []*BundleLookup `json:"bundleLookup,omitempty"`
 }
 
 // InstallPlanCondition represents the overall status of the execution of
@@ -157,6 +159,24 @@ type Step struct {
 	Status    StepStatus
 }
 
+// BundleJob tracks the job status for a given bundle
+type BundleJob struct {
+	Name           string                   `json:"name, omitempty"`
+	Namespace      string                   `json:"namespace, omitempty"`
+	Condition      batchv1.JobConditionType `json:"condition, omitempty"`
+	CompletionTime *metav1.Time             `json:"completionTime, omitempty"`
+}
+
+// BundleLookup serves as accounting for tracking a bundle data lookup
+type BundleLookup struct {
+	BundleJob        *BundleJob                  `json:"bundleJob"`
+	ConfigMapRef     *ConfigMapResourceReference `json:"configMapRef"`
+	Image            string                      `json:"image"`
+	CatalogName      string                      `json:"catalogName"`
+	CatalogNamespace string                      `json:"catalogNamespace"`
+	Replaces         string                      `json:"replaces"`
+}
+
 // ManifestsMatch returns true if the CSV manifests in the StepResources of the given list of steps
 // matches those in the InstallPlanStatus.
 func (s *InstallPlanStatus) CSVManifestsMatch(steps []*Step) bool {

pkg/api/apis/operators/v1alpha1/installplan_types.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -84,6 +85,7 @@ type InstallPlanStatus struct {
 	Conditions     []InstallPlanCondition `json:"conditions,omitempty"`
 	CatalogSources []string               `json:"catalogSources"`
 	Plan           []*Step                `json:"plan,omitempty"`
+	BundleLookups  []*BundleLookup        `json:"bundleLookup,omitempty"`
 
 	// AttenuatedServiceAccountRef references the service account that is used
 	// to do scoped operator install.
@@ -162,6 +164,24 @@ type Step struct {
 	Status    StepStatus   `json:"status"`
 }
 
+// BundleJob tracks the job status for a given bundle
+type BundleJob struct {
+	Name           string                   `json:"name, omitempty"`
+	Namespace      string                   `json:"namespace, omitempty"`
+	Condition      batchv1.JobConditionType `json:"condition, omitempty"`
+	CompletionTime *metav1.Time             `json:"completionTime, omitempty"`
+}
+
+// BundleLookup serves as accounting for tracking a bundle data lookup
+type BundleLookup struct {
+	BundleJob        *BundleJob                  `json:"bundleJob"`
+	ConfigMapRef     *ConfigMapResourceReference `json:"configMapRef"`
+	Image            string                      `json:"image"`
+	CatalogName      string                      `json:"catalogName"`
+	CatalogNamespace string                      `json:"catalogNamespace"`
+	Replaces         string                      `json:"replaces"`
+}
+
 // ManifestsMatch returns true if the CSV manifests in the StepResources of the given list of steps
 // matches those in the InstallPlanStatus.
 func (s *InstallPlanStatus) CSVManifestsMatch(steps []*Step) bool {