admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: can not re-upgrade helm application in a failed state (#5543)

Browse Source
This commit is contained in:
Sekfung Lau
2023-02-21 14:42:28 +08:00
committed by GitHub
parent 7e4ba8215f
commit dbdf006fb5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/controller/openpitrix/helmrelease/helm_release_controller.go
View File

@@ -179,9 +179,16 @@ func (r *ReconcileHelmRelease) reconcile(instance *v1alpha1.HelmRelease) (reconc
var err error
switch instance.Status.State {
case v1alpha1.HelmStatusDeleting, v1alpha1.HelmStatusFailed:
case v1alpha1.HelmStatusDeleting:
// no operation
return reconcile.Result{}, nil
case v1alpha1.HelmStatusFailed:
// Release used to be failed, but instance.Status.Version not equal to instance.Spec.Version
if instance.Status.Version != instance.Spec.Version {
return r.createOrUpgradeHelmRelease(instance, true)
} else {
return reconcile.Result{}, nil
}
case v1alpha1.HelmStatusActive:
// Release used to be active, but instance.Status.Version not equal to instance.Spec.Version
if instance.Status.Version != instance.Spec.Version {

2
pkg/models/openpitrix/release.go
View File

@@ -102,7 +102,7 @@ func (c *releaseOperator) UpgradeApplication(request UpgradeClusterRequest) erro
}
switch oldRls.Status.State {
case v1alpha1.StateActive, v1alpha1.HelmStatusUpgraded, v1alpha1.HelmStatusCreated:
case v1alpha1.StateActive, v1alpha1.HelmStatusUpgraded, v1alpha1.HelmStatusCreated, v1alpha1.HelmStatusFailed:
// no operation
default:
return errors.New("can not upgrade application now")