Skip to content

Commit 52fd265

Browse files
committed
fix: nil desiredState for not found releases in applier
1 parent 9cef99f commit 52fd265

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

internal/applier/helm.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,6 @@ func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1.ClusterExte
153153

154154
func (h *Helm) getReleaseState(cl helmclient.ActionInterface, ext *ocv1.ClusterExtension, chrt *chart.Chart, values chartutil.Values, post postrender.PostRenderer) (*release.Release, *release.Release, string, error) {
155155
currentRelease, err := cl.Get(ext.GetName())
156-
if err != nil && !errors.Is(err, driver.ErrReleaseNotFound) {
157-
return nil, nil, StateError, err
158-
}
159-
if errors.Is(err, driver.ErrReleaseNotFound) {
160-
return nil, nil, StateNeedsInstall, nil
161-
}
162-
163156
if errors.Is(err, driver.ErrReleaseNotFound) {
164157
desiredRelease, err := cl.Install(ext.GetName(), ext.Spec.Namespace, chrt, values, func(i *action.Install) error {
165158
i.DryRun = true
@@ -171,6 +164,10 @@ func (h *Helm) getReleaseState(cl helmclient.ActionInterface, ext *ocv1.ClusterE
171164
}
172165
return nil, desiredRelease, StateNeedsInstall, nil
173166
}
167+
if err != nil {
168+
return nil, nil, StateError, err
169+
}
170+
174171
desiredRelease, err := cl.Upgrade(ext.GetName(), ext.Spec.Namespace, chrt, values, func(upgrade *action.Upgrade) error {
175172
upgrade.MaxHistory = maxHelmReleaseHistory
176173
upgrade.DryRun = true

0 commit comments

Comments
 (0)