fix(plugins): error not reported in plugin (#1755)

* fix: set HelmReconcileFailedCondition if HelmRelease creation fails for Plugin

On-behalf-of: @SAP krzysztof.zagorski@sap.com

* fix flaky E2E test from catalog scenario

On-behalf-of: @SAP krzysztof.zagorski@sap.com

Author: Zaggy21

e2e/catalog/scenarios/catalog_fail.go

@@ -44,7 +44,7 @@ func (s *scenario) ExecuteCPDFailScenario(ctx context.Context, namespace string)
 		g.Expect(inventory).To(HaveLen(len(catalog.Spec.Sources)), "number of Catalog status inventory map should be equal to catalog sources length")
 		for groupKey, items := range inventory {
 			g.Expect(items).To(HaveLen(4), "each Catalog status inventory entry should have 4 items")
-			s.expectStatusPropagationInCatalogInventory(ctx, groupKey, false)
+			s.expectStatusPropagationInCatalogInventory(g, ctx, groupKey, false)
 		}
 		catalogReady := catalog.Status.GetConditionByType(greenhousemetav1alpha1.ReadyCondition)
 		g.Expect(catalogReady).ToNot(BeNil(), "the Catalog should have a Ready condition")
@@ -81,7 +81,7 @@ func (s *scenario) ExecuteArtifactFailScenario(ctx context.Context, namespace st
 		g.Expect(inventory).To(HaveLen(len(catalog.Spec.Sources)), "number of Catalog status inventory map should be equal to catalog sources length")
 		for groupKey, items := range inventory {
 			g.Expect(items).To(HaveLen(4), "each Catalog status inventory entry should have 4 items")
-			s.expectStatusPropagationInCatalogInventory(ctx, groupKey, true)
+			s.expectStatusPropagationInCatalogInventory(g, ctx, groupKey, true)
 		}
 		catalogReady := catalog.Status.GetConditionByType(greenhousemetav1alpha1.ReadyCondition)
 		g.Expect(catalogReady).ToNot(BeNil(), "the Catalog should have a Ready condition")
@@ -119,7 +119,7 @@ func (s *scenario) ExecuteGitAuthFailScenario(ctx context.Context, namespace str
 		g.Expect(inventory).To(HaveLen(len(catalog.Spec.Sources)), "number of Catalog status inventory map should be equal to catalog sources length")
 		for groupKey, items := range inventory {
 			g.Expect(items).To(HaveLen(4), "each Catalog status inventory entry should have 4 items")
-			s.expectStatusPropagationInCatalogInventory(ctx, groupKey, true)
+			s.expectStatusPropagationInCatalogInventory(g, ctx, groupKey, true)
 		}
 		catalogReady := catalog.Status.GetConditionByType(greenhousemetav1alpha1.ReadyCondition)
 		g.Expect(catalogReady).ToNot(BeNil(), "the Catalog should have a Ready condition")

e2e/catalog/scenarios/catalog_success.go

@@ -71,7 +71,7 @@ func (s *scenario) verifySuccess(ctx context.Context, expectedLabels map[string]
 		g.Expect(inventory).To(HaveLen(len(catalog.Spec.Sources)), "number of Catalog status inventory map should be equal to catalog sources length")
 		for groupKey, items := range inventory {
 			g.Expect(items).To(HaveLen(4), "each Catalog status inventory entry should have 4 items")
-			s.expectStatusPropagationInCatalogInventory(ctx, groupKey, false)
+			s.expectStatusPropagationInCatalogInventory(g, ctx, groupKey, false)
 		}
 		catalogReady := catalog.Status.GetConditionByType(greenhousemetav1alpha1.ReadyCondition)
 		g.Expect(catalogReady).ToNot(BeNil(), "the Catalog should have a Ready condition")

e2e/catalog/scenarios/scenario.go

@@ -357,12 +357,12 @@ func checkIfRepositoryIsOverridden(spec greenhousev1alpha1.PluginDefinitionSpec,
 	}
 }
 
-func (s *scenario) expectStatusPropagationInCatalogInventory(ctx context.Context, groupKey string, ignoreNotFound bool) {
+func (s *scenario) expectStatusPropagationInCatalogInventory(g Gomega, ctx context.Context, groupKey string, ignoreNotFound bool) {
 	GinkgoHelper()
 	catalog := &greenhousev1alpha1.Catalog{}
-	Expect(s.k8sClient.Get(ctx, client.ObjectKeyFromObject(s.catalog), catalog)).ToNot(HaveOccurred(), "there should be no error getting the Catalog")
+	g.Expect(s.k8sClient.Get(ctx, client.ObjectKeyFromObject(s.catalog), catalog)).ToNot(HaveOccurred(), "there should be no error getting the Catalog")
 	groupInventory := catalog.Status.Inventory[groupKey]
-	Expect(groupInventory).ToNot(BeEmpty(), "the Catalog status inventory for the source should not be empty")
+	g.Expect(groupInventory).ToNot(BeEmpty(), "the Catalog status inventory for the source should not be empty")
 	for _, resource := range groupInventory {
 		kindInventoryStatus := resource.Ready
 		var fluxObj lifecycle.CatalogObject
@@ -384,9 +384,9 @@ func (s *scenario) expectStatusPropagationInCatalogInventory(ctx context.Context
 			// ignore not found errors
 			return
 		}
-		Expect(err).ToNot(HaveOccurred(), "there should be no error getting the catalog flux resource: "+fluxObj.GetName())
+		g.Expect(err).ToNot(HaveOccurred(), "there should be no error getting the catalog flux resource: "+fluxObj.GetName())
 		fluxCondition := meta.FindStatusCondition(fluxObj.GetConditions(), fluxmeta.ReadyCondition)
-		Expect(fluxCondition).ToNot(BeNil(), "the underlying resource should have a Ready condition: "+fluxObj.GetName())
-		Expect(kindInventoryStatus).To(Equal(fluxCondition.Status), "the Catalog inventory status should contain the flux resource condition status")
+		g.Expect(fluxCondition).ToNot(BeNil(), "the underlying resource should have a Ready condition: "+fluxObj.GetName())
+		g.Expect(kindInventoryStatus).To(Equal(fluxCondition.Status), "the Catalog inventory status should contain the flux resource condition status")
 	}
 }

internal/controller/plugin/plugin_controller_flux.go

@@ -228,8 +228,8 @@ func (r *PluginReconciler) ensureHelmRelease(
 		return controllerutil.SetControllerReference(plugin, release, r.Scheme())
 	})
 	if err != nil {
-		plugin.SetCondition(greenhousemetav1alpha1.FalseCondition(
-			greenhousev1alpha1.StatusUpToDateCondition, "", "failed to create/update Helm release: "+err.Error()))
+		plugin.SetCondition(greenhousemetav1alpha1.TrueCondition(
+			greenhousev1alpha1.HelmReconcileFailedCondition, "", "Failed to create/update Helm release: "+err.Error()))
 		return err
 	}
 	switch result {