Merge pull request #44 from sampsonye/feat-integrate-format

修改生成K8S secrets逻辑，不依赖于registry名称

internal/core/kuberes/application.go

@@ -523,7 +523,6 @@ func CreateRegistrySecret(cluster, namespace string, envID int64) error {
 	}
 
 	var registryAddr, registryUser, registryPassword, registryAuth string
-	registryName := strings.ToLower(integrateSettingRegistry.Name)
 	if registryConf, ok := integrateSettingRegistry.Config.(*settings.RegistryConfig); ok {
 		registryAddr = registryConf.URL
 		registryPassword = registryConf.Password
@@ -534,7 +533,7 @@ func CreateRegistrySecret(cluster, namespace string, envID int64) error {
 		return fmt.Errorf("parse integrate setting registry config error")
 	}
 
-	registrySecretName := fmt.Sprintf("registry-%v", registryName)
+	registrySecretName := fmt.Sprintf("registry-%x", integrateSettingRegistry.ID)
 	registryInfo := make(map[string]interface{})
 	registryInfo[registryAddr] = map[string]string{
 		"username": registryUser,

internal/core/kuberes/deployworker.go

@@ -18,7 +18,6 @@ package kuberes
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/go-atomci/atomci/internal/core/settings"
 	"github.com/go-atomci/atomci/internal/dao"
@@ -159,5 +158,5 @@ func getDefaultPullSecretAndRegistryAddr(envID int64) (string, string, error) {
 		url = registryConf.URL
 	}
 
-	return "registry-" + strings.ToLower(integrateSettingRegistry.Name), url, nil
+	return fmt.Sprintf("registry-%x", integrateSettingRegistry.ID), url, nil
 }