wip: Resurface bundledeployment errors

Author: varshaprasad96

Makefile

@@ -100,6 +100,10 @@ build: manifests generate fmt vet ## Build manager binary.
 .PHONY: run
 run: docker-build kind-cluster kind-load cert-mgr rukpak install deploy wait ## Build the operator-controller then deploy it into a new kind cluster.
 
+.PHONY: run-local
+run-local: manifests generate fmt vet
+	go run ./main.go
+
 .PHONY: wait
 wait:
 	kubectl wait --for=condition=Available --namespace=$(OPERATOR_CONTROLLER_NAMESPACE) deployment/operator-controller-controller-manager --timeout=$(WAIT_TIMEOUT)

controllers/operator_controller.go

@@ -162,6 +162,18 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 		return ctrl.Result{}, err
 	}
 
+	// Re-fetch the bundleDeployment, if successful then update the operator status.
+	if err := r.verifySuccessfulBundleDeployments(ctx, op.Name); err != nil {
+		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+			Type:               operatorsv1alpha1.TypeReady,
+			Status:             metav1.ConditionFalse,
+			Reason:             operatorsv1alpha1.ReasonBundleDeploymentFailed,
+			Message:            err.Error(),
+			ObservedGeneration: op.GetGeneration(),
+		})
+		return ctrl.Result{}, err
+	}
+
 	// update operator status
 	apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
 		Type:               operatorsv1alpha1.TypeReady,
@@ -277,3 +289,21 @@ func (r *OperatorReconciler) existingBundleDeploymentUnstructured(ctx context.Co
 	}
 	return &unstructured.Unstructured{Object: unstrExistingBundleDeploymentObj}, nil
 }
+
+func (r *OperatorReconciler) verifySuccessfulBundleDeployments(ctx context.Context, name string) error {
+	bundleDeploymentExists := &rukpakv1alpha1.BundleDeployment{}
+	if err := r.Client.Get(ctx, types.NamespacedName{Name: name}, bundleDeploymentExists); err != nil {
+		return fmt.Errorf("bundleDeployment %q not found %v", name, err)
+	}
+
+	conditions := bundleDeploymentExists.Status.Conditions
+	ers := []error{}
+
+	for _, c := range conditions {
+		if c.Status == metav1.ConditionFalse {
+			ers = append(ers, fmt.Errorf("error observed by Rukpak: %v", c.Message))
+		}
+	}
+	fmt.Println(len(ers))
+	return utilerrors.NewAggregate(ers)
+}

internal/resolution/bundle_cache.go

@@ -48,4 +48,10 @@ var HardcodedEntitySource = input.NewCacheQuerier(map[deppy.Identifier]input.Ent
 		"olm.gvk":         "[{\"group\":\"monitoring.coreos.com\",\"kind\":\"Alertmanager\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"Alertmanager\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"AlertmanagerConfig\",\"version\":\"v1alpha1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"AlertmanagerConfig\",\"version\":\"v1alpha1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"PodMonitor\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"PodMonitor\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"Probe\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"Probe\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"Prometheus\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"Prometheus\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"PrometheusRule\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"PrometheusRule\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"ServiceMonitor\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"ServiceMonitor\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"ThanosRuler\",\"version\":\"v1\"},{\"group\":\"monitoring.coreos.com\",\"kind\":\"ThanosRuler\",\"version\":\"v1\"}]",
 		"olm.package":     "{\"packageName\":\"prometheus\",\"version\":\"0.47.0\"}",
 	}),
+	"operatorhub/lightbend-console-operator/0.0.1": *input.NewEntity("operatorhub/lightbend-console-operator/0.0.1", map[string]string{
+		"olm.bundle.path": `"quay.io/operatorhubio/lightbend-console-operator@sha256:2cf5f1abf71be29b7d2667ae9ca4102198c93cdef450d09faf1b26900443e285"`,
+		"olm.channel":     "{\"channelName\":\"alpha\",\"priority\":0}",
+		"olm.gvk":         "[{\"group\":\"app.lightbend.com\",\"kind\":\"Console\",\"version\":\"v1alpha1\"}]",
+		"olm.package":     "{\"packageName\":\"lightbend-console-operator\",\"version\":\"0.0.1\"}",
+	}),
 })

test/e2e/install_test.go

@@ -21,21 +21,25 @@ const (
 )
 
 var _ = Describe("Operator Install", func() {
+	var (
+		ctx          context.Context
+		pkgName      string
+		operatorName string
+		operator     *operatorv1alpha1.Operator
+	)
 	It("resolves the specified package with correct bundle path", func() {
-		var (
-			ctx          context.Context            = context.Background()
-			pkgName      string                     = "prometheus"
-			operatorName string                     = fmt.Sprintf("operator-%s", rand.String(8))
-			operator     *operatorv1alpha1.Operator = &operatorv1alpha1.Operator{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: operatorName,
-				},
-				Spec: operatorv1alpha1.OperatorSpec{
-					PackageName: pkgName,
-				},
-			}
-		)
 		ctx = context.Background()
+		pkgName = "prometheus"
+		operatorName = fmt.Sprintf("operator-%s", rand.String(8))
+		operator = &operatorv1alpha1.Operator{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: operatorName,
+			},
+			Spec: operatorv1alpha1.OperatorSpec{
+				PackageName: pkgName,
+			},
+		}
+
 		By("creating the Operator resource")
 		err := c.Create(ctx, operator)
 		Expect(err).ToNot(HaveOccurred())
@@ -64,4 +68,45 @@ var _ = Describe("Operator Install", func() {
 		err = c.Delete(ctx, operator)
 		Expect(err).ToNot(HaveOccurred())
 	})
+
+	It("errors when Rukpak is not able to install the operator", func() {
+		ctx = context.Background()
+		pkgName = "lightbend-console-operator"
+		operatorName = fmt.Sprintf("operator-%s", rand.String(8))
+		operator = &operatorv1alpha1.Operator{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: operatorName,
+			},
+			Spec: operatorv1alpha1.OperatorSpec{
+				PackageName: pkgName,
+			},
+		}
+
+		By("creating the Operator resource")
+		err := c.Create(ctx, operator)
+		Expect(err).ToNot(HaveOccurred())
+
+		By("eventually reporting a successful resolution and bundle path")
+		Eventually(func(g Gomega) {
+			err = c.Get(ctx, types.NamespacedName{Name: operator.Name}, operator)
+			g.Expect(err).ToNot(HaveOccurred())
+			g.Expect(len(operator.Status.Conditions)).NotTo(Equal(0))
+			g.Expect(operator.Status.Conditions[0].Reason).To(Equal("BundleDeploymentFailed"))
+			g.Expect(operator.Status.Conditions[0].Message).To(ContainSubstring(`error observed by Rukpak`))
+		}).WithTimeout(defaultTimeout).WithPolling(defaultPoll).Should(Succeed())
+
+		By("eventually reporting that installation of package was unsuccessful")
+		Eventually(func(g Gomega) {
+			bd := rukpakv1alpha1.BundleDeployment{}
+			err = c.Get(ctx, types.NamespacedName{Name: operatorName}, &bd)
+			g.Expect(err).ToNot(HaveOccurred())
+			g.Expect(len(bd.Status.Conditions)).NotTo(BeEquivalentTo(0))
+			g.Expect(bd.Status.Conditions[0].Reason).To(Equal("UnpackFailed"))
+		}).WithTimeout(defaultTimeout).WithPolling(defaultPoll).Should(Succeed())
+
+		By("deleting the Operator resource")
+		err = c.Delete(ctx, operator)
+		Expect(err).ToNot(HaveOccurred())
+
+	})
 })