fix: helm failed release (#2251)

framework/app-service/pkg/appstate/downloading_app.go

@@ -174,12 +174,6 @@ func (p *DownloadingApp) exec(ctx context.Context) error {
 		return err
 	}
 	values["sysVersion"] = terminus.Spec.Version
-
-	refs, err := p.getRefsForImageManager(appConfig, values)
-	if err != nil {
-		klog.Errorf("get image refs from resources failed %v", err)
-		return err
-	}
 	nodeInfo, err := utils.GetNodeInfo(ctx)
 	if err != nil {
 		klog.Errorf("failed to get node info %v", err)
@@ -187,6 +181,12 @@ func (p *DownloadingApp) exec(ctx context.Context) error {
 	}
 	values["nodes"] = nodeInfo
 
+	refs, err := p.getRefsForImageManager(appConfig, values)
+	if err != nil {
+		klog.Errorf("get image refs from resources failed %v", err)
+		return err
+	}
+
 	err = p.imageClient.Create(ctx, p.manager, refs)
 
 	if err != nil {

framework/app-service/pkg/appstate/installing_cancel_failed_app.go

@@ -7,7 +7,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ OperationApp = &UpgradeFailedApp{}
+var _ OperationApp = &InstallingCancelFailedApp{}
 
 type InstallingCancelFailedApp struct {
 	UninstallFailedApp

framework/app-service/pkg/appstate/upgrade_failed_app.go

@@ -7,10 +7,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-var _ OperationApp = &UpgradeFailedApp{}
+var _ StatefulApp = &UpgradeFailedApp{}
 
 type UpgradeFailedApp struct {
-	SuspendFailedApp
+	*DoNothingApp
 }
 
 func NewUpgradeFailedApp(c client.Client,
@@ -18,13 +18,10 @@ func NewUpgradeFailedApp(c client.Client,
 	return appFactory.New(c, manager, 0,
 		func(c client.Client, manager *appsv1.ApplicationManager, ttl time.Duration) StatefulApp {
 			return &UpgradeFailedApp{
-				SuspendFailedApp: SuspendFailedApp{
-					&baseOperationApp{
-						ttl: ttl,
-						baseStatefulApp: &baseStatefulApp{
-							manager: manager,
-							client:  c,
-						},
+				DoNothingApp: &DoNothingApp{
+					baseStatefulApp: &baseStatefulApp{
+						manager: manager,
+						client:  c,
 					},
 				},
 			}

framework/app-service/pkg/helm/helm.go

@@ -87,6 +87,7 @@ func UpgradeCharts(ctx context.Context, actionConfig *action.Configuration, sett
 	client.Namespace = namespace
 	client.Timeout = 300 * time.Second
 	client.Recreate = false
+	client.Atomic = true
 	if reuseValue {
 		client.ReuseValues = true
 	}

framework/app-service/pkg/images/client.go

@@ -199,7 +199,7 @@ func (imc *ImageManagerClient) PollDownloadProgress(ctx context.Context, am *app
 
 			}
 			err = imc.updateProgress(ctx, am, &lastProgress, ret*100, am.Spec.OpType == appv1alpha1.UpgradeOp)
-			if err == nil {
+			if err == nil && im.Status.State == "completed" {
 				return nil
 			}
 

framework/app-service/pkg/security/templates.go

@@ -3,12 +3,12 @@ package security
 import (
 	"bytetrade.io/web3os/app-service/pkg/constants"
 	"bytetrade.io/web3os/app-service/pkg/utils"
-	
+
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
 	netv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/pointer"
 )
 
 const (