Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Dec 7, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/helm/controller/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
3 changes: 3 additions & 0 deletions internal/helm/release/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
estroz marked this conversation as resolved.
Show resolved Hide resolved
return uninstallResponse.Release, err
estroz marked this conversation as resolved.
Show resolved Hide resolved
}