fix: (helm) - prevent a possible nil pointer in the helm uninstall (#…

…4288) Signed-off-by: Mike Ng <ming@redhat.com>
operator-framework · Dec 7, 2020 · f015dd2 · f015dd2
1 parent e4efaa6
commit f015dd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/helm/controller/reconcile.go b/internal/helm/controller/reconcile.go
@@ -119,7 +119,7 @@ func (r HelmOperatorReconciler) Reconcile(ctx context.Context, request reconcile
 			log.Info("Release not found, removing finalizer")
 		} else {
 			log.Info("Uninstalled release")
-			if log.V(0).Enabled() {
+			if log.V(0).Enabled() && uninstalledRelease != nil {
 				fmt.Println(diff.Generate(uninstalledRelease.Manifest, ""))
 			}
 			status.SetCondition(types.HelmAppCondition{

diff --git a/internal/helm/release/manager.go b/internal/helm/release/manager.go
@@ -370,5 +370,8 @@ func (m manager) UninstallRelease(ctx context.Context, opts ...UninstallOption)
 		}
 	}
 	uninstallResponse, err := uninstall.Run(m.releaseName)
+	if uninstallResponse == nil {
+		return nil, err
+	}
 	return uninstallResponse.Release, err
 }