Repository: helm/helm
Pull request #30567 (2025-02-21 20:34:52)

Moving chartutil to chart/util
chartutil was originally created to operate on protobufs which are no longer part of Helm. The util package makes more sense to be part of the chart package.

This change is part of the HIP 20 to create v3 charts and explicitly call out v2 charts. The changes for this are in smaller bite size changes.

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. Make sure to read the Contributing Guide before submitting your PR: https://github.com/helm/helm/blob/main/CONTRIBUTING.md
2. If this PR closes another issue, add 'closes #<issue number>' somewhere in the PR summary. GitHub will automatically close that issue when this PR gets merged. Alternatively, adding 'refs #<issue number>' will not close the issue, but help provide the reviewer more context.-->

**What this PR does / why we need it**:

**Special notes for your reviewer**:

**If applicable**:
- [ ] this PR contains user facing changes (the `docs needed` label should be applied if so)
- [ ] this PR contains unit tests
- [ ] this PR has been tested for backwards compatibility



Patch:
diff --git a/Makefile b/Makefile
index f1fcbfb08..d2c82b033 100644
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,8 @@ K8S_MODULES_MINOR_VER=$(word 2,$(K8S_MODULES_VER))
 
 LDFLAGS += -X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
 LDFLAGS += -X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
-LDFLAGS += -X helm.sh/helm/v4/pkg/chartutil.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
-LDFLAGS += -X helm.sh/helm/v4/pkg/chartutil.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
 
 .PHONY: all
 all: build
diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 29beca303..a18f2c915 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -25,7 +25,7 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 )
 
diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go
index 9a3f7a2fc..3e37922b2 100644
--- a/cmd/helm/lint.go
+++ b/cmd/helm/lint.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/lint/support"
diff --git a/cmd/helm/status.go b/cmd/helm/status.go
index c56ff1f29..fd3e4ce14 100644
--- a/cmd/helm/status.go
+++ b/cmd/helm/status.go
@@ -30,7 +30,7 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/release"
 )
diff --git a/cmd/helm/template.go b/cmd/helm/template.go
index 8cd91df32..1a6265eba 100644
--- a/cmd/helm/template.go
+++ b/cmd/helm/template.go
@@ -34,7 +34,7 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/releaseutil"
 )
diff --git a/pkg/action/action.go b/pkg/action/action.go
index 8418a4c27..fef4a91f5 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -33,7 +33,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/engine"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrender"
diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go
index aa399f76c..21253b7aa 100644
--- a/pkg/action/get_values.go
+++ b/pkg/action/get_values.go
@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 )
 
 // GetValues is the action for checking a given release's values.
diff --git a/pkg/action/history.go b/pkg/action/history.go
index 5f514a14a..1c5cfa86f 100644
--- a/pkg/action/history.go
+++ b/pkg/action/history.go
@@ -19,7 +19,7 @@ package action
 import (
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/action/install.go b/pkg/action/install.go
index ef3f0fdc7..6ad77a509 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -40,7 +40,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/downloader"
 	"helm.sh/helm/v4/pkg/getter"
diff --git a/pkg/action/lint.go b/pkg/action/lint.go
index 06fc48612..a6fd7c71c 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
diff --git a/pkg/action/package.go b/pkg/action/package.go
index 2e792a65c..8343ba109 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -27,7 +27,7 @@ import (
 	"golang.org/x/term"
 
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/provenance"
 )
 
diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index 7fc1a9fdb..fa85fe242 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/downloader"
 	"helm.sh/helm/v4/pkg/getter"
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index 12dee35ce..961ef8377 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/release"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
diff --git a/pkg/action/show.go b/pkg/action/show.go
index 1aa9bf1d0..3b2722eef 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -27,7 +27,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/registry"
 )
 
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index dda7d6978..b786c37f7 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -24,7 +24,7 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/release"
 	"helm.sh/helm/v4/pkg/releaseutil"
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index f3e9a33bc..c5397c984 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/cli-runtime/pkg/resource"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrender"
 	"helm.sh/helm/v4/pkg/registry"
diff --git a/pkg/chartutil/capabilities.go b/pkg/chart/util/capabilities.go
similarity index 99%
rename from pkg/chartutil/capabilities.go
rename to pkg/chart/util/capabilities.go
index 6c1ebf24c..d4b420b2f 100644
--- a/pkg/chartutil/capabilities.go
+++ b/pkg/chart/util/capabilities.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"fmt"
diff --git a/pkg/chartutil/chartfile.go b/pkg/chart/util/chartfile.go
similarity index 99%
rename from pkg/chartutil/chartfile.go
rename to pkg/chart/util/chartfile.go
index 596011ba3..acab80d0a 100644
--- a/pkg/chartutil/chartfile.go
+++ b/pkg/chart/util/chartfile.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"os"
diff --git a/pkg/chartutil/coalesce.go b/pkg/chart/util/coalesce.go
similarity index 99%
rename from pkg/chartutil/coalesce.go
rename to pkg/chart/util/coalesce.go
index a46936cc6..9ab5c1015 100644
--- a/pkg/chartutil/coalesce.go
+++ b/pkg/chart/util/coalesce.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"fmt"
diff --git a/pkg/chartutil/compatible.go b/pkg/chart/util/compatible.go
similarity index 98%
rename from pkg/chartutil/compatible.go
rename to pkg/chart/util/compatible.go
index f4656c913..d384d2d45 100644
--- a/pkg/chartutil/compatible.go
+++ b/pkg/chart/util/compatible.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import "github.com/Masterminds/semver/v3"
 
diff --git a/pkg/chartutil/create.go b/pkg/chart/util/create.go
similarity index 99%
rename from pkg/chartutil/create.go
rename to pkg/chart/util/create.go
index 4f59b9f83..dfb5099f2 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chart/util/create.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"fmt"
diff --git a/pkg/chartutil/dependencies.go b/pkg/chart/util/dependencies.go
similarity index 99%
rename from pkg/chartutil/dependencies.go
rename to pkg/chart/util/dependencies.go
index f0ba166d9..fb9052d71 100644
--- a/pkg/chartutil/dependencies.go
+++ b/pkg/chart/util/dependencies.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"log"
diff --git a/pkg/chartutil/doc.go b/pkg/chart/util/doc.go
similarity index 92%
rename from pkg/chartutil/doc.go
rename to pkg/chart/util/doc.go
index 6c0b1582b..587fcaeb1 100644
--- a/pkg/chartutil/doc.go
+++ b/pkg/chart/util/doc.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 /*
-Package chartutil contains tools for working with charts.
+package util contains tools for working with charts.
 
 Charts are described in the chart package (pkg/chart).
 This package provides utilities for serializing and deserializing charts.
@@ -42,4 +42,4 @@ into a Chart.
 When creating charts in memory, use the 'helm.sh/helm/pkg/chart'
 package directly.
 */
-package chartutil // import "helm.sh/helm/v4/pkg/chartutil"
+package util // import chartutil "helm.sh/helm/v4/pkg/chart/util"
diff --git a/pkg/chartutil/errors.go b/pkg/chart/util/errors.go
similarity index 98%
rename from pkg/chartutil/errors.go
rename to pkg/chart/util/errors.go
index 0a4046d2e..a175b9758 100644
--- a/pkg/chartutil/errors.go
+++ b/pkg/chart/util/errors.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"fmt"
diff --git a/pkg/chartutil/expand.go b/pkg/chart/util/expand.go
similarity index 99%
rename from pkg/chartutil/expand.go
rename to pkg/chart/util/expand.go
index a9943252d..4b83bf584 100644
--- a/pkg/chartutil/expand.go
+++ b/pkg/chart/util/expand.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"io"
diff --git a/pkg/chartutil/jsonschema.go b/pkg/chart/util/jsonschema.go
similarity index 99%
rename from pkg/chartutil/jsonschema.go
rename to pkg/chart/util/jsonschema.go
index f1c8dcdf4..616c6d444 100644
--- a/pkg/chartutil/jsonschema.go
+++ b/pkg/chart/util/jsonschema.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"bytes"
diff --git a/pkg/chartutil/save.go b/pkg/chart/util/save.go
similarity index 99%
rename from pkg/chartutil/save.go
rename to pkg/chart/util/save.go
index 0dddad912..635ff7944 100644
--- a/pkg/chartutil/save.go
+++ b/pkg/chart/util/save.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"archive/tar"
diff --git a/pkg/chartutil/testdata/chartfiletest.yaml b/pkg/chart/util/testdata/chartfiletest.yaml
similarity index 100%
rename from pkg/chartutil/testdata/chartfiletest.yaml
rename to pkg/chart/util/testdata/chartfiletest.yaml
diff --git a/pkg/chartutil/testdata/coleridge.yaml b/pkg/chart/util/testdata/coleridge.yaml
similarity index 100%
rename from pkg/chartutil/testdata/coleridge.yaml
rename to pkg/chart/util/testdata/coleridge.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/.helmignore b/pkg/chart/util/testdata/dependent-chart-alias/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/.helmignore
rename to pkg/chart/util/testdata/dependent-chart-alias/.helmignore
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/Chart.lock b/pkg/chart/util/testdata/dependent-chart-alias/Chart.lock
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/Chart.lock
rename to pkg/chart/util/testdata/dependent-chart-alias/Chart.lock
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-alias/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/INSTALL.txt b/pkg/chart/util/testdata/dependent-chart-alias/INSTALL.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/INSTALL.txt
rename to pkg/chart/util/testdata/dependent-chart-alias/INSTALL.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/LICENSE b/pkg/chart/util/testdata/dependent-chart-alias/LICENSE
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/LICENSE
rename to pkg/chart/util/testdata/dependent-chart-alias/LICENSE
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/README.md b/pkg/chart/util/testdata/dependent-chart-alias/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/README.md
rename to pkg/chart/util/testdata/dependent-chart-alias/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/_ignore_me b/pkg/chart/util/testdata/dependent-chart-alias/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/_ignore_me
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/README.md b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/README.md
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/values.yaml b/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz b/pkg/chart/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
rename to pkg/chart/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/docs/README.md b/pkg/chart/util/testdata/dependent-chart-alias/docs/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/docs/README.md
rename to pkg/chart/util/testdata/dependent-chart-alias/docs/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/icon.svg b/pkg/chart/util/testdata/dependent-chart-alias/icon.svg
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/icon.svg
rename to pkg/chart/util/testdata/dependent-chart-alias/icon.svg
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/ignore/me.txt b/pkg/chart/util/testdata/dependent-chart-alias/ignore/me.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/ignore/me.txt
rename to pkg/chart/util/testdata/dependent-chart-alias/ignore/me.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/templates/template.tpl b/pkg/chart/util/testdata/dependent-chart-alias/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/templates/template.tpl
rename to pkg/chart/util/testdata/dependent-chart-alias/templates/template.tpl
diff --git a/pkg/chartutil/testdata/dependent-chart-alias/values.yaml b/pkg/chart/util/testdata/dependent-chart-alias/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-alias/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-alias/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/.helmignore b/pkg/chart/util/testdata/dependent-chart-helmignore/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/.helmignore
rename to pkg/chart/util/testdata/dependent-chart-helmignore/.helmignore
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/.ignore_me b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/.ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/.ignore_me
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/.ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/_ignore_me b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/_ignore_me
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/README.md b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/README.md
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/templates/template.tpl b/pkg/chart/util/testdata/dependent-chart-helmignore/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/templates/template.tpl
rename to pkg/chart/util/testdata/dependent-chart-helmignore/templates/template.tpl
diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/values.yaml b/pkg/chart/util/testdata/dependent-chart-helmignore/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-helmignore/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-helmignore/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/.helmignore b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/.helmignore
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/LICENSE b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/LICENSE
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/README.md b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/README.md
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/icon.svg b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/icon.svg
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/values.yaml b/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml b/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
rename to pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chart/util/testdata/frobnitz-1.2.3.tgz
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz-1.2.3.tgz
rename to pkg/chart/util/testdata/frobnitz-1.2.3.tgz
diff --git a/pkg/chartutil/testdata/frobnitz/.helmignore b/pkg/chart/util/testdata/frobnitz/.helmignore
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/.helmignore
rename to pkg/chart/util/testdata/frobnitz/.helmignore
diff --git a/pkg/chartutil/testdata/frobnitz/Chart.lock b/pkg/chart/util/testdata/frobnitz/Chart.lock
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/Chart.lock
rename to pkg/chart/util/testdata/frobnitz/Chart.lock
diff --git a/pkg/chartutil/testdata/frobnitz/Chart.yaml b/pkg/chart/util/testdata/frobnitz/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/Chart.yaml
rename to pkg/chart/util/testdata/frobnitz/Chart.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/INSTALL.txt b/pkg/chart/util/testdata/frobnitz/INSTALL.txt
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/INSTALL.txt
rename to pkg/chart/util/testdata/frobnitz/INSTALL.txt
diff --git a/pkg/chartutil/testdata/frobnitz/LICENSE b/pkg/chart/util/testdata/frobnitz/LICENSE
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/LICENSE
rename to pkg/chart/util/testdata/frobnitz/LICENSE
diff --git a/pkg/chartutil/testdata/frobnitz/README.md b/pkg/chart/util/testdata/frobnitz/README.md
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/README.md
rename to pkg/chart/util/testdata/frobnitz/README.md
diff --git a/pkg/chartutil/testdata/frobnitz/charts/_ignore_me b/pkg/chart/util/testdata/frobnitz/charts/_ignore_me
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/_ignore_me
rename to pkg/chart/util/testdata/frobnitz/charts/_ignore_me
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml b/pkg/chart/util/testdata/frobnitz/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/Chart.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/README.md b/pkg/chart/util/testdata/frobnitz/charts/alpine/README.md
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/README.md
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/README.md
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/values.yaml b/pkg/chart/util/testdata/frobnitz/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/alpine/values.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/alpine/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner/Chart.yaml b/pkg/chart/util/testdata/frobnitz/charts/mariner/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/mariner/Chart.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/mariner/Chart.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml b/pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml b/pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl b/pkg/chart/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
rename to pkg/chart/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner/values.yaml b/pkg/chart/util/testdata/frobnitz/charts/mariner/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/charts/mariner/values.yaml
rename to pkg/chart/util/testdata/frobnitz/charts/mariner/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz/docs/README.md b/pkg/chart/util/testdata/frobnitz/docs/README.md
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/docs/README.md
rename to pkg/chart/util/testdata/frobnitz/docs/README.md
diff --git a/pkg/chartutil/testdata/frobnitz/icon.svg b/pkg/chart/util/testdata/frobnitz/icon.svg
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/icon.svg
rename to pkg/chart/util/testdata/frobnitz/icon.svg
diff --git a/pkg/chartutil/testdata/frobnitz/ignore/me.txt b/pkg/chart/util/testdata/frobnitz/ignore/me.txt
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/ignore/me.txt
rename to pkg/chart/util/testdata/frobnitz/ignore/me.txt
diff --git a/pkg/chartutil/testdata/frobnitz/templates/template.tpl b/pkg/chart/util/testdata/frobnitz/templates/template.tpl
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/templates/template.tpl
rename to pkg/chart/util/testdata/frobnitz/templates/template.tpl
diff --git a/pkg/chartutil/testdata/frobnitz/values.yaml b/pkg/chart/util/testdata/frobnitz/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz/values.yaml
rename to pkg/chart/util/testdata/frobnitz/values.yaml
diff --git a/pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chart/util/testdata/frobnitz_backslash-1.2.3.tgz
similarity index 100%
rename from pkg/chartutil/testdata/frobnitz_backslash-1.2.3.tgz
rename to pkg/chart/util/testdata/frobnitz_backslash-1.2.3.tgz
diff --git a/pkg/chartutil/testdata/genfrob.sh b/pkg/chart/util/testdata/genfrob.sh
similarity index 100%
rename from pkg/chartutil/testdata/genfrob.sh
rename to pkg/chart/util/testdata/genfrob.sh
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml b/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
rename to pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
diff --git a/pkg/chartutil/testdata/joonix/Chart.yaml b/pkg/chart/util/testdata/joonix/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/joonix/Chart.yaml
rename to pkg/chart/util/testdata/joonix/Chart.yaml
diff --git a/pkg/chartutil/testdata/joonix/charts/.gitkeep b/pkg/chart/util/testdata/joonix/charts/.gitkeep
similarity index 100%
rename from pkg/chartutil/testdata/joonix/charts/.gitkeep
rename to pkg/chart/util/testdata/joonix/charts/.gitkeep
diff --git a/pkg/chartutil/testdata/subpop/Chart.yaml b/pkg/chart/util/testdata/subpop/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/Chart.yaml
rename to pkg/chart/util/testdata/subpop/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/README.md b/pkg/chart/util/testdata/subpop/README.md
similarity index 100%
rename from pkg/chartutil/testdata/subpop/README.md
rename to pkg/chart/util/testdata/subpop/README.md
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/crds/crdA.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/crds/crdA.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/NOTES.txt b/pkg/chart/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/NOTES.txt
rename to pkg/chart/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart1/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart1/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/values.yaml b/pkg/chart/util/testdata/subpop/charts/subchart2/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/charts/subchart2/values.yaml
rename to pkg/chart/util/testdata/subpop/charts/subchart2/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/noreqs/Chart.yaml b/pkg/chart/util/testdata/subpop/noreqs/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/noreqs/Chart.yaml
rename to pkg/chart/util/testdata/subpop/noreqs/Chart.yaml
diff --git a/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml b/pkg/chart/util/testdata/subpop/noreqs/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml
rename to pkg/chart/util/testdata/subpop/noreqs/templates/service.yaml
diff --git a/pkg/chartutil/testdata/subpop/noreqs/values.yaml b/pkg/chart/util/testdata/subpop/noreqs/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/noreqs/values.yaml
rename to pkg/chart/util/testdata/subpop/noreqs/values.yaml
diff --git a/pkg/chartutil/testdata/subpop/values.yaml b/pkg/chart/util/testdata/subpop/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/subpop/values.yaml
rename to pkg/chart/util/testdata/subpop/values.yaml
diff --git a/pkg/chartutil/testdata/test-values-invalid.schema.json b/pkg/chart/util/testdata/test-values-invalid.schema.json
similarity index 100%
rename from pkg/chartutil/testdata/test-values-invalid.schema.json
rename to pkg/chart/util/testdata/test-values-invalid.schema.json
diff --git a/pkg/chartutil/testdata/test-values-negative.yaml b/pkg/chart/util/testdata/test-values-negative.yaml
similarity index 100%
rename from pkg/chartutil/testdata/test-values-negative.yaml
rename to pkg/chart/util/testdata/test-values-negative.yaml
diff --git a/pkg/chartutil/testdata/test-values.schema.json b/pkg/chart/util/testdata/test-values.schema.json
similarity index 100%
rename from pkg/chartutil/testdata/test-values.schema.json
rename to pkg/chart/util/testdata/test-values.schema.json
diff --git a/pkg/chartutil/testdata/test-values.yaml b/pkg/chart/util/testdata/test-values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/test-values.yaml
rename to pkg/chart/util/testdata/test-values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/README.md b/pkg/chart/util/testdata/three-level-dependent-chart/README.md
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/README.md
rename to pkg/chart/util/testdata/three-level-dependent-chart/README.md
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/values.yaml b/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/values.yaml
similarity index 100%
rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/values.yaml
rename to pkg/chart/util/testdata/three-level-dependent-chart/umbrella/values.yaml
diff --git a/pkg/chartutil/validate_name.go b/pkg/chart/util/validate_name.go
similarity index 99%
rename from pkg/chartutil/validate_name.go
rename to pkg/chart/util/validate_name.go
index 05c090cb6..73be43303 100644
--- a/pkg/chartutil/validate_name.go
+++ b/pkg/chart/util/validate_name.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"fmt"
diff --git a/pkg/chartutil/values.go b/pkg/chart/util/values.go
similarity index 99%
rename from pkg/chartutil/values.go
rename to pkg/chart/util/values.go
index 706c44d48..46952c079 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chart/util/values.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"encoding/json"
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index f10cbfb8d..361cd6109 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -38,7 +38,7 @@ import (
 	"helm.sh/helm/v4/internal/urlutil"
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/registry"
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 8f69505f6..0229b1833 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 )
 
 // Engine is an implementation of the Helm rendering implementation for templates.
diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go
index 70a49ee90..b53400c87 100644
--- a/pkg/lint/lint.go
+++ b/pkg/lint/lint.go
@@ -19,7 +19,7 @@ package lint // import "helm.sh/helm/v4/pkg/lint"
 import (
 	"path/filepath"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/rules"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go
index 2e718067b..a1e08b58d 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/lint/rules/chartfile.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/deprecations.go b/pkg/lint/rules/deprecations.go
index 6eae06802..0a8e642c9 100644
--- a/pkg/lint/rules/deprecations.go
+++ b/pkg/lint/rules/deprecations.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/apiserver/pkg/endpoints/deprecation"
 	kscheme "k8s.io/client-go/kubernetes/scheme"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 )
 
 var (
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index a50485a50..ec434aba5 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/engine"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
diff --git a/pkg/lint/rules/values.go b/pkg/lint/rules/values.go
index 82278522d..f430178c3 100644
--- a/pkg/lint/rules/values.go
+++ b/pkg/lint/rules/values.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go
index b2db2ff9f..c7d92b184 100644
--- a/pkg/releaseutil/manifest_sorter.go
+++ b/pkg/releaseutil/manifest_sorter.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 


Test patch:
diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go
index 88d9c315a..76fce804c 100644
--- a/cmd/helm/create_test.go
+++ b/cmd/helm/create_test.go
@@ -25,7 +25,7 @@ import (
 	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 )
 
diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go
index 1258db3f8..76c01d911 100644
--- a/cmd/helm/dependency_build_test.go
+++ b/cmd/helm/dependency_build_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/repo"
 	"helm.sh/helm/v4/pkg/repo/repotest"
diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go
index 7cf3e8e0a..0732ba7b5 100644
--- a/cmd/helm/dependency_update_test.go
+++ b/cmd/helm/dependency_update_test.go
@@ -24,7 +24,7 @@ import (
 
 	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/repo"
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index a20928b37..e7a05aecf 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -30,7 +30,7 @@ import (
 
 	"helm.sh/helm/v4/internal/test"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/cli"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/release"
diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go
index e3d41d7fa..f97a4a26b 100644
--- a/cmd/helm/upgrade_test.go
+++ b/cmd/helm/upgrade_test.go
@@ -26,7 +26,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 71ea83789..8545b1edc 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -25,7 +25,7 @@ import (
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/registry"
 	"helm.sh/helm/v4/pkg/release"
diff --git a/pkg/action/dependency_test.go b/pkg/action/dependency_test.go
index aee8c240f..38f2668ae 100644
--- a/pkg/action/dependency_test.go
+++ b/pkg/action/dependency_test.go
@@ -26,7 +26,7 @@ import (
 
 	"helm.sh/helm/v4/internal/test"
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 )
 
 func TestList(t *testing.T) {
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 9f738f0bc..171622e46 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -33,7 +33,7 @@ import (
 
 	"helm.sh/helm/v4/internal/test"
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/release"
 	"helm.sh/helm/v4/pkg/storage/driver"
diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go
index 1568b0683..a2c68ad64 100644
--- a/pkg/action/release_testing.go
+++ b/pkg/action/release_testing.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/chartutil/capabilities_test.go b/pkg/chart/util/capabilities_test.go
similarity index 99%
rename from pkg/chartutil/capabilities_test.go
rename to pkg/chart/util/capabilities_test.go
index 502b0c7d5..aa9be9db8 100644
--- a/pkg/chartutil/capabilities_test.go
+++ b/pkg/chart/util/capabilities_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"testing"
diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chart/util/chartfile_test.go
similarity index 99%
rename from pkg/chartutil/chartfile_test.go
rename to pkg/chart/util/chartfile_test.go
index 595aee517..6eb599680 100644
--- a/pkg/chartutil/chartfile_test.go
+++ b/pkg/chart/util/chartfile_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"testing"
diff --git a/pkg/chartutil/coalesce_test.go b/pkg/chart/util/coalesce_test.go
similarity index 99%
rename from pkg/chartutil/coalesce_test.go
rename to pkg/chart/util/coalesce_test.go
index e207274d7..5a8dfe94a 100644
--- a/pkg/chartutil/coalesce_test.go
+++ b/pkg/chart/util/coalesce_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"encoding/json"
diff --git a/pkg/chartutil/compatible_test.go b/pkg/chart/util/compatible_test.go
similarity index 98%
rename from pkg/chartutil/compatible_test.go
rename to pkg/chart/util/compatible_test.go
index df7be6161..e17d33e35 100644
--- a/pkg/chartutil/compatible_test.go
+++ b/pkg/chart/util/compatible_test.go
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Package version represents the current version of the project.
-package chartutil
+package util
 
 import "testing"
 
diff --git a/pkg/chartutil/create_test.go b/pkg/chart/util/create_test.go
similarity index 99%
rename from pkg/chartutil/create_test.go
rename to pkg/chart/util/create_test.go
index 8f8122f6f..e67ce3e1f 100644
--- a/pkg/chartutil/create_test.go
+++ b/pkg/chart/util/create_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"bytes"
diff --git a/pkg/chartutil/dependencies_test.go b/pkg/chart/util/dependencies_test.go
similarity index 99%
rename from pkg/chartutil/dependencies_test.go
rename to pkg/chart/util/dependencies_test.go
index ac8e4d76e..10fca265e 100644
--- a/pkg/chartutil/dependencies_test.go
+++ b/pkg/chart/util/dependencies_test.go
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package chartutil
+package util
 
 import (
 	"encoding/json"
diff --git a/pkg/chartutil/errors_test.go b/pkg/chart/util/errors_test.go
similarity index 97%
rename from pkg/chartutil/errors_test.go
rename to pkg/chart/util/errors_test.go
index 3f63e3733..b8ae86384 100644
--- a/pkg/chartutil/errors_test.go
+++ b/pkg/chart/util/errors_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"testing"
diff --git a/pkg/chartutil/expand_test.go b/pkg/chart/util/expand_test.go
similarity index 99%
rename from pkg/chartutil/expand_test.go
rename to pkg/chart/util/expand_test.go
index b46ace01f..280995f7e 100644
--- a/pkg/chartutil/expand_test.go
+++ b/pkg/chart/util/expand_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"os"
diff --git a/pkg/chartutil/jsonschema_test.go b/pkg/chart/util/jsonschema_test.go
similarity index 99%
rename from pkg/chartutil/jsonschema_test.go
rename to pkg/chart/util/jsonschema_test.go
index 098cf70db..c5600044a 100644
--- a/pkg/chartutil/jsonschema_test.go
+++ b/pkg/chart/util/jsonschema_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"os"
diff --git a/pkg/chartutil/save_test.go b/pkg/chart/util/save_test.go
similarity index 99%
rename from pkg/chartutil/save_test.go
rename to pkg/chart/util/save_test.go
index 3789b6617..a7338c8d7 100644
--- a/pkg/chartutil/save_test.go
+++ b/pkg/chart/util/save_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"archive/tar"
diff --git a/pkg/chartutil/validate_name_test.go b/pkg/chart/util/validate_name_test.go
similarity index 99%
rename from pkg/chartutil/validate_name_test.go
rename to pkg/chart/util/validate_name_test.go
index 09dec9fbb..cfc62a0f7 100644
--- a/pkg/chartutil/validate_name_test.go
+++ b/pkg/chart/util/validate_name_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import "testing"
 
diff --git a/pkg/chartutil/values_test.go b/pkg/chart/util/values_test.go
similarity index 99%
rename from pkg/chartutil/values_test.go
rename to pkg/chart/util/values_test.go
index 56167c8a1..660b7e4ed 100644
--- a/pkg/chartutil/values_test.go
+++ b/pkg/chart/util/values_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chartutil
+package util
 
 import (
 	"bytes"
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index b721c6a0d..c9947e341 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -24,7 +24,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/repo/repotest"
 )
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index f6a96bd6a..4c28c2965 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/client-go/dynamic/fake"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 )
 
 func TestSortTemplates(t *testing.T) {
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 9246b64f2..bba024d59 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go
index eb9b19cb7..6d709790a 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/lint/rules/chartfile_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/pkg/errors"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/dependencies_test.go b/pkg/lint/rules/dependencies_test.go
index e167b4479..e946b1c01 100644
--- a/pkg/lint/rules/dependencies_test.go
+++ b/pkg/lint/rules/dependencies_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go
index 9e6dc4004..d3185d8c8 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index 0155c54d8..7b004dbc3 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -36,7 +36,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/loader"
-	"helm.sh/helm/v4/pkg/chartutil"
+	chartutil "helm.sh/helm/v4/pkg/chart/util"
 	ociRegistry "helm.sh/helm/v4/pkg/registry"
 	"helm.sh/helm/v4/pkg/repo"
 )