fix(subscription): don't adopt subscriptions that have installplan re…

…fences
operator-framework · Jan 24, 2019 · c4f732b · c4f732b
1 parent 3af3a51
commit c4f732b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/controller/operators/catalog/operator.go b/pkg/controller/operators/catalog/operator.go
@@ -685,7 +685,7 @@ func (o *Operator) ensureSubscriptionInstallPlanState(logger *logrus.Entry, sub
 	for _, ip := range ips {
 		for _, step := range ip.Status.Plan {
 			// TODO: is this enough? should we check equality of pkg/channel?
-			if step != nil && step.Resource.Kind == v1alpha1.SubscriptionKind && step.Resource.Name == sub.GetName() {
+			if step != nil && step.Resource.Kind == v1alpha1.SubscriptionKind && step.Resource.Name == sub.GetName() && sub.Status.Install == nil {
 				logger.WithField("installplan", ip.GetName()).Debug("found subscription in steps of existing installplan")
 				out.Status.Install = o.referenceForInstallPlan(ip)
 				out.Status.State = v1alpha1.SubscriptionStateUpgradePending