Merge pull request #2244 from lizardruss/fix-dependency-redeploy

fix: use chart directory to detect chart changes

Author: FabianKramm

pkg/devspace/dependency/util/util.go

@@ -36,6 +36,34 @@ func init() {
 // downloadMutex makes sure we only download a single dependency at a time
 var downloadMutex = sync.Mutex{}
 
+func GetDependencyPath(workingDirectory string, source *latest.SourceConfig) (configPath string, err error) {
+	ID, err := GetDependencyID(source)
+	if err != nil {
+		return "", err
+	}
+
+	// Resolve source
+	var localPath string
+	if source.Git != "" {
+		localPath = filepath.Join(DependencyFolderPath, ID)
+	} else if source.Path != "" {
+		if isURL(source.Path) {
+			localPath = filepath.Join(DependencyFolderPath, ID)
+		} else {
+			if filepath.IsAbs(source.Path) {
+				localPath = source.Path
+			} else {
+				localPath, err = filepath.Abs(filepath.Join(workingDirectory, filepath.FromSlash(source.Path)))
+				if err != nil {
+					return "", errors.Wrap(err, "filepath absolute")
+				}
+			}
+		}
+	}
+
+	return getDependencyConfigPath(localPath, source)
+}
+
 func DownloadDependency(ctx context.Context, workingDirectory string, source *latest.SourceConfig, log log.Logger) (configPath string, err error) {
 	downloadMutex.Lock()
 	defer downloadMutex.Unlock()

pkg/devspace/deploy/deployer/helm/deploy.go

@@ -2,11 +2,12 @@ package helm
 
 import (
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/config/versions"
 	"io"
 	"os"
 	"path/filepath"
 
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/legacy"
 	runtimevar "github.com/loft-sh/devspace/pkg/devspace/config/loader/variable/runtime"
 	"github.com/loft-sh/devspace/pkg/devspace/config/remotecache"
@@ -44,13 +45,24 @@ func (d *DeployConfig) Deploy(ctx devspacecontext.Context, forceDeploy bool) (bo
 		releaseNamespace = d.DeploymentConfig.Namespace
 	}
 
+	if d.DeploymentConfig.Helm.Chart.Source != nil {
+		downloadPath, err := d.Helm.DownloadChart(ctx, d.DeploymentConfig.Helm)
+		if err != nil {
+			return false, errors.Wrap(err, "download chart")
+		}
+		chartPath = downloadPath
+	}
+
 	// Hash the chart directory if there is any
 	_, err := os.Stat(ctx.ResolvePath(chartPath))
 	if err == nil {
 		chartPath = ctx.ResolvePath(chartPath)
 
 		// Check if the chart directory has changed
-		hash, err = hashpkg.Directory(chartPath)
+		hash, err = hashpkg.DirectoryExcludes(chartPath, []string{
+			".git/",
+			".devspace/",
+		}, true)
 		if err != nil {
 			return false, errors.Errorf("Error hashing chart directory: %v", err)
 		}

pkg/devspace/helm/testing/client.go

@@ -15,6 +15,10 @@ type Client struct {
 	Releases []*types.Release
 }
 
+func (f *Client) DownloadChart(ctx devspacecontext.Context, helmConfig *latest.HelmConfig) (string, error) {
+	return "", nil
+}
+
 // UpdateRepos implements interface
 func (f *Client) UpdateRepos() error {
 	return nil

pkg/devspace/helm/types/interface.go

@@ -7,6 +7,7 @@ import (
 
 // Client is the client interface for helm
 type Client interface {
+	DownloadChart(ctx devspacecontext.Context, helmConfig *latest.HelmConfig) (string, error)
 	InstallChart(ctx devspacecontext.Context, releaseName string, releaseNamespace string, values map[string]interface{}, helmConfig *latest.HelmConfig) (*Release, error)
 	Template(ctx devspacecontext.Context, releaseName, releaseNamespace string, values map[string]interface{}, helmConfig *latest.HelmConfig) (string, error)
 	DeleteRelease(ctx devspacecontext.Context, releaseName string, releaseNamespace string) error

pkg/devspace/helm/v3/client.go

@@ -1,15 +1,16 @@
 package v3
 
 import (
-	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
-	dependencyutil "github.com/loft-sh/devspace/pkg/devspace/dependency/util"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"net/url"
+
+	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
+	dependencyutil "github.com/loft-sh/devspace/pkg/devspace/dependency/util"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 
 	"github.com/ghodss/yaml"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
@@ -30,6 +31,14 @@ func NewClient(log log.Logger) (types.Client, error) {
 	return c, nil
 }
 
+func (c *client) DownloadChart(ctx devspacecontext.Context, helmConfig *latest.HelmConfig) (string, error) {
+	chartName, err := dependencyutil.DownloadDependency(ctx.Context(), ctx.WorkingDir(), helmConfig.Chart.Source, ctx.Log())
+	if err != nil {
+		return "", err
+	}
+	return filepath.Dir(chartName), nil
+}
+
 // InstallChart installs the given chart via helm v3
 func (c *client) InstallChart(ctx devspacecontext.Context, releaseName string, releaseNamespace string, values map[string]interface{}, helmConfig *latest.HelmConfig) (*types.Release, error) {
 	valuesFile, err := c.genericHelm.WriteValues(values)
@@ -56,7 +65,7 @@ func (c *client) InstallChart(ctx devspacecontext.Context, releaseName string, r
 	// Chart settings
 	chartName := ""
 	if helmConfig.Chart.Source != nil {
-		chartName, err = dependencyutil.DownloadDependency(ctx.Context(), ctx.WorkingDir(), helmConfig.Chart.Source, ctx.Log())
+		chartName, err = dependencyutil.GetDependencyPath(ctx.WorkingDir(), helmConfig.Chart.Source)
 		if err != nil {
 			return nil, err
 		}
@@ -157,12 +166,11 @@ func (c *client) Template(ctx devspacecontext.Context, releaseName, releaseNames
 	// Chart settings
 	chartName := ""
 	if helmConfig.Chart.Source != nil {
-		chartName, err = dependencyutil.DownloadDependency(ctx.Context(), ctx.WorkingDir(), helmConfig.Chart.Source, ctx.Log())
+		chartName, err = c.DownloadChart(ctx, helmConfig)
 		if err != nil {
 			return "", err
 		}
 
-		chartName = filepath.Dir(chartName)
 		args = append(args, chartName)
 	} else {
 		var chartRepo string

pkg/util/hash/hash.go

@@ -73,7 +73,6 @@ func Directory(path string) (string, error) {
 
 		return nil
 	})
-
 	if err != nil {
 		return "", err
 	}