From ab3879d170baa78296e7ddee419bbab2a636fc6f Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Thu, 16 Apr 2020 11:11:51 +0200
Subject: [PATCH] controllers: check if != nil before defering

---
 controllers/helmchart_controller.go      | 4 +++-
 controllers/helmrepository_controller.go | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
index 824af83f..b47bbce8 100644
--- a/controllers/helmchart_controller.go
+++ b/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
 	}
 
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
index de3d91a6..d646106c 100644
--- a/controllers/helmrepository_controller.go
+++ b/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
 	}