fix failing tests

vmware-tanzu · Jul 26, 2022 · 8fc4a78 · 8fc4a78
1 parent 796e9f4
commit 8fc4a78
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/addons/controllers/packageinstallstatus_controller.go b/addons/controllers/packageinstallstatus_controller.go
@@ -205,12 +205,13 @@ func (r *PackageInstallStatusReconciler) reconcile(clusterClient client.Client,
 
 	var errorList []error
 
+	patchHelper, err := clusterapipatchutil.NewHelper(clusterBootstrap, r.Client)
+	if err != nil {
+		errorList = append(errorList, errors.Wrap(err, "error patching ClusterBootstrapStatus"))
+		retErr = kerrors.NewAggregate(errorList)
+	}
+
 	defer func() {
-		patchHelper, err := clusterapipatchutil.NewHelper(clusterBootstrap, r.Client)
-		if err != nil {
-			errorList = append(errorList, errors.Wrap(err, "error patching ClusterBootstrapStatus"))
-			retErr = kerrors.NewAggregate(errorList)
-		}
 		if err := patchHelper.Patch(r.ctx, clusterBootstrap); err != nil {
 			errorList = append(errorList, errors.Wrap(err, "error patching ClusterBootstrapStatus"))
 			retErr = kerrors.NewAggregate(errorList)