Handle error when subscription doesn't match package name for run bundle-upgrade (#4454)

openshift-cherrypick-robot · web-flow · commit ddcda9026b5b · 2021-01-29T11:58:47.000-05:00
Signed-off-by: rashmigottipati &lt;chowdary.grashmi@gmail.com&gt;
diff --git a/internal/olm/operator/registry/operator_installer.go b/internal/olm/operator/registry/operator_installer.go
@@ -123,6 +123,10 @@ func (o OperatorInstaller) UpgradeOperator(ctx context.Context) (*v1alpha1.Clust
 		}
 	}
 
+	if subscription == nil {
+		return nil, fmt.Errorf("subscription for package %q not found", o.PackageName)
+	}
+
 	log.Infof("Found existing subscription with name %s and namespace %s", subscription.Name, subscription.Namespace)
 
 	// todo: attempt #1 to trigger install plan for the subscription and

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,10 @@ func (o OperatorInstaller) UpgradeOperator(ctx context.Context) (*v1alpha1.Clust`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ if subscription == nil {`
	`127`	`+ return nil, fmt.Errorf("subscription for package %q not found", o.PackageName)`
	`128`	`+ }`
	`129`	`+`
`126`	`130`	`log.Infof("Found existing subscription with name %s and namespace %s", subscription.Name, subscription.Namespace)`
`127`	`131`
`128`	`132`	`// todo: attempt #1 to trigger install plan for the subscription and`