fix(bundles): include csv name in installplan for bundle images

this fixes a bug where operators installed via images where not
detected as part of the installplan, and install would fail

Author: ecordell

pkg/api/apis/operators/installplan_types.go

@@ -199,6 +199,8 @@ type BundleLookup struct {
 	// Path refers to the location of a bundle to pull.
 	// It's typically an image reference.
 	Path string
+	// Identifier is the catalog-unique name of the operator (the name of the CSV for bundles that contain CSVs)
+	Identifier string
 	// Replaces is the name of the bundle to replace with the one found at Path.
 	Replaces string
 	// CatalogSourceRef is a reference to the CatalogSource the bundle path was resolved from.

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

@@ -252,6 +252,8 @@ type BundleLookup struct {
 	// Path refers to the location of a bundle to pull.
 	// It's typically an image reference.
 	Path string `json:"path"`
+	// Identifier is the catalog-unique name of the operator (the name of the CSV for bundles that contain CSVs)
+	Identifier string `json:"identifier"`
 	// Replaces is the name of the bundle to replace with the one found at Path.
 	Replaces string `json:"replaces"`
 	// CatalogSourceRef is a reference to the CatalogSource the bundle path was resolved from.

pkg/controller/operators/catalog/operator.go

@@ -1022,6 +1022,9 @@ func (o *Operator) createInstallPlan(namespace string, gen int, subs []*v1alpha1
 		}
 		catalogSourceMap[s.Resource.CatalogSource] = struct{}{}
 	}
+	for _, b := range bundleLookups {
+		csvNames = append(csvNames, b.Identifier)
+	}
 	catalogSources := []string{}
 	for s := range catalogSourceMap {
 		catalogSources = append(catalogSources, s)

pkg/controller/operators/catalog/subscriptions_test.go

@@ -378,6 +378,7 @@ func TestSyncSubscriptions(t *testing.T) {
 				bundleLookups: []v1alpha1.BundleLookup{
 					{
 						Path: "bundle-path-a",
+						Identifier: "bundle-a",
 						CatalogSourceRef: &corev1.ObjectReference{
 							Namespace: testNamespace,
 							Name:      "src",
@@ -447,7 +448,7 @@ func TestSyncSubscriptions(t *testing.T) {
 			},
 			wantInstallPlan: &v1alpha1.InstallPlan{
 				Spec: v1alpha1.InstallPlanSpec{
-					ClusterServiceVersionNames: []string{},
+					ClusterServiceVersionNames: []string{"bundle-a"},
 					Approval:                   v1alpha1.ApprovalAutomatic,
 					Approved:                   true,
 					Generation:                 1,
@@ -458,6 +459,7 @@ func TestSyncSubscriptions(t *testing.T) {
 					BundleLookups: []v1alpha1.BundleLookup{
 						{
 							Path: "bundle-path-a",
+							Identifier: "bundle-a",
 							CatalogSourceRef: &corev1.ObjectReference{
 								Namespace: testNamespace,
 								Name:      "src",

pkg/controller/registry/resolver/resolver.go

@@ -109,8 +109,9 @@ func (r *OperatorsV1alpha1Resolver) ResolveSteps(namespace string, sourceQuerier
 				steps = append(steps, bundleSteps...)
 			} else {
 				bundleLookups = append(bundleLookups, v1alpha1.BundleLookup{
-					Path:     op.Bundle().GetBundlePath(),
-					Replaces: op.Replaces(),
+					Path:       op.Bundle().GetBundlePath(),
+					Identifier: op.Identifier(),
+					Replaces:   op.Replaces(),
 					CatalogSourceRef: &corev1.ObjectReference{
 						Namespace: op.SourceInfo().Catalog.Namespace,
 						Name:      op.SourceInfo().Catalog.Name,

pkg/controller/registry/resolver/resolver_test.go

@@ -121,6 +121,7 @@ func TestNamespaceResolver(t *testing.T) {
 				lookups: []v1alpha1.BundleLookup{
 					{
 						Path: "quay.io/test/bundle@sha256:abcd",
+						Identifier: "b.v1",
 						CatalogSourceRef: &corev1.ObjectReference{
 							Namespace: catalog.Namespace,
 							Name:      catalog.Name,
@@ -234,6 +235,7 @@ func TestNamespaceResolver(t *testing.T) {
 				lookups: []v1alpha1.BundleLookup{
 					{
 						Path:     "quay.io/test/bundle@sha256:abcd",
+						Identifier: "a.v2",
 						Replaces: "a.v1",
 						CatalogSourceRef: &corev1.ObjectReference{
 							Namespace: catalog.Namespace,