Merge pull request #3651 from xyz-li/app-fix

Fix: fix app repo and helm app bugs
This commit is contained in:
KubeSphere CI Bot
2021-03-31 20:29:52 +08:00
committed by GitHub
7 changed files with 30 additions and 24 deletions

View File

@@ -87,6 +87,9 @@ func (r *ReconcileHelmApplication) Reconcile(request reconcile.Request) (reconci
return reconcile.Result{}, nil
}
}
// app has changed, update app status
return reconcile.Result{}, updateHelmApplicationStatus(r.Client, strings.TrimSuffix(app.Name, v1alpha1.HelmApplicationAppStoreSuffix), inAppStore(app))
} else {
// delete app copy in appStore
if !inAppStore(app) {
@@ -164,11 +167,6 @@ func (r *ReconcileHelmApplication) createAppCopyInAppStore(ctx context.Context,
}
}
if app.Status.State == "" {
// update status if needed
return updateHelmApplicationStatus(r.Client, originApp.Name, true)
}
return nil
}