fix bugs

Signed-off-by: Patrick Zhao <[email protected]>
koderover · Feb 8, 2025 · 96c7fb2 · 96c7fb2
1 parent 84343fa
commit 96c7fb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/helm/helm.go b/pkg/microservice/aslan/core/common/service/helm/helm.go
@@ -517,6 +517,8 @@ func (s *HelmDeployService) GenNewEnvService(prod *commonmodels.Product, service
 				Containers:  tmplSvc.Containers,
 			}
 		} else {
+			prodSvc.Revision = tmplSvc.Revision
+
 			containerMap := make(map[string]*commonmodels.Container)
 			for _, container := range prodSvc.Containers {
 				containerMap[container.Name] = container

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
@@ -34,6 +34,7 @@ import (
 	helmservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/helm"
 	"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/kube"
 	"github.com/koderover/zadig/v2/pkg/setting"
+	"github.com/koderover/zadig/v2/pkg/tool/log"
 	"github.com/koderover/zadig/v2/pkg/types/job"
 )
 
@@ -143,8 +144,8 @@ func (c *HelmDeployJobCtl) Run(ctx context.Context) {
 
 	c.ack()
 
-	c.logger.Infof("start helm deploy, productName %s serviceName %s namespace %s, values %s, overrideKVs: %s updateServiceRevision %v",
-		c.workflowCtx.ProjectName, c.jobTaskSpec.ServiceName, c.namespace, finalValuesYaml, newEnvService.GetServiceRender().OverrideValues, updateServiceRevision)
+	c.logger.Infof("start helm deploy, productName %s serviceName %s namespace %s, values %s, overrideKVs: %s updateServiceRevision %v, revision %d",
+		c.workflowCtx.ProjectName, c.jobTaskSpec.ServiceName, c.namespace, finalValuesYaml, newEnvService.GetServiceRender().OverrideValues, updateServiceRevision, newEnvService.Revision)
 
 	timeOut := c.timeout()