From b6ee546fed96070bdddd2ff3e33a4e253acc9c10 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Mon, 7 Dec 2020 09:58:29 -0500 Subject: [PATCH] fix: (helm) - prevent a possible nil pointer in the helm uninstall Signed-off-by: Mike Ng --- internal/helm/controller/reconcile.go | 2 +- internal/helm/release/manager.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/helm/controller/reconcile.go b/internal/helm/controller/reconcile.go index edba053458d..fb0e56d692b 100644 --- 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 index f6b671b9335..d72c2a0c0c5 100644 --- 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 }