Skip to content

Commit

Permalink
Use the stable directory for storing temporary charts and values files
Browse files Browse the repository at this point in the history
so that helmfile-diff output becomes stables and terraform plan doesn't break.
See roboll/helmfile#1622 for more information.
  • Loading branch information
mumoshu committed Jan 1, 2021
1 parent 49352e1 commit 77e100d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.13

require (
github.com/Masterminds/semver v1.5.0
github.com/davecgh/go-spew v1.1.1
github.com/hashicorp/terraform-plugin-sdk v1.0.0
github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb
github.com/mumoshu/shoal v0.2.14
Expand Down
24 changes: 24 additions & 0 deletions pkg/helmfile/release_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,30 @@ func runDiff(fs *ReleaseSet, conf DiffConfig) (*State, error) {
return nil, err
}

// Use the stable directory for storing temporary charts and values files
// so that helmfile-diff output becomes stables and terraform plan doesn't break.
// See https://github.com/roboll/helmfile/pull/1622

hash, err := HashObject(fs)
if err != nil {
return nil, xerrors.Errorf("computing hash of object: %w", err)
}

tempDir := filepath.Join(".terraform", "helmfile", fmt.Sprintf("temp-%s", hash))

if info, _ := os.Stat(tempDir); info != nil {
if err := os.RemoveAll(tempDir); err != nil {
return nil, xerrors.Errorf("removing stable temp directory %s: %w", tempDir, err)
}
}

if err := os.MkdirAll(tempDir, 0755); err != nil {
return nil, xerrors.Errorf("creating temp directory for helmfile and chartify %s: %w", tempDir, err)
}

cmd.Env = append(cmd.Env, "HELMFILE_TEMPDIR="+tempDir)
cmd.Env = append(cmd.Env, "CHARTIFY_TEMPDIR="+tempDir)

if conf.Kubeconfig != "" {
cmd.Env = append(cmd.Env, "KUBECONFIG="+conf.Kubeconfig)
}
Expand Down

0 comments on commit 77e100d

Please sign in to comment.