test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: build pull image failure x509 (#1727)

Browse Source
This commit is contained in:
张启航 2023-07-29 23:49:40 +08:00 committed by GitHub
parent 749383f646
commit b750054e1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/build/dockerfile_build.go
View File

@ -136,8 +136,8 @@ func (d *dockerfileBuild) runBuildJob(re *Request, buildImageName string) error
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
buildKitTomlCMName := sources.GetImageFirstPart(builder.REGISTRYDOMAIN)
err = sources.PrepareBuildKitTomlCM(ctx, re.KubeClient, re.RbdNamespace, buildKitTomlCMName)
imageDomain, buildKitTomlCMName := sources.GetImageFirstPart(builder.REGISTRYDOMAIN)
err = sources.PrepareBuildKitTomlCM(ctx, re.KubeClient, re.RbdNamespace, buildKitTomlCMName, imageDomain)
if err != nil {
return err
}

19
builder/sources/image.go
View File

@ -443,8 +443,8 @@ func ImageBuild(arch, contextDir, cachePVCName, cacheMode, RbdNamespace, Service
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
buildKitTomlCMName := GetImageFirstPart(builder.REGISTRYDOMAIN)
err = PrepareBuildKitTomlCM(ctx, kubeClient, RbdNamespace, buildKitTomlCMName)
imageDomain, buildKitTomlCMName := GetImageFirstPart(builder.REGISTRYDOMAIN)
err = PrepareBuildKitTomlCM(ctx, kubeClient, RbdNamespace, buildKitTomlCMName, imageDomain)
if err != nil {
return err
}
@ -770,24 +770,25 @@ func CreateImageName(ServiceID, DeployVersion string) string {
}
//GetImageFirstPart -
func GetImageFirstPart(str string) string {
str = strings.Replace(str, ".", "-", -1)
str = strings.Replace(str, ":", "-", -1)
func GetImageFirstPart(str string) (string, string) {
imageDomain, imageName := str, ""
if strings.Contains(str, "/") {
parts := strings.Split(str, "/")
return parts[0]
imageDomain = parts[0]
}
return str
imageName = strings.Replace(imageDomain, ".", "-", -1)
imageName = strings.Replace(imageName, ":", "-", -1)
return imageDomain, imageName
}
//PrepareBuildKitTomlCM -
func PrepareBuildKitTomlCM(ctx context.Context, kubeClient kubernetes.Interface, namespace string, buildKitTomlCMName string) error {
func PrepareBuildKitTomlCM(ctx context.Context, kubeClient kubernetes.Interface, namespace, buildKitTomlCMName, imageDomain string) error {
buildKitTomlCM, err := kubeClient.CoreV1().ConfigMaps(namespace).Get(ctx, buildKitTomlCMName, metav1.GetOptions{})
if err != nil && !k8serror.IsNotFound(err) {
return err
}
if k8serror.IsNotFound(err) {
configStr := fmt.Sprintf("debug = true\n[registry.\"%v\"]\n http = false\n insecure = true", buildKitTomlCMName)
configStr := fmt.Sprintf("debug = true\n[registry.\"%v\"]\n http = false\n insecure = true", imageDomain)
buildKitTomlCM = &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: buildKitTomlCMName,