xxq250
/
devops-super
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 代码抽取

This commit is contained in:
zze 2023-12-15 15:22:58 +08:00
parent 9521b35985
commit 7b66c59ef9
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
internal/logic/ci_pipeline/run.go
View File

@ -369,17 +369,7 @@ func createCiPod(kubeClient *kubernetes.Client, namespace, name string, arrangeC
}
if hasKaniko { // 如果存在 kaniko 环境，检查 kaniko 环境配置的镜像仓库认证秘钥内容和 kubernetes 集群中 ConfigMap 中的配置是否一致
configMap, err := kubeClient.GetConfigMap(namespace, consts.CI_CLIENT_CONFIG_MAP_NAME)
if err != nil && !kubernetes.IsNotFoundError(err) {
return err
}
var (
noConfigMap = kubernetes.IsNotFoundError(err)
configDataMap = make(map[string]string)
shouldUpdateConfigMap = false
)
configDataMap := make(map[string]string)
for _, secretId := range dockerRegistrySecretIds.Slice() {
eSecret, err := service.Secret().Get(kubeClient.Ctx, &do.Secret{Id: secretId.(int)})
if err != nil {
@ -407,24 +397,10 @@ func createCiPod(kubeClient *kubernetes.Client, namespace, name string, arrangeC
itemKey := fmt.Sprintf("%s-%d", consts.CI_CLIENT_CONFIG_MAP_SECRET_KEY_PREFIX, secretId)
configDataMap[fmt.Sprintf(itemKey)] = string(authConfigJson)
if !noConfigMap { // 存在 config map
if content, ok := configMap.Data[itemKey]; !ok || content != string(authConfigJson) {
shouldUpdateConfigMap = true
configMap.Data[itemKey] = string(authConfigJson)
}
}
}
if noConfigMap {
if err := kubeClient.CreateConfigMap(namespace, consts.CI_CLIENT_CONFIG_MAP_NAME, configDataMap); err != nil {
return err
}
} else {
if shouldUpdateConfigMap {
if err := kubeClient.UpdateConfigMap(namespace, configMap); err != nil {
return err
}
}
if err := kubeClient.PresentConfigMapData(namespace, consts.CI_CLIENT_CONFIG_MAP_NAME, configDataMap); err != nil {
return err
}
volumes = append(volumes, corev1.Volume{

31
utility/thirdclients/kubernetes/config_map.go
View File

@ -16,8 +16,7 @@ func (cli *Client) GetConfigMap(namespace, name string) (*corev1.ConfigMap, erro
func (cli *Client) CreateConfigMap(namespace, name string, data map[string]string) error {
configMap := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: namespace,
Name: name,
},
Data: data,
}
@ -35,3 +34,31 @@ func (cli *Client) UpdateConfigMap(namespace string, configMap *corev1.ConfigMap
}
return nil
}
// PresentConfigMapData 确保配置文件存在
func (cli *Client) PresentConfigMapData(namespace, name string, items map[string]string) error {
configMap, err := cli.GetConfigMap(namespace, name)
if err != nil && !IsNotFoundError(err) {
return err
}
var noConfigMap = IsNotFoundError(err)
if noConfigMap {
if err := cli.CreateConfigMap(namespace, name, items); err != nil {
return err
}
} else {
shouldUpdateConfigMap := false
for itemKey, itemContent := range items {
if content, ok := configMap.Data[itemKey]; !ok || content != itemContent {
shouldUpdateConfigMap = true
configMap.Data[itemKey] = itemContent
}
}
if shouldUpdateConfigMap {
if err := cli.UpdateConfigMap(namespace, configMap); err != nil {
return err
}
}
}
return nil
}