Revert "fix(helm): resolve symlinks when loading chart"

This reverts commit edd4e56. (cherry picked from commit 211f5f6)
helm · Oct 3, 2017 · ce1ba29 · ce1ba29
1 parent e23f660
commit ce1ba29
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -38,7 +38,6 @@ import:
 - package: github.com/gobwas/glob
   version: ^0.2.1
 - package: github.com/evanphx/json-patch
-- package: github.com/facebookgo/symwalk
 - package: github.com/BurntSushi/toml
   version: ~0.3.0
 - package: github.com/naoina/go-stringutil
@@ -80,7 +79,6 @@ import:
 ignore:
   - k8s.io/client-go
   - k8s.io/apimachinery
-
 testImports:
 - package: github.com/stretchr/testify
   version: ^1.1.4

diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
@@ -244,7 +244,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 	files := []*BufferedFile{}
 	topdir += string(filepath.Separator)
 
-	err = symwalk.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
+	err = filepath.Walk(topdir, func(name string, fi os.FileInfo, err error) error {
 		n := strings.TrimPrefix(name, topdir)
 
 		// Normalize to / since it will also work on Windows