Merge pull request #2473 from FabianKramm/main

refactor: create pull secret

Author: FabianKramm

pkg/devspace/build/build.go

@@ -2,6 +2,8 @@ package build
 
 import (
 	"fmt"
+	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
+	"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
 	"strings"
 
 	"github.com/loft-sh/devspace/pkg/devspace/build/builder"
@@ -92,6 +94,30 @@ func (c *controller) Build(ctx devspacecontext.Context, images []string, options
 	tags := map[string][]string{}
 
 	for imageConfigName, imageConf := range conf.Images {
+		// create image pull secret if possible
+		if ctx.KubeClient() != nil && (imageConf.CreatePullSecret == nil || *imageConf.CreatePullSecret) {
+			registryURL, err := pullsecrets.GetRegistryFromImageName(imageConf.Image)
+			if err != nil {
+				return err
+			}
+
+			dockerClient, err := dockerclient.NewClient(ctx.Context(), ctx.Log())
+			if err == nil {
+				if imageConf.Kaniko != nil && imageConf.Kaniko.Namespace != "" && ctx.KubeClient().Namespace() != imageConf.Kaniko.Namespace {
+					err = pullsecrets.NewClient().EnsurePullSecret(ctx, dockerClient, imageConf.Kaniko.Namespace, registryURL)
+					if err != nil {
+						ctx.Log().Errorf("error ensuring pull secret for registry %s: %v", registryURL, err)
+					}
+				}
+
+				err = pullsecrets.NewClient().EnsurePullSecret(ctx, dockerClient, ctx.KubeClient().Namespace(), registryURL)
+				if err != nil {
+					ctx.Log().Errorf("error ensuring pull secret for registry %s: %v", registryURL, err)
+				}
+			}
+		}
+
+		// get image name and skip if we shouldn't build
 		imageName := imageConf.Image
 		if len(images) > 0 && !stringutil.Contains(images, imageConfigName) {
 			continue

pkg/devspace/build/create_builder.go

@@ -10,7 +10,6 @@ import (
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	dockerclient "github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
-	"github.com/loft-sh/devspace/pkg/devspace/pullsecrets"
 	"github.com/loft-sh/devspace/pkg/util/kubeconfig"
 	"github.com/pkg/errors"
 )
@@ -81,29 +80,6 @@ func (c *controller) createBuilder(ctx devspacecontext.Context, imageConfigName
 		}
 	}
 
-	// create image pull secret if possible
-	if ctx.KubeClient() != nil && (imageConf.CreatePullSecret == nil || *imageConf.CreatePullSecret) {
-		registryURL, err := pullsecrets.GetRegistryFromImageName(imageConf.Image)
-		if err != nil {
-			return nil, err
-		}
-
-		dockerClient, err := dockerclient.NewClient(ctx.Context(), ctx.Log())
-		if err == nil {
-			if imageConf.Kaniko != nil && imageConf.Kaniko.Namespace != "" && ctx.KubeClient().Namespace() != imageConf.Kaniko.Namespace {
-				err = pullsecrets.NewClient().EnsurePullSecret(ctx, dockerClient, imageConf.Kaniko.Namespace, registryURL)
-				if err != nil {
-					ctx.Log().Errorf("error ensuring pull secret for registry %s: %v", registryURL, err)
-				}
-			}
-
-			err = pullsecrets.NewClient().EnsurePullSecret(ctx, dockerClient, ctx.KubeClient().Namespace(), registryURL)
-			if err != nil {
-				ctx.Log().Errorf("error ensuring pull secret for registry %s: %v", registryURL, err)
-			}
-		}
-	}
-
 	return bldr, nil
 }