Merge pull request #492 from helmfile/fix_deps_issue

fix deps issues

go.mod

@@ -23,9 +23,9 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.1
 	github.com/tatsushid/go-prettytable v0.0.0-20141013043238-ed2d14c29939
-	github.com/variantdev/chartify v0.11.0
+	github.com/variantdev/chartify v0.12.0
 	github.com/variantdev/dag v1.1.0
-	github.com/variantdev/vals v0.18.0
+	github.com/variantdev/vals v0.19.0
 	go.szostok.io/version v1.1.0
 	go.uber.org/multierr v1.6.0
 	go.uber.org/zap v1.23.0

go.sum

@@ -731,12 +731,10 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
@@ -771,12 +769,12 @@ github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIU
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/variantdev/chartify v0.11.0 h1:oU02vOW1OuT+BJdJwl0CjVIozlV4Hu2qOrqoIkdZRQU=
+github.com/variantdev/chartify v0.12.0 h1:FtJY22BmY2U1o89Fdad4idGrlmx6DzVQYAr8rI5Fb5c=
-github.com/variantdev/chartify v0.11.0/go.mod h1:A0nQmb+ihiBJrrbgofs1t7QVeit+/llT0vJhvkj7U0Q=
+github.com/variantdev/chartify v0.12.0/go.mod h1:A0nQmb+ihiBJrrbgofs1t7QVeit+/llT0vJhvkj7U0Q=
 github.com/variantdev/dag v1.1.0 h1:xodYlSng33KWGvIGMpKUyLcIZRXKiNUx612mZJqYrDg=
 github.com/variantdev/dag v1.1.0/go.mod h1:pH1TQsNSLj2uxMo9NNl9zdGy01Wtn+/2MT96BrKmVyE=
-github.com/variantdev/vals v0.18.0 h1:25eOKvHVPoU9fLA3Du0chT8d6iJybCkc/9ixg1cZwHA=
+github.com/variantdev/vals v0.19.0 h1:8eUkUx2zkt0mXpnyO1U/MuSDo8TrRLAayLzk/gmZc9g=
-github.com/variantdev/vals v0.18.0/go.mod h1:0sQWTzBMf8Lf3uALQ+Rkj2QeGXUdvC8CPreVaYw3rFM=
+github.com/variantdev/vals v0.19.0/go.mod h1:4GifZ6nLxb//MoaE/DiBWPC06CsU9GUj6pknF2UmNv8=
 github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
 github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1284,7 +1282,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=

test/e2e/template/helmfile/testdata/snapshot/chart_need/output.yaml

@@ -2,9 +2,12 @@ Adding repo myrepo http://localhost:18080/
 "myrepo" has been added to your repositories
 
 Building dependency release=foo, chart=$WD/temp1/foo
+Saving 1 charts
+Downloading raw from repo http://localhost:18080/
+Deleting outdated charts
+
 Templating release=foo, chart=$WD/temp1/foo
 ---
-# Source: raw/templates/charts/dep/templates/resources.yaml
 # Source: raw/charts/dep/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -15,7 +18,6 @@ data:
   bar: BAR
 ---
 # Source: raw/templates/resources.yaml
-# Source: raw/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:

test/e2e/template/helmfile/testdata/snapshot/chart_need_enable_live_output/output.yaml

@@ -3,9 +3,12 @@ Adding repo myrepo http://localhost:18080/
 "myrepo" has been added to your repositories
 
 Building dependency release=foo, chart=$WD/temp1/foo
+Saving 1 charts
+Downloading raw from repo http://localhost:18080/
+Deleting outdated charts
+
 Templating release=foo, chart=$WD/temp1/foo
 ---
-# Source: raw/templates/charts/dep/templates/resources.yaml
 # Source: raw/charts/dep/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -16,7 +19,6 @@ data:
   bar: BAR
 ---
 # Source: raw/templates/resources.yaml
-# Source: raw/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:

test/e2e/template/helmfile/testdata/snapshot/oci_need/output.yaml

@@ -1,7 +1,12 @@
 Building dependency release=foo, chart=$WD/temp1/foo
+Saving 1 charts
+Downloading raw from repo oci://localhost:5000/myrepo
+Pulled: localhost:5000/myrepo/raw:0.1.0
+Digest: $DIGEST
+Deleting outdated charts
+
 Templating release=foo, chart=$WD/temp1/foo
 ---
-# Source: raw/templates/charts/dep/templates/resources.yaml
 # Source: raw/charts/dep/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -12,7 +17,6 @@ data:
   bar: BAR
 ---
 # Source: raw/templates/resources.yaml
-# Source: raw/templates/resources.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata: