Fix e2e where subscription is updated

On occasion, the subscription resource that needs to be updated is stale
(even though we just got it), so get the subscription before updating.

Should resolve:

> Operation cannot be fulfilled on subscriptions.operators.coreos.com "mysubscription": the object has been modified; please apply your changes to the latest version and try again

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: fbd6f95305bc736c5988945f88a631e77d49379d

Author: tmshort

staging/operator-lifecycle-manager/test/e2e/subscription_e2e_test.go

@@ -763,10 +763,17 @@ var _ = Describe("Subscription", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(sub).ToNot(BeNil())
 
-				// Update sub to target an existing CatalogSource
-				sub.Spec.CatalogSource = catalogSourceName
+				By("updating the subscription to target an existing catsrc")
 				Eventually(func() error {
-					_, err := crc.OperatorsV1alpha1().Subscriptions(generatedNamespace.GetName()).Update(context.Background(), sub, metav1.UpdateOptions{})
+					sub, err := crc.OperatorsV1alpha1().Subscriptions(generatedNamespace.GetName()).Get(context.Background(), testSubscriptionName, metav1.GetOptions{})
+					if err != nil {
+						return err
+					}
+					if sub == nil {
+						return fmt.Errorf("subscription is nil")
+					}
+					sub.Spec.CatalogSource = catalogSourceName
+					_, err = crc.OperatorsV1alpha1().Subscriptions(generatedNamespace.GetName()).Update(context.Background(), sub, metav1.UpdateOptions{})
 					return err
 				}).Should(Succeed())