Merge pull request #902 from AllenShen/release-1.8.0

fix secret bug
koderover · Jan 7, 2022 · ed30b48 · ed30b48
2 parents 0f2e823 + 2159d45
commit ed30b48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/microservice/aslan/core/environment/service/environment.go b/pkg/microservice/aslan/core/environment/service/environment.go
@@ -2307,7 +2307,7 @@ func installOrUpgradeHelmChartWithValues(namespace, valuesYaml string, renderCha
 			releaseutil.Reverse(hrs, releaseutil.SortByRevision)
 			rel := hrs[0]
 			if rel.Info.Status == helmrelease.StatusPendingInstall || rel.Info.Status == helmrelease.StatusPendingUpgrade {
-				secretName := fmt.Sprintf("sh.helm.release.v1.%s.v.%d", rel.Name, rel.Version)
+				secretName := fmt.Sprintf("sh.helm.release.v1.%s.v%d", rel.Name, rel.Version)
 				deleteErr := updater.DeleteSecretWithName(rel.Namespace, secretName, kubecli)
 				if deleteErr != nil {
 					err = errors.WithMessagef(err, "failed to deleteSecretWithName:%s,error:%s", secretName, deleteErr)

diff --git a/pkg/microservice/warpdrive/core/service/taskplugin/deploy.go b/pkg/microservice/warpdrive/core/service/taskplugin/deploy.go
@@ -571,7 +571,7 @@ func (p *DeployTaskPlugin) Run(ctx context.Context, pipelineTask *task.Task, _ *
 				releaseutil.Reverse(hrs, releaseutil.SortByRevision)
 				rel := hrs[0]
 				if rel.Info.Status == helmrelease.StatusPendingInstall || rel.Info.Status == helmrelease.StatusPendingUpgrade {
-					secretName := fmt.Sprintf("sh.helm.release.v1.%s.v.%d", rel.Name, rel.Version)
+					secretName := fmt.Sprintf("sh.helm.release.v1.%s.v%d", rel.Name, rel.Version)
 					deleteErr := updater.DeleteSecretWithName(rel.Namespace, secretName, p.kubeClient)
 					if deleteErr != nil {
 						err = errors.WithMessagef(err, "failed to deleteSecretWithName:%s,error:%s", secretName, deleteErr)