fix image replaoce error (koderover#2739)

Signed-off-by: allenshen <[email protected]>
jxs1211 · Jun 10, 2023 · abad8a8 · abad8a8
1 parent 27ed9ca
commit abad8a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 66 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/delivery.go b/pkg/microservice/aslan/core/common/service/delivery.go
@@ -488,9 +488,8 @@ func getServiceRenderYAML(productInfo *commonmodels.Product, containers []*commo
 		// 渲染系统变量键值
 		parsedYaml = kube.ParseSysKeys(productInfo.Namespace, productInfo.EnvName, productInfo.ProductName, serviceName, parsedYaml)
 		// 替换服务模板容器镜像为用户指定镜像
-		parsedYaml = kube.ReplaceContainerImages(parsedYaml, svcTmpl.Containers, containers)
-
-		return parsedYaml, nil
+		parsedYaml, _, err = kube.ReplaceWorkloadImages(parsedYaml, containers)
+		return parsedYaml, err
 	}
 	return "", nil
 }
diff --git a/pkg/microservice/aslan/core/common/service/kube/parse.go b/pkg/microservice/aslan/core/common/service/kube/parse.go
@@ -17,11 +17,8 @@ limitations under the License.
 package kube
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
-
-	commonmodels "github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models"
 )
 
 const (
@@ -54,20 +51,3 @@ func ParseSysKeys(namespace, envName, productName, serviceName, ori string) stri
 	ori = serviceRegex.ReplaceAllLiteralString(ori, strings.ToLower(serviceName))
 	return ori
 }
-
-func ReplaceContainerImages(tmpl string, ori []*commonmodels.Container, replace []*commonmodels.Container) string {
-	replaceMap := make(map[string]string)
-	for _, container := range replace {
-		replaceMap[container.Name] = container.Image
-	}
-
-	for _, container := range ori {
-		imageRex := regexp.MustCompile("image:\\s*" + container.Image)
-		if _, ok := replaceMap[container.Name]; !ok {
-			continue
-		}
-		tmpl = imageRex.ReplaceAllLiteralString(tmpl, fmt.Sprintf("image: %s", replaceMap[container.Name]))
-	}
-
-	return tmpl
-}
diff --git a/pkg/microservice/aslan/core/common/service/kube/render.go b/pkg/microservice/aslan/core/common/service/kube/render.go
@@ -19,7 +19,6 @@ package kube
 import (
 	"bytes"
 	"fmt"
-	"regexp"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -562,26 +561,6 @@ func RenderEnvService(prod *commonmodels.Product, render *commonmodels.RenderSet
 		return "", err
 	}
 	parsedYaml = ParseSysKeys(prod.Namespace, prod.EnvName, prod.ProductName, service.ServiceName, parsedYaml)
-	//parsedYaml = replaceContainerImages(parsedYaml, svcTmpl.Containers, service.Containers)
 	parsedYaml, _, _ = ReplaceWorkloadImages(parsedYaml, service.Containers)
 	return parsedYaml, nil
 }
-
-// this function should be deleted
-func replaceContainerImages(tmpl string, ori []*commonmodels.Container, replace []*commonmodels.Container) string {
-
-	replaceMap := make(map[string]string)
-	for _, container := range replace {
-		replaceMap[container.Name] = container.Image
-	}
-
-	for _, container := range ori {
-		imageRex := regexp.MustCompile("image:\\s*" + container.Image)
-		if _, ok := replaceMap[container.Name]; !ok {
-			continue
-		}
-		tmpl = imageRex.ReplaceAllLiteralString(tmpl, fmt.Sprintf("image: %s", replaceMap[container.Name]))
-	}
-
-	return tmpl
-}
diff --git a/pkg/microservice/aslan/core/service/service/service.go b/pkg/microservice/aslan/core/service/service/service.go
@@ -25,7 +25,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 	"sync"
 	"text/template"
@@ -1167,7 +1166,7 @@ func YamlViewServiceTemplate(args *YamlViewServiceTemplateReq) (string, error) {
 		cerSvc := prod.GetServiceMap()
 		svcInfo, found := cerSvc[args.ServiceName]
 		if found {
-			parsedYaml, err = replaceContainerImages(parsedYaml, svcTmpl.Containers, svcInfo.Containers)
+			parsedYaml, _, err = kube.ReplaceWorkloadImages(parsedYaml, svcInfo.Containers)
 			if err != nil {
 				return "", err
 			}
@@ -1177,26 +1176,6 @@ func YamlViewServiceTemplate(args *YamlViewServiceTemplateReq) (string, error) {
 	return parsedYaml, nil
 }
 
-func replaceContainerImages(tmpl string, ori []*commonmodels.Container, replace []*commonmodels.Container) (string, error) {
-	replaceMap := make(map[string]string)
-	for _, container := range replace {
-		replaceMap[container.Name] = container.Image
-	}
-
-	for _, container := range ori {
-		imageRex, err := regexp.Compile("image:\\s*" + container.Image)
-		if err != nil {
-			return "", err
-		}
-		if _, ok := replaceMap[container.Name]; !ok {
-			continue
-		}
-		tmpl = imageRex.ReplaceAllLiteralString(tmpl, fmt.Sprintf("image: %s", replaceMap[container.Name]))
-	}
-
-	return tmpl, nil
-}
-
 func UpdateReleaseNamingRule(userName, requestID, projectName string, args *ReleaseNamingRule, log *zap.SugaredLogger) error {
 	serviceTemplate, err := commonrepo.NewServiceColl().Find(&commonrepo.ServiceFindOption{
 		ServiceName:   args.ServiceName,