From 96c7fb25c488d919b0875f7522c89e480f660179 Mon Sep 17 00:00:00 2001 From: Patrick Zhao Date: Sat, 8 Feb 2025 10:02:47 +0800 Subject: [PATCH] fix bugs Signed-off-by: Patrick Zhao --- pkg/microservice/aslan/core/common/service/helm/helm.go | 2 ++ .../workflowcontroller/jobcontroller/job_helm_deploy.go | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/microservice/aslan/core/common/service/helm/helm.go b/pkg/microservice/aslan/core/common/service/helm/helm.go index 0ee6430ba7..959d25d11a 100644 --- 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/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_helm_deploy.go b/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_helm_deploy.go index 926e8499f1..3755f24961 100644 --- a/pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_helm_deploy.go +++ b/pkg/microservice/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()