Skip to content

refactor: create pull secret #2473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FabianKramm merged 1 commit into from
Dec 21, 2022
Merged

refactor: create pull secret #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions pkg/devspace/build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -93,6 +95,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
Expand Down
24 changes: 0 additions & 24 deletions pkg/devspace/build/create_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
}

Expand Down