fix

Author: xdonggao

Diff for: pkg/application/controller/app/action/install.go

@@ -20,6 +20,7 @@ package action
 
 import (
 	"context"
+	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	applicationv1 "tkestack.io/tke/api/application/v1"
@@ -31,6 +32,7 @@ import (
 	applicationprovider "tkestack.io/tke/pkg/application/provider/application"
 	"tkestack.io/tke/pkg/application/util"
 	chartpath "tkestack.io/tke/pkg/application/util/chartpath/v1"
+	"tkestack.io/tke/pkg/util/log"
 )
 
 // Install installs a chart archive
@@ -52,7 +54,12 @@ func Install(ctx context.Context,
 	destfile, err := Pull(ctx, applicationClient, platformClient, app, repo, updateStatusFunc)
 	if err != nil {
 		newStatus := app.Status.DeepCopy()
-		if updateStatusFunc != nil && app.Status.Phase != applicationv1.AppPhaseInstallFailed {
+		if updateStatusFunc != nil {
+			if app.Status.Phase == applicationv1.AppPhaseInstallFailed {
+				log.Error(fmt.Sprintf("install app failed, helm pull err: %s", err.Error()))
+				// delayed retry, queue.AddRateLimited does not meet the demand
+				return app, nil
+			}
 			newStatus.Phase = applicationv1.AppPhaseInstallFailed
 			newStatus.Message = "fetch chart failed"
 			newStatus.Reason = err.Error()
@@ -62,8 +69,6 @@ func Install(ctx context.Context,
 				return nil, updateStatusErr
 			}
 		}
-		// delayed retry, queue.AddRateLimited does not meet the demand
-		return app, nil
 	}
 
 	newApp, err := applicationClient.Apps(app.Namespace).Get(ctx, app.Name, metav1.GetOptions{})
@@ -95,6 +100,7 @@ func Install(ctx context.Context,
 		var updateStatusErr error
 		if err != nil {
 			if app.Status.Phase == applicationv1.AppPhaseInstallFailed {
+				log.Error(fmt.Sprintf("install app failed, helm install err: %s", err.Error()))
 				// delayed retry, queue.AddRateLimited does not meet the demand
 				return app, nil
 			}

Diff for: pkg/application/controller/app/action/upgrade.go

@@ -20,6 +20,7 @@ package action
 
 import (
 	"context"
+	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	applicationv1 "tkestack.io/tke/api/application/v1"
@@ -31,6 +32,7 @@ import (
 	applicationprovider "tkestack.io/tke/pkg/application/provider/application"
 	"tkestack.io/tke/pkg/application/util"
 	chartpath "tkestack.io/tke/pkg/application/util/chartpath/v1"
+	"tkestack.io/tke/pkg/util/log"
 )
 
 // Upgrade upgrade a helm release
@@ -55,6 +57,7 @@ func Upgrade(ctx context.Context,
 		newStatus := app.Status.DeepCopy()
 		if updateStatusFunc != nil {
 			if app.Status.Phase == applicationv1.AppPhaseUpgradFailed {
+				log.Error(fmt.Sprintf("upgrade app failed, helm pull err: %s", err.Error()))
 				// delayed retry, queue.AddRateLimited does not meet the demand
 				return app, nil
 			}
@@ -98,6 +101,7 @@ func Upgrade(ctx context.Context,
 		var updateStatusErr error
 		if err != nil {
 			if app.Status.Phase == applicationv1.AppPhaseUpgradFailed {
+				log.Error(fmt.Sprintf("upgrade app failed, helm upgrade err: %s", err.Error()))
 				// delayed retry, queue.AddRateLimited does not meet the demand
 				return app, nil
 			}

Diff for: pkg/application/controller/app/app_controller.go

@@ -160,6 +160,7 @@ func (c *Controller) needsUpdate(old *applicationv1.App, new *applicationv1.App)
 	if new.Status.Phase == applicationv1.AppPhaseSyncFailed ||
 		new.Status.Phase == applicationv1.AppPhaseInstallFailed ||
 		new.Status.Phase == applicationv1.AppPhaseUpgradFailed ||
+		new.Status.Phase == applicationv1.AppPhaseSucceeded ||
 		new.Status.Phase == applicationv1.AppPhaseTerminating {
 		return true
 	}
@@ -371,6 +372,8 @@ func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedAp
 	rels, err := action.List(ctx, c.client.ApplicationV1(), c.platformClient, app)
 	if err != nil {
 		if app.Status.Phase == applicationv1.AppPhaseSyncFailed {
+			log.Error(fmt.Sprintf("sync app failed, helm list failed, err: %s", err.Error()))
+			// delayed retry, queue.AddRateLimited does not meet the demand
 			return app, nil
 		}
 		newStatus.Phase = applicationv1.AppPhaseSyncFailed
@@ -382,6 +385,8 @@ func (c *Controller) syncAppFromRelease(ctx context.Context, cachedApp *cachedAp
 	rel, found := helmutil.Filter(rels, app.Spec.TargetNamespace, app.Spec.Name)
 	if !found {
 		if app.Status.Phase == applicationv1.AppPhaseSyncFailed {
+			log.Error(fmt.Sprintf("sync app failed, release not found: %s/%s", app.Spec.TargetNamespace, app.Spec.Name))
+			// delayed retry, queue.AddRateLimited does not meet the demand
 			return app, nil
 		}
 		newStatus.Phase = applicationv1.AppPhaseSyncFailed