@@ -153,13 +153,6 @@ func (h *Helm) Apply(ctx context.Context, contentFS fs.FS, ext *ocv1.ClusterExte
153
153
154
154
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 ) {
155
155
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
-
163
156
if errors .Is (err , driver .ErrReleaseNotFound ) {
164
157
desiredRelease , err := cl .Install (ext .GetName (), ext .Spec .Namespace , chrt , values , func (i * action.Install ) error {
165
158
i .DryRun = true
@@ -171,6 +164,10 @@ func (h *Helm) getReleaseState(cl helmclient.ActionInterface, ext *ocv1.ClusterE
171
164
}
172
165
return nil , desiredRelease , StateNeedsInstall , nil
173
166
}
167
+ if err != nil {
168
+ return nil , nil , StateError , err
169
+ }
170
+
174
171
desiredRelease , err := cl .Upgrade (ext .GetName (), ext .Spec .Namespace , chrt , values , func (upgrade * action.Upgrade ) error {
175
172
upgrade .MaxHistory = maxHelmReleaseHistory
176
173
upgrade .DryRun = true
0 commit comments