Merge pull request #25 from fluxcd/check-nil-cleanup

controllers: check if != nil before defering

Author: hiddeco

controllers/helmchart_controller.go

@@ -182,7 +182,9 @@ func (r *HelmChartReconciler) sync(repository sourcev1.HelmRepository, chart sou
 			err = fmt.Errorf("auth options error: %w", err)
 			return sourcev1.HelmChartNotReady(chart, sourcev1.AuthenticationFailedReason, err.Error()), err
 		}
-		defer cleanup()
+		if cleanup != nil {
+			defer cleanup()
+		}
 		clientOpts = opts
 	}
 

controllers/helmrepository_controller.go

@@ -137,7 +137,9 @@ func (r *HelmRepositoryReconciler) sync(repository sourcev1.HelmRepository) (sou
 			err = fmt.Errorf("auth options error: %w", err)
 			return sourcev1.HelmRepositoryNotReady(repository, sourcev1.AuthenticationFailedReason, err.Error()), err
 		}
-		defer cleanup()
+		if cleanup != nil {
+			defer cleanup()
+		}
 		clientOpts = opts
 	}