fix can't update service yaml when update from import to deploy (#4369)

Signed-off-by: Patrick Zhao <[email protected]>

Author: PetrusZ

pkg/microservice/aslan/core/common/service/kube/apply.go

@@ -64,10 +64,10 @@ type ResourceApplyParam struct {
 	UpdateResourceYaml  string
 
 	// used for helm services
-	Images                []string // all images need to be updated, used for helm services
-	VariableYaml          string   // variables
-	Timeout               int      // timeout for helm services
-	UpdateServiceRevision bool
+	Images               []string // all images need to be updated, used for helm services
+	VariableYaml         string   // variables
+	Timeout              int      // timeout for helm services
+	IsFromImportToDeploy bool
 
 	Informer                 informers.SharedInformerFactory
 	KubeClient               client.Client
@@ -661,7 +661,7 @@ func CreateOrPatchResource(applyParam *ResourceApplyParam, log *zap.SugaredLogge
 		if !ok {
 			removeRes = append(removeRes, cr.unstructured)
 		} else {
-			if r.mainfest == cr.mainfest {
+			if r.mainfest == cr.mainfest && !applyParam.IsFromImportToDeploy {
 				unchangedResources = append(unchangedResources, cr.unstructured)
 				delete(updateResourceMap, GVKN)
 			}

pkg/microservice/aslan/core/environment/service/environment.go

@@ -803,6 +803,8 @@ func updateProductImpl(updateRevisionSvcs []string, deployStrategy map[string]st
 						return
 					}
 
+					service.DeployStrategy = commonutil.GetServiceDeployStrategy(service.ServiceName, deployStrategy)
+					curEnv.GetServiceMap()[service.ServiceName].DeployStrategy = commonutil.GetServiceDeployStrategy(service.ServiceName, curEnv.ServiceDeployStrategy)
 					items, errUpsertService := upsertService(
 						updateProd,
 						service,
@@ -2780,6 +2782,11 @@ func upsertService(env *commonmodels.Product, newService *commonmodels.ProductSe
 		}
 	}
 
+	isFromImportToDeploy := false
+	if prevSvc.DeployStrategy == setting.ServiceDeployStrategyImport && newService.DeployStrategy == setting.ServiceDeployStrategyDeploy {
+		isFromImportToDeploy = true
+	}
+
 	resourceApplyParam := &kube.ResourceApplyParam{
 		ProductInfo:              env,
 		ServiceName:              newService.ServiceName,
@@ -2793,6 +2800,7 @@ func upsertService(env *commonmodels.Product, newService *commonmodels.ProductSe
 		AddZadigLabel:            addLabel,
 		SharedEnvHandler:         EnsureUpdateZadigService,
 		IstioGrayscaleEnvHandler: kube.EnsureUpdateGrayscaleService,
+		IsFromImportToDeploy:     isFromImportToDeploy,
 	}
 
 	return kube.CreateOrPatchResource(resourceApplyParam, log)