Skip to content

Commit

Permalink
Merge pull request koderover#771 from panxunying/image_registrty_bugfix
Browse files Browse the repository at this point in the history
format image pull secret name
  • Loading branch information
flyer103 authored Dec 17, 2021
2 parents 2fe6cb5 + c19b39b commit 2a50d84
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions pkg/microservice/warpdrive/core/service/taskplugin/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"net"
"os"
"path"
"regexp"
"sort"
"strconv"
"strings"
Expand Down Expand Up @@ -549,6 +550,18 @@ func buildJobWithLinkedNs(taskType config.TaskType, jobImage, jobName, serviceNa

return job, nil
}
func formatRegistryName(namespaceInRegistry string) (string, error) {
reg, err := regexp.Compile("[^a-zA-Z0-9]+")
if err != nil {
return "", err
}
processedName := reg.ReplaceAllString(namespaceInRegistry, "")
processedName = strings.ToLower(processedName)
if len(processedName) > 237 {
processedName = processedName[:237]
}
return processedName, nil
}

func createOrUpdateRegistrySecrets(namespace, registryID string, registries []*task.RegistryNamespace, kubeClient client.Client) error {
for _, reg := range registries {
Expand All @@ -558,9 +571,13 @@ func createOrUpdateRegistrySecrets(namespace, registryID string, registries []*t

arr := strings.Split(reg.Namespace, "/")
namespaceInRegistry := arr[len(arr)-1]
secretName := namespaceInRegistry + registrySecretSuffix
filteredName, err := formatRegistryName(namespaceInRegistry)
if err != nil {
return err
}
secretName := filteredName + registrySecretSuffix
if reg.RegType != "" {
secretName = namespaceInRegistry + "-" + reg.RegType + registrySecretSuffix
secretName = filteredName + "-" + reg.RegType + registrySecretSuffix
}
if reg.ID == registryID {
secretName = setting.DefaultImagePullSecret
Expand Down

0 comments on commit 2a50d84

Please sign in to comment.