wip

Author: jmprusi

test/e2e/install_test.go

@@ -39,6 +39,7 @@ var _ = Describe("Operator Install", func() {
 			BeforeEach(func() {
 				operator.Spec = operatorv1alpha1.OperatorSpec{
 					PackageName: "prometheus",
+					Version:     "0.47.0",
 				}
 			})
 			It("resolves the specified package with correct bundle path", func() {
@@ -167,6 +168,50 @@ var _ = Describe("Operator Install", func() {
 			}).Should(Succeed())
 		})
 
+		It("handles upgrade edges correctly", func() {
+			By("creating a valid Operator resource")
+			operator.Spec = operatorv1alpha1.OperatorSpec{
+				PackageName: "prometheus",
+				Version:     "0.37.0",
+			}
+			Expect(c.Create(ctx, operator)).To(Succeed())
+			By("eventually reporting a successful resolution")
+			Eventually(func(g Gomega) {
+				g.Expect(c.Get(ctx, types.NamespacedName{Name: operator.Name}, operator)).To(Succeed())
+				cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorv1alpha1.TypeResolved)
+				g.Expect(cond).ToNot(BeNil())
+				g.Expect(cond.Reason).To(Equal(operatorv1alpha1.ReasonSuccess))
+				g.Expect(cond.Message).To(ContainSubstring("resolved to"))
+				g.Expect(operator.Status.ResolvedBundleResource).ToNot(BeEmpty())
+			}).Should(Succeed())
+
+			By("updating the Operator resource to an invalid version")
+			operator.Spec.Version = "0.65.1" // the correct one should be 0.47.0
+			Expect(c.Update(ctx, operator)).To(Succeed())
+			By("eventually reporting a failed resolution")
+			Eventually(func(g Gomega) {
+				g.Expect(c.Get(ctx, types.NamespacedName{Name: operator.Name}, operator)).To(Succeed())
+				cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorv1alpha1.TypeResolved)
+				g.Expect(cond).ToNot(BeNil())
+				g.Expect(cond.Reason).To(Equal(operatorv1alpha1.ReasonResolutionFailed))
+				g.Expect(cond.Message).To(ContainSubstring("entity for package \"prometheus\" not found in solutio"))
+				g.Expect(operator.Status.ResolvedBundleResource).To(BeEmpty())
+			}).Should(Succeed())
+
+			By("updating the Operator resource to a valid upgrade edge")
+			operator.Spec.Version = "0.47.0"
+			Expect(c.Update(ctx, operator)).To(Succeed())
+			By("eventually reporting a successful resolution and bundle path")
+			Eventually(func(g Gomega) {
+				g.Expect(c.Get(ctx, types.NamespacedName{Name: operator.Name}, operator)).To(Succeed())
+				cond := apimeta.FindStatusCondition(operator.Status.Conditions, operatorv1alpha1.TypeResolved)
+				g.Expect(cond).ToNot(BeNil())
+				g.Expect(cond.Reason).To(Equal(operatorv1alpha1.ReasonSuccess))
+				g.Expect(cond.Message).To(ContainSubstring("resolved to"))
+				g.Expect(operator.Status.ResolvedBundleResource).ToNot(BeEmpty())
+			}).Should(Succeed())
+		})
+
 		AfterEach(func() {
 			Expect(c.Delete(ctx, operator)).To(Succeed())
 			Eventually(func(g Gomega) {

testdata/catalogs/test-catalog/catalog.yaml

@@ -7,10 +7,24 @@ schema: olm.channel
 name: beta
 package: prometheus
 entries:
-  - name: prometheus-operator.0.47.0
+  - name: prometheus-operator.v0.37.0
+  - name: prometheus-operator.v0.47.0
+    replaces: prometheus-operator.v0.37.0
+  - name: prometheus-operator.v0.65.1
+    replaces: prometheus-operator.v0.47.0
 ---
 schema: olm.bundle
-name: prometheus-operator.0.47.0
+name: prometheus-operator.v0.37.0
+package: prometheus
+image: localhost/testdata/bundles/registry-v1/prometheus-operator:v0.37.0
+properties:
+  - type: olm.package
+    value:
+      packageName: prometheus
+      version: 0.37.0
+---
+schema: olm.bundle
+name: prometheus-operator.v0.47.0
 package: prometheus
 image: localhost/testdata/bundles/registry-v1/prometheus-operator:v0.47.0
 properties:
@@ -19,6 +33,16 @@ properties:
       packageName: prometheus
       version: 0.47.0
 ---
+schema: olm.bundle
+name: prometheus-operator.v0.65.1
+package: prometheus
+image: localhost/testdata/bundles/registry-v1/prometheus-operator:v0.65.1
+properties:
+  - type: olm.package
+    value:
+      packageName: prometheus
+      version: 0.65.1
+---
 schema: olm.package
 name: plain
 defaultChannel: beta