fix(resolver): resolved dependent subscriptions don't detect updates

this occurred because we only check for updates when we have information
about the currently installed CSV on the subscription status, which
was omitted from dependent catalogs.

the resolver now records the csv resolved into the subscription spec,
and it is used to populate the installed csv status when available.

Author: ecordell

pkg/controller/operators/catalog/operator.go

@@ -736,7 +736,7 @@ func (o *Operator) nothingToUpdate(logger *logrus.Entry, sub *v1alpha1.Subscript
 }
 
 func (o *Operator) ensureSubscriptionInstallPlanState(logger *logrus.Entry, sub *v1alpha1.Subscription) (*v1alpha1.Subscription, bool, error) {
-	if sub.Status.Install != nil {
+	if sub.Status.InstallPlanRef != nil {
 		return sub, false, nil
 	}
 
@@ -765,6 +765,8 @@ func (o *Operator) ensureSubscriptionInstallPlanState(logger *logrus.Entry, sub
 	out.Status.InstallPlanRef = ref
 	out.Status.Install = v1alpha1.NewInstallPlanReference(ref)
 	out.Status.State = v1alpha1.SubscriptionStateUpgradePending
+	out.Status.CurrentCSV = out.Spec.StartingCSV
+	out.Status.LastUpdated = timeNow()
 
 	updated, err := o.client.OperatorsV1alpha1().Subscriptions(sub.GetNamespace()).UpdateStatus(out)
 	if err != nil {

pkg/controller/operators/catalog/operator_test.go

@@ -142,23 +142,23 @@ func TestExecutePlan(t *testing.T) {
 						Resource: v1alpha1.StepResource{
 							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group:                  "",
-							Version:                "v1",
-							Kind:                   "Service",
-							Name:                   "service",
-							Manifest:               toManifest(service("service", namespace)),
+							Group:    "",
+							Version:  "v1",
+							Kind:     "Service",
+							Name:     "service",
+							Manifest: toManifest(service("service", namespace)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},
 					&v1alpha1.Step{
 						Resource: v1alpha1.StepResource{
 							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group:                  "operators.coreos.com",
-							Version:                "v1alpha1",
-							Kind:                   "ClusterServiceVersion",
-							Name:                   "csv",
-							Manifest:               toManifest(csv("csv", namespace, nil, nil)),
+							Group:    "operators.coreos.com",
+							Version:  "v1alpha1",
+							Kind:     "ClusterServiceVersion",
+							Name:     "csv",
+							Manifest: toManifest(csv("csv", namespace, nil, nil)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},

pkg/controller/registry/resolver/resolver.go

@@ -105,6 +105,8 @@ func (r *OperatorsV1alpha1Resolver) ResolveSteps(namespace string, sourceQuerier
 
 			// add steps for subscriptions for bundles that were added through resolution
 			if !subExists {
+				// explicitly track the resolved CSV as the starting CSV on the resolved subscriptions
+				op.SourceInfo().StartingCSV = op.Identifier()
 				subStep, err := NewSubscriptionStepResource(namespace, *op.SourceInfo())
 				if err != nil {
 					return nil, nil, err
@@ -147,15 +149,15 @@ func (r *OperatorsV1alpha1Resolver) sourceInfoToSubscriptions(subs []*v1alpha1.S
 	for _, s := range subs {
 		startingCSV := s.Spec.StartingCSV
 		if s.Status.CurrentCSV != "" {
-			// If a csv has previously been resolved for the operator, don't enable 
+			// If a csv has previously been resolved for the operator, don't enable
 			// a starting csv search.
 			startingCSV = ""
 		}
 		add[OperatorSourceInfo{
-			Package: s.Spec.Package,
-			Channel: s.Spec.Channel,
+			Package:     s.Spec.Package,
+			Channel:     s.Spec.Channel,
 			StartingCSV: startingCSV,
-			Catalog: CatalogKey{Name: s.Spec.CatalogSource, Namespace: s.Spec.CatalogSourceNamespace},
+			Catalog:     CatalogKey{Name: s.Spec.CatalogSource, Namespace: s.Spec.CatalogSourceNamespace},
 		}] = s.DeepCopy()
 	}
 	return

pkg/controller/registry/resolver/resolver_test.go

@@ -532,6 +532,7 @@ func subSteps(namespace, operatorName, pkgName, channelName string, catalog Cata
 			Channel:                channelName,
 			CatalogSource:          catalog.Name,
 			CatalogSourceNamespace: catalog.Namespace,
+			StartingCSV:            operatorName,
 			InstallPlanApproval:    v1alpha1.ApprovalAutomatic,
 		},
 	}

pkg/controller/registry/resolver/steps.go

@@ -83,6 +83,7 @@ func NewSubscriptionStepResource(namespace string, info OperatorSourceInfo) (v1a
 			CatalogSourceNamespace: info.Catalog.Namespace,
 			Package:                info.Package,
 			Channel:                info.Channel,
+			StartingCSV:            info.StartingCSV,
 			InstallPlanApproval:    v1alpha1.ApprovalAutomatic,
 		},
 	}, info.Catalog.Name, info.Catalog.Namespace)

test/e2e/installplan_e2e_test.go

@@ -326,6 +326,30 @@ EXPECTED:
 	}
 
 	t.Logf("All expected resources resolved")
+
+	// Verify that the dependent subscription is in a good state
+	dependentSubscription, err := fetchSubscription(t, crc, testNamespace, strings.Join([]string{dependentPackageStable, dependentCatalogName, testNamespace}, "-"), subscriptionHasInstallPlanChecker)
+	require.NoError(t, err)
+	require.NotNil(t, dependentSubscription)
+	require.NotNil(t, dependentSubscription.Status.InstallPlanRef)
+	require.Equal(t, v1alpha1.SubscriptionState("AtLatestKnown"), dependentSubscription.Status.State)
+	require.Equal(t, dependentCSV.GetName(), dependentSubscription.Status.CurrentCSV)
+
+	// TODO: update dependent subscription in catalog and wait for csv to update
+	updatedDependentCSV := newCSV(dependentPackageStable+"v2", testNamespace, dependentPackageStable, *semver.New("0.1.1"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, dependentNamedStrategy)
+	dependentManifests = []registry.PackageManifest{
+		{
+			PackageName: dependentPackageName,
+			Channels: []registry.PackageChannel{
+				{Name: stableChannel, CurrentCSVName: updatedDependentCSV.GetName()},
+			},
+			DefaultChannelName: stableChannel,
+		},
+	}
+	updateInternalCatalog(t, c, crc, dependentCatalogName, testNamespace, []apiextensions.CustomResourceDefinition{dependentCRD}, []v1alpha1.ClusterServiceVersion{dependentCSV, updatedDependentCSV}, dependentManifests)
+
+	dependentSubscription, err = fetchSubscription(t, crc, testNamespace, strings.Join([]string{dependentPackageStable, dependentCatalogName, testNamespace}, "-"), subscriptionHasCurrentCSV(updatedDependentCSV.GetName()))
+	require.NoError(t, err)
 }
 
 func TestCreateInstallPlanWithPreExistingCRDOwners(t *testing.T) {

test/e2e/subscription_e2e_test.go

@@ -319,6 +319,12 @@ func subscriptionStateAny(subscription *v1alpha1.Subscription) bool {
 		subscriptionStateUpgradeAvailableChecker(subscription)
 }
 
+func subscriptionHasCurrentCSV(currentCSV string) subscriptionStateChecker {
+	return func(subscription *v1alpha1.Subscription) bool {
+		return subscription.Status.CurrentCSV == currentCSV
+	}
+}
+
 func fetchSubscription(t *testing.T, crc versioned.Interface, namespace, name string, checker subscriptionStateChecker) (*v1alpha1.Subscription, error) {
 	var fetchedSubscription *v1alpha1.Subscription
 	var err error