Merge pull request #2708 from Andrioden/main

fix: --dependency flag is respected by dependency resolving

cmd/run_pipeline.go

@@ -340,7 +340,7 @@ func initialize(ctx context.Context, f factory.Factory, options *CommandOptions,
 	}
 
 	// resolve dependencies
-	dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{SkipDependencies: options.DependencyOptions.Exclude})
+	dependencies, err := f.NewDependencyManager(devCtx, options.ConfigOptions).ResolveAll(devCtx, dependency.ResolveOptions{SkipDependencies: options.DependencyOptions.Exclude, Dependencies: options.DependencyOptions.Only})
 	if err != nil {
 		return nil, errors.Wrap(err, "deploy dependencies")
 	}

pkg/devspace/dependency/manager.go

@@ -2,6 +2,8 @@ package dependency
 
 import (
 	"bytes"
+	"strings"
+
 	"github.com/loft-sh/devspace/pkg/devspace/build"
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader"
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
@@ -11,7 +13,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"strings"
 )
 
 // Manager can update, build, deploy and purge dependencies.

pkg/devspace/dependency/resolver.go

@@ -18,6 +18,7 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/types"
 	"github.com/loft-sh/devspace/pkg/devspace/dependency/util"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
+	"github.com/loft-sh/devspace/pkg/util/stringutil"
 	"github.com/pkg/errors"
 )
 
@@ -120,6 +121,10 @@ func (r *resolver) resolveRecursive(ctx devspacecontext.Context, basePath, paren
 			continue
 		}
 
+		if len(options.Dependencies) > 0 && !stringutil.Contains(options.Dependencies, dependencyConfig.Name) {
+			continue
+		}
+
 		if dependencyConfig.Disabled {
 			ctx.Log().Debugf("Skip dependency %s, because it is disabled", dependencyConfig.Name)
 			continue