fix import service images not correct

Signed-off-by: Patrick Zhao <[email protected]>
koderover · Jan 23, 2025 · e363519 · e363519
1 parent a8cd447
commit e363519
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/kube/helm.go b/pkg/microservice/aslan/core/common/service/kube/helm.go
@@ -725,6 +725,14 @@ func DeployMultiHelmRelease(productResp *commonmodels.Product, helmClient *helmt
 				continue
 			}
 			if !commonutil.ChartDeployed(chartInfo, productResp.ServiceDeployStrategy) {
+				// update import services' images in container and values yaml
+				_, err = helmservice.NewHelmDeployService().GenMergedValues(prodSvc, productResp.DefaultValues, nil)
+				if err != nil {
+					err = fmt.Errorf("failed to gene merged values, err: %s", err)
+					mongotool.AbortTransaction(session)
+					log.Error(err)
+					return err
+				}
 				continue
 			}
 

diff --git a/...icroservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_helm_deploy.go b/...icroservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_helm_deploy.go
@@ -105,10 +105,7 @@ func (c *HelmDeployJobCtl) Run(ctx context.Context) {
 		logError(c.job, msg, c.logger)
 		return
 	}
-
-	if slices.Contains(c.jobTaskSpec.DeployContents, config.DeployConfig) {
-		newEnvService.DeployStrategy = setting.ServiceDeployStrategyDeploy
-	}
+	newEnvService.DeployStrategy = setting.ServiceDeployStrategyDeploy
 
 	finalValuesYaml := ""
 	if len(c.jobTaskSpec.DeployContents) == 1 && slices.Contains(c.jobTaskSpec.DeployContents, config.DeployImage) {

diff --git a/pkg/microservice/aslan/core/environment/service/image.go b/pkg/microservice/aslan/core/environment/service/image.go
@@ -68,6 +68,7 @@ func updateContainerForHelmChart(username, serviceName, image, containerName str
 		return err
 	}
 
+	targetProductService.DeployStrategy = setting.ServiceDeployStrategyDeploy
 	err = kube.DeploySingleHelmRelease(product, targetProductService, serviceObj, []string{image}, 0, username)
 	if err != nil {
 		return fmt.Errorf("failed to upgrade helm release, err: %s", err.Error())

diff --git a/pkg/microservice/aslan/core/environment/service/version.go b/pkg/microservice/aslan/core/environment/service/version.go
@@ -342,6 +342,7 @@ func RollbackEnvServiceVersion(ctx *internalhandler.Context, projectName, envNam
 		}
 
 		env.DefaultValues = ""
+		envSvcVersion.Service.DeployStrategy = setting.ServiceDeployStrategyDeploy
 		envSvcVersion.Service.GetServiceRender().SetOverrideYaml(string(mergedValuesYaml))
 
 		err = kube.DeploySingleHelmRelease(env, envSvcVersion.Service, svcTmpl, nil, 0, ctx.UserName)