Repository: helm/helm
Pull request #30586 (2025-02-25 20:22:46)

Move pkg/chart to pkg/chart/v2 to prepare for v3 charts
This change moves the code, updates the import locations, and adds a doc.go file to document what the v2 package is for.

This is part of HIP 20 for v3 charts

<!--  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 d2c82b033..21144cf5a 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/chart/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
-LDFLAGS += -X helm.sh/helm/v4/pkg/chart/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
 
 .PHONY: all
 all: build
diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index a18f2c915..11c208231 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -24,8 +24,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/cmd/helm/require"
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 )
 
diff --git a/cmd/helm/history.go b/cmd/helm/history.go
index 2c929c161..a47f97688 100644
--- a/cmd/helm/history.go
+++ b/cmd/helm/history.go
@@ -27,7 +27,7 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/release"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index fe09dfc53..12f87cd20 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -32,8 +32,8 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/downloader"
diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go
index 3e37922b2..279c5d34a 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"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 fd3e4ce14..727c3df9e 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"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 212664dc8..c41373337 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"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/cli/values"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
 )
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index 6684f9ebf..7d6cb33ec 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -31,7 +31,7 @@ import (
 
 	"helm.sh/helm/v4/cmd/helm/require"
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/downloader"
diff --git a/internal/monocular/search.go b/internal/monocular/search.go
index d6d454653..6912be2ce 100644
--- a/internal/monocular/search.go
+++ b/internal/monocular/search.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"helm.sh/helm/v4/internal/version"
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // SearchPath is the url path to the search API in monocular.
diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go
index 74348176d..42c9de3b7 100644
--- a/internal/resolver/resolver.go
+++ b/internal/resolver/resolver.go
@@ -27,8 +27,8 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/registry"
diff --git a/pkg/action/action.go b/pkg/action/action.go
index eeaebc15f..d91ccab51 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -33,8 +33,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/engine"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrender"
diff --git a/pkg/action/dependency.go b/pkg/action/dependency.go
index e0ff56cce..03c370c8e 100644
--- a/pkg/action/dependency.go
+++ b/pkg/action/dependency.go
@@ -26,8 +26,8 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/gosuri/uitable"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 // Dependency is the action for building a given chart's dependency tree.
diff --git a/pkg/action/get_metadata.go b/pkg/action/get_metadata.go
index 190e9ccb9..e760ae4d1 100644
--- a/pkg/action/get_metadata.go
+++ b/pkg/action/get_metadata.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // GetMetadata is the action for checking a given release's metadata.
diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go
index 21253b7aa..18b8b4838 100644
--- a/pkg/action/get_values.go
+++ b/pkg/action/get_values.go
@@ -17,7 +17,7 @@ limitations under the License.
 package action
 
 import (
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 1c5cfa86f..e5ac16bfe 100644
--- a/pkg/action/history.go
+++ b/pkg/action/history.go
@@ -19,7 +19,7 @@ package action
 import (
 	"github.com/pkg/errors"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 68c1848f6..ad260c361 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -39,8 +39,8 @@ import (
 	"k8s.io/cli-runtime/pkg/resource"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 a6fd7c71c..451eb65b0 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 8343ba109..9ffe1722e 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/term"
 
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/provenance"
 )
 
diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index fa85fe242..eb208ca7b 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 961ef8377..0cd9d5d07 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 3b2722eef..8f9da58e9 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -25,9 +25,9 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/registry"
 )
 
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 6e71197f6..bfec35fc0 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -24,7 +24,7 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/release"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index fa799ad2b..340f61585 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -28,8 +28,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrender"
 	"helm.sh/helm/v4/pkg/registry"
diff --git a/pkg/chart/chart.go b/pkg/chart/v2/chart.go
similarity index 99%
rename from pkg/chart/chart.go
rename to pkg/chart/v2/chart.go
index a3bed63a3..dcc2a43eb 100644
--- a/pkg/chart/chart.go
+++ b/pkg/chart/v2/chart.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 import (
 	"path/filepath"
diff --git a/pkg/chart/dependency.go b/pkg/chart/v2/dependency.go
similarity index 99%
rename from pkg/chart/dependency.go
rename to pkg/chart/v2/dependency.go
index eda0f5a89..8a590a036 100644
--- a/pkg/chart/dependency.go
+++ b/pkg/chart/v2/dependency.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 import "time"
 
diff --git a/pkg/chart/v2/doc.go b/pkg/chart/v2/doc.go
new file mode 100644
index 000000000..d36ca3ec4
--- /dev/null
+++ b/pkg/chart/v2/doc.go
@@ -0,0 +1,23 @@
+/*
+Copyright The Helm Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 v2 provides chart handling for apiVersion v1 and v2 charts
+
+This package and its sub-packages provide handling for apiVersion v1 and v2 charts.
+The changes from v1 to v2 charts are minor and were able to be handled with minor
+switches based on characteristics.
+*/
+package v2
diff --git a/pkg/chart/errors.go b/pkg/chart/v2/errors.go
similarity index 98%
rename from pkg/chart/errors.go
rename to pkg/chart/v2/errors.go
index 2fad5f370..eeef75315 100644
--- a/pkg/chart/errors.go
+++ b/pkg/chart/v2/errors.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 import "fmt"
 
diff --git a/pkg/chart/file.go b/pkg/chart/v2/file.go
similarity index 98%
rename from pkg/chart/file.go
rename to pkg/chart/v2/file.go
index 9dd7c08d5..a2eeb0fcd 100644
--- a/pkg/chart/file.go
+++ b/pkg/chart/v2/file.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 // File represents a file as a name/value pair.
 //
diff --git a/pkg/chart/loader/archive.go b/pkg/chart/v2/loader/archive.go
similarity index 99%
rename from pkg/chart/loader/archive.go
rename to pkg/chart/v2/loader/archive.go
index 51dd264f7..cb6d3bfe8 100644
--- a/pkg/chart/loader/archive.go
+++ b/pkg/chart/v2/loader/archive.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)
diff --git a/pkg/chart/loader/archive_test.go b/pkg/chart/v2/loader/archive_test.go
similarity index 100%
rename from pkg/chart/loader/archive_test.go
rename to pkg/chart/v2/loader/archive_test.go
diff --git a/pkg/chart/loader/directory.go b/pkg/chart/v2/loader/directory.go
similarity index 98%
rename from pkg/chart/loader/directory.go
rename to pkg/chart/v2/loader/directory.go
index 1dc30e4dc..37b24d3f9 100644
--- a/pkg/chart/loader/directory.go
+++ b/pkg/chart/v2/loader/directory.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 
 	"helm.sh/helm/v4/internal/sympath"
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/ignore"
 )
 
diff --git a/pkg/chart/loader/load.go b/pkg/chart/v2/loader/load.go
similarity index 99%
rename from pkg/chart/loader/load.go
rename to pkg/chart/v2/loader/load.go
index e32094ef5..3c5463720 100644
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/v2/loader/load.go
@@ -30,7 +30,7 @@ import (
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // ChartLoader loads a chart.
diff --git a/pkg/chart/loader/testdata/LICENSE b/pkg/chart/v2/loader/testdata/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/LICENSE
rename to pkg/chart/v2/loader/testdata/LICENSE
diff --git a/pkg/chart/loader/testdata/albatross/Chart.yaml b/pkg/chart/v2/loader/testdata/albatross/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/albatross/Chart.yaml
rename to pkg/chart/v2/loader/testdata/albatross/Chart.yaml
diff --git a/pkg/chart/loader/testdata/albatross/values.yaml b/pkg/chart/v2/loader/testdata/albatross/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/albatross/values.yaml
rename to pkg/chart/v2/loader/testdata/albatross/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz-1.2.3.tgz b/pkg/chart/v2/loader/testdata/frobnitz-1.2.3.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz-1.2.3.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz-1.2.3.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v1.tgz b/pkg/chart/v2/loader/testdata/frobnitz.v1.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz.v1.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz.v1/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz.v1/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz.v1/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v1/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v1/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz.v1/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz.v1/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/requirements.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/requirements.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/requirements.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/requirements.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz.v1/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz.v1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/requirements.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/requirements.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/requirements.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/requirements.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz.v2.reqs/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz.v2.reqs/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz/README.md b/pkg/chart/v2/loader/testdata/frobnitz/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chart/v2/loader/testdata/frobnitz_backslash-1.2.3.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash-1.2.3.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash-1.2.3.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz_backslash/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz_backslash/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz_backslash/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz_backslash/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/README.md b/pkg/chart/v2/loader/testdata/frobnitz_backslash/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz_backslash/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz_backslash/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz_backslash/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz_backslash/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz_backslash/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_backslash/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_backslash/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_backslash/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_bom.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_bom/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_bom/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_bom/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/LICENSE b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/LICENSE
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/LICENSE
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/LICENSE
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/null b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/null
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/null
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/null
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz_with_dev_null/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_dev_null/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_dev_null/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/.helmignore b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/.helmignore
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/.helmignore
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/.helmignore
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/Chart.lock b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/Chart.lock
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/Chart.lock
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/Chart.lock
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/INSTALL.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/INSTALL.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/INSTALL.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/INSTALL.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/_ignore_me b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/docs/README.md b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/docs/README.md
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/docs/README.md
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/docs/README.md
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/icon.svg b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/icon.svg
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/icon.svg
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/icon.svg
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/ignore/me.txt b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/ignore/me.txt
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/ignore/me.txt
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/ignore/me.txt
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/templates/template.tpl b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/templates/template.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/templates/template.tpl
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/templates/template.tpl
diff --git a/pkg/chart/loader/testdata/frobnitz_with_symlink/values.yaml b/pkg/chart/v2/loader/testdata/frobnitz_with_symlink/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/frobnitz_with_symlink/values.yaml
rename to pkg/chart/v2/loader/testdata/frobnitz_with_symlink/values.yaml
diff --git a/pkg/chart/loader/testdata/genfrob.sh b/pkg/chart/v2/loader/testdata/genfrob.sh
similarity index 100%
rename from pkg/chart/loader/testdata/genfrob.sh
rename to pkg/chart/v2/loader/testdata/genfrob.sh
diff --git a/pkg/chart/loader/testdata/mariner/Chart.yaml b/pkg/chart/v2/loader/testdata/mariner/Chart.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/mariner/Chart.yaml
rename to pkg/chart/v2/loader/testdata/mariner/Chart.yaml
diff --git a/pkg/chart/loader/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chart/v2/loader/testdata/mariner/charts/albatross-0.1.0.tgz
similarity index 100%
rename from pkg/chart/loader/testdata/mariner/charts/albatross-0.1.0.tgz
rename to pkg/chart/v2/loader/testdata/mariner/charts/albatross-0.1.0.tgz
diff --git a/pkg/chart/loader/testdata/mariner/templates/placeholder.tpl b/pkg/chart/v2/loader/testdata/mariner/templates/placeholder.tpl
similarity index 100%
rename from pkg/chart/loader/testdata/mariner/templates/placeholder.tpl
rename to pkg/chart/v2/loader/testdata/mariner/templates/placeholder.tpl
diff --git a/pkg/chart/loader/testdata/mariner/values.yaml b/pkg/chart/v2/loader/testdata/mariner/values.yaml
similarity index 100%
rename from pkg/chart/loader/testdata/mariner/values.yaml
rename to pkg/chart/v2/loader/testdata/mariner/values.yaml
diff --git a/pkg/chart/metadata.go b/pkg/chart/v2/metadata.go
similarity index 99%
rename from pkg/chart/metadata.go
rename to pkg/chart/v2/metadata.go
index a08a97cd1..d213a3491 100644
--- a/pkg/chart/metadata.go
+++ b/pkg/chart/v2/metadata.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 import (
 	"path/filepath"
diff --git a/pkg/chart/util/capabilities.go b/pkg/chart/v2/util/capabilities.go
similarity index 100%
rename from pkg/chart/util/capabilities.go
rename to pkg/chart/v2/util/capabilities.go
diff --git a/pkg/chart/util/capabilities_test.go b/pkg/chart/v2/util/capabilities_test.go
similarity index 100%
rename from pkg/chart/util/capabilities_test.go
rename to pkg/chart/v2/util/capabilities_test.go
diff --git a/pkg/chart/util/chartfile.go b/pkg/chart/v2/util/chartfile.go
similarity index 98%
rename from pkg/chart/util/chartfile.go
rename to pkg/chart/v2/util/chartfile.go
index acab80d0a..87323c201 100644
--- a/pkg/chart/util/chartfile.go
+++ b/pkg/chart/v2/util/chartfile.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // LoadChartfile loads a Chart.yaml file into a *chart.Metadata.
diff --git a/pkg/chart/util/coalesce.go b/pkg/chart/v2/util/coalesce.go
similarity index 99%
rename from pkg/chart/util/coalesce.go
rename to pkg/chart/v2/util/coalesce.go
index 9ab5c1015..33d2d2833 100644
--- a/pkg/chart/util/coalesce.go
+++ b/pkg/chart/v2/util/coalesce.go
@@ -23,7 +23,7 @@ import (
 	"github.com/mitchellh/copystructure"
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func concatPrefix(a, b string) string {
diff --git a/pkg/chart/util/compatible.go b/pkg/chart/v2/util/compatible.go
similarity index 100%
rename from pkg/chart/util/compatible.go
rename to pkg/chart/v2/util/compatible.go
diff --git a/pkg/chart/util/compatible_test.go b/pkg/chart/v2/util/compatible_test.go
similarity index 100%
rename from pkg/chart/util/compatible_test.go
rename to pkg/chart/v2/util/compatible_test.go
diff --git a/pkg/chart/util/create.go b/pkg/chart/v2/util/create.go
similarity index 99%
rename from pkg/chart/util/create.go
rename to pkg/chart/v2/util/create.go
index dfb5099f2..7eb3398f5 100644
--- a/pkg/chart/util/create.go
+++ b/pkg/chart/v2/util/create.go
@@ -27,8 +27,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 // chartName is a regular expression for testing the supplied name of a chart.
diff --git a/pkg/chart/util/dependencies.go b/pkg/chart/v2/util/dependencies.go
similarity index 99%
rename from pkg/chart/util/dependencies.go
rename to pkg/chart/v2/util/dependencies.go
index fb9052d71..78ed46517 100644
--- a/pkg/chart/util/dependencies.go
+++ b/pkg/chart/v2/util/dependencies.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/mitchellh/copystructure"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // ProcessDependencies checks through this chart's dependencies, processing accordingly.
diff --git a/pkg/chart/util/doc.go b/pkg/chart/v2/util/doc.go
similarity index 95%
rename from pkg/chart/util/doc.go
rename to pkg/chart/v2/util/doc.go
index 587fcaeb1..141062074 100644
--- a/pkg/chart/util/doc.go
+++ b/pkg/chart/v2/util/doc.go
@@ -42,4 +42,4 @@ into a Chart.
 When creating charts in memory, use the 'helm.sh/helm/pkg/chart'
 package directly.
 */
-package util // import chartutil "helm.sh/helm/v4/pkg/chart/util"
+package util // import chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
diff --git a/pkg/chart/util/errors.go b/pkg/chart/v2/util/errors.go
similarity index 100%
rename from pkg/chart/util/errors.go
rename to pkg/chart/v2/util/errors.go
diff --git a/pkg/chart/util/errors_test.go b/pkg/chart/v2/util/errors_test.go
similarity index 100%
rename from pkg/chart/util/errors_test.go
rename to pkg/chart/v2/util/errors_test.go
diff --git a/pkg/chart/util/expand.go b/pkg/chart/v2/util/expand.go
similarity index 96%
rename from pkg/chart/util/expand.go
rename to pkg/chart/v2/util/expand.go
index 4b83bf584..e05a1a984 100644
--- a/pkg/chart/util/expand.go
+++ b/pkg/chart/v2/util/expand.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 // Expand uncompresses and extracts a chart into the specified directory.
diff --git a/pkg/chart/util/expand_test.go b/pkg/chart/v2/util/expand_test.go
similarity index 100%
rename from pkg/chart/util/expand_test.go
rename to pkg/chart/v2/util/expand_test.go
diff --git a/pkg/chart/util/jsonschema.go b/pkg/chart/v2/util/jsonschema.go
similarity index 98%
rename from pkg/chart/util/jsonschema.go
rename to pkg/chart/v2/util/jsonschema.go
index 616c6d444..615dc5320 100644
--- a/pkg/chart/util/jsonschema.go
+++ b/pkg/chart/v2/util/jsonschema.go
@@ -25,7 +25,7 @@ import (
 	"github.com/xeipuuv/gojsonschema"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // ValidateAgainstSchema checks that values does not violate the structure laid out in schema
diff --git a/pkg/chart/util/save.go b/pkg/chart/v2/util/save.go
similarity index 99%
rename from pkg/chart/util/save.go
rename to pkg/chart/v2/util/save.go
index 635ff7944..e1285ac88 100644
--- a/pkg/chart/util/save.go
+++ b/pkg/chart/v2/util/save.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
diff --git a/pkg/chart/util/testdata/chartfiletest.yaml b/pkg/chart/v2/util/testdata/chartfiletest.yaml
similarity index 100%
rename from pkg/chart/util/testdata/chartfiletest.yaml
rename to pkg/chart/v2/util/testdata/chartfiletest.yaml
diff --git a/pkg/chart/util/testdata/coleridge.yaml b/pkg/chart/v2/util/testdata/coleridge.yaml
similarity index 100%
rename from pkg/chart/util/testdata/coleridge.yaml
rename to pkg/chart/v2/util/testdata/coleridge.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/.helmignore b/pkg/chart/v2/util/testdata/dependent-chart-alias/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/.helmignore
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/.helmignore
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/Chart.lock b/pkg/chart/v2/util/testdata/dependent-chart-alias/Chart.lock
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/Chart.lock
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/Chart.lock
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/INSTALL.txt b/pkg/chart/v2/util/testdata/dependent-chart-alias/INSTALL.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/INSTALL.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/INSTALL.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/LICENSE b/pkg/chart/v2/util/testdata/dependent-chart-alias/LICENSE
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/LICENSE
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/LICENSE
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/README.md b/pkg/chart/v2/util/testdata/dependent-chart-alias/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/_ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/README.md b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz b/pkg/chart/v2/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/docs/README.md b/pkg/chart/v2/util/testdata/dependent-chart-alias/docs/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/docs/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/docs/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/icon.svg b/pkg/chart/v2/util/testdata/dependent-chart-alias/icon.svg
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/icon.svg
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/icon.svg
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/ignore/me.txt b/pkg/chart/v2/util/testdata/dependent-chart-alias/ignore/me.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/ignore/me.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/ignore/me.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/templates/template.tpl b/pkg/chart/v2/util/testdata/dependent-chart-alias/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/templates/template.tpl
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/templates/template.tpl
diff --git a/pkg/chart/util/testdata/dependent-chart-alias/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-alias/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-alias/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-alias/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/.helmignore b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/.helmignore
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/.helmignore
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/.ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/.ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/.ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/.ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/_ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/README.md b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/templates/template.tpl b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/templates/template.tpl
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/templates/template.tpl
diff --git a/pkg/chart/util/testdata/dependent-chart-helmignore/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-helmignore/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-helmignore/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-helmignore/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/.helmignore b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/LICENSE b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/README.md b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/icon.svg b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
diff --git a/pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
diff --git a/pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
diff --git a/pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml b/pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
rename to pkg/chart/v2/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz-1.2.3.tgz b/pkg/chart/v2/util/testdata/frobnitz-1.2.3.tgz
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz-1.2.3.tgz
rename to pkg/chart/v2/util/testdata/frobnitz-1.2.3.tgz
diff --git a/pkg/chart/util/testdata/frobnitz/.helmignore b/pkg/chart/v2/util/testdata/frobnitz/.helmignore
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/.helmignore
rename to pkg/chart/v2/util/testdata/frobnitz/.helmignore
diff --git a/pkg/chart/util/testdata/frobnitz/Chart.lock b/pkg/chart/v2/util/testdata/frobnitz/Chart.lock
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/Chart.lock
rename to pkg/chart/v2/util/testdata/frobnitz/Chart.lock
diff --git a/pkg/chart/util/testdata/frobnitz/Chart.yaml b/pkg/chart/v2/util/testdata/frobnitz/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/Chart.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/Chart.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/INSTALL.txt b/pkg/chart/v2/util/testdata/frobnitz/INSTALL.txt
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/INSTALL.txt
rename to pkg/chart/v2/util/testdata/frobnitz/INSTALL.txt
diff --git a/pkg/chart/util/testdata/frobnitz/LICENSE b/pkg/chart/v2/util/testdata/frobnitz/LICENSE
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/LICENSE
rename to pkg/chart/v2/util/testdata/frobnitz/LICENSE
diff --git a/pkg/chart/util/testdata/frobnitz/README.md b/pkg/chart/v2/util/testdata/frobnitz/README.md
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/README.md
rename to pkg/chart/v2/util/testdata/frobnitz/README.md
diff --git a/pkg/chart/util/testdata/frobnitz/charts/_ignore_me b/pkg/chart/v2/util/testdata/frobnitz/charts/_ignore_me
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/_ignore_me
rename to pkg/chart/v2/util/testdata/frobnitz/charts/_ignore_me
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/Chart.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/Chart.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/Chart.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/README.md b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/README.md
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/README.md
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/README.md
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/alpine/values.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/alpine/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/alpine/values.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/alpine/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/mariner/Chart.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/mariner/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/mariner/Chart.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/mariner/Chart.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl b/pkg/chart/v2/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
rename to pkg/chart/v2/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
diff --git a/pkg/chart/util/testdata/frobnitz/charts/mariner/values.yaml b/pkg/chart/v2/util/testdata/frobnitz/charts/mariner/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/charts/mariner/values.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/charts/mariner/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz/docs/README.md b/pkg/chart/v2/util/testdata/frobnitz/docs/README.md
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/docs/README.md
rename to pkg/chart/v2/util/testdata/frobnitz/docs/README.md
diff --git a/pkg/chart/util/testdata/frobnitz/icon.svg b/pkg/chart/v2/util/testdata/frobnitz/icon.svg
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/icon.svg
rename to pkg/chart/v2/util/testdata/frobnitz/icon.svg
diff --git a/pkg/chart/util/testdata/frobnitz/ignore/me.txt b/pkg/chart/v2/util/testdata/frobnitz/ignore/me.txt
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/ignore/me.txt
rename to pkg/chart/v2/util/testdata/frobnitz/ignore/me.txt
diff --git a/pkg/chart/util/testdata/frobnitz/templates/template.tpl b/pkg/chart/v2/util/testdata/frobnitz/templates/template.tpl
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/templates/template.tpl
rename to pkg/chart/v2/util/testdata/frobnitz/templates/template.tpl
diff --git a/pkg/chart/util/testdata/frobnitz/values.yaml b/pkg/chart/v2/util/testdata/frobnitz/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz/values.yaml
rename to pkg/chart/v2/util/testdata/frobnitz/values.yaml
diff --git a/pkg/chart/util/testdata/frobnitz_backslash-1.2.3.tgz b/pkg/chart/v2/util/testdata/frobnitz_backslash-1.2.3.tgz
similarity index 100%
rename from pkg/chart/util/testdata/frobnitz_backslash-1.2.3.tgz
rename to pkg/chart/v2/util/testdata/frobnitz_backslash-1.2.3.tgz
diff --git a/pkg/chart/util/testdata/genfrob.sh b/pkg/chart/v2/util/testdata/genfrob.sh
similarity index 100%
rename from pkg/chart/util/testdata/genfrob.sh
rename to pkg/chart/v2/util/testdata/genfrob.sh
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
diff --git a/pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml b/pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
rename to pkg/chart/v2/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
diff --git a/pkg/chart/util/testdata/joonix/Chart.yaml b/pkg/chart/v2/util/testdata/joonix/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/joonix/Chart.yaml
rename to pkg/chart/v2/util/testdata/joonix/Chart.yaml
diff --git a/pkg/chart/util/testdata/joonix/charts/.gitkeep b/pkg/chart/v2/util/testdata/joonix/charts/.gitkeep
similarity index 100%
rename from pkg/chart/util/testdata/joonix/charts/.gitkeep
rename to pkg/chart/v2/util/testdata/joonix/charts/.gitkeep
diff --git a/pkg/chart/util/testdata/subpop/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/README.md b/pkg/chart/v2/util/testdata/subpop/README.md
similarity index 100%
rename from pkg/chart/util/testdata/subpop/README.md
rename to pkg/chart/v2/util/testdata/subpop/README.md
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/crds/crdA.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/templates/NOTES.txt b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart1/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart1/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart1/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/charts/subchart2/values.yaml b/pkg/chart/v2/util/testdata/subpop/charts/subchart2/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/charts/subchart2/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/charts/subchart2/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/noreqs/Chart.yaml b/pkg/chart/v2/util/testdata/subpop/noreqs/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/noreqs/Chart.yaml
rename to pkg/chart/v2/util/testdata/subpop/noreqs/Chart.yaml
diff --git a/pkg/chart/util/testdata/subpop/noreqs/templates/service.yaml b/pkg/chart/v2/util/testdata/subpop/noreqs/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/noreqs/templates/service.yaml
rename to pkg/chart/v2/util/testdata/subpop/noreqs/templates/service.yaml
diff --git a/pkg/chart/util/testdata/subpop/noreqs/values.yaml b/pkg/chart/v2/util/testdata/subpop/noreqs/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/noreqs/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/noreqs/values.yaml
diff --git a/pkg/chart/util/testdata/subpop/values.yaml b/pkg/chart/v2/util/testdata/subpop/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/subpop/values.yaml
rename to pkg/chart/v2/util/testdata/subpop/values.yaml
diff --git a/pkg/chart/util/testdata/test-values-invalid.schema.json b/pkg/chart/v2/util/testdata/test-values-invalid.schema.json
similarity index 100%
rename from pkg/chart/util/testdata/test-values-invalid.schema.json
rename to pkg/chart/v2/util/testdata/test-values-invalid.schema.json
diff --git a/pkg/chart/util/testdata/test-values-negative.yaml b/pkg/chart/v2/util/testdata/test-values-negative.yaml
similarity index 100%
rename from pkg/chart/util/testdata/test-values-negative.yaml
rename to pkg/chart/v2/util/testdata/test-values-negative.yaml
diff --git a/pkg/chart/util/testdata/test-values.schema.json b/pkg/chart/v2/util/testdata/test-values.schema.json
similarity index 100%
rename from pkg/chart/util/testdata/test-values.schema.json
rename to pkg/chart/v2/util/testdata/test-values.schema.json
diff --git a/pkg/chart/util/testdata/test-values.yaml b/pkg/chart/v2/util/testdata/test-values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/test-values.yaml
rename to pkg/chart/v2/util/testdata/test-values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/README.md b/pkg/chart/v2/util/testdata/three-level-dependent-chart/README.md
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/README.md
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/README.md
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
diff --git a/pkg/chart/util/testdata/three-level-dependent-chart/umbrella/values.yaml b/pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/values.yaml
similarity index 100%
rename from pkg/chart/util/testdata/three-level-dependent-chart/umbrella/values.yaml
rename to pkg/chart/v2/util/testdata/three-level-dependent-chart/umbrella/values.yaml
diff --git a/pkg/chart/util/validate_name.go b/pkg/chart/v2/util/validate_name.go
similarity index 100%
rename from pkg/chart/util/validate_name.go
rename to pkg/chart/v2/util/validate_name.go
diff --git a/pkg/chart/util/validate_name_test.go b/pkg/chart/v2/util/validate_name_test.go
similarity index 100%
rename from pkg/chart/util/validate_name_test.go
rename to pkg/chart/v2/util/validate_name_test.go
diff --git a/pkg/chart/util/values.go b/pkg/chart/v2/util/values.go
similarity index 99%
rename from pkg/chart/util/values.go
rename to pkg/chart/v2/util/values.go
index 46952c079..404ba9842 100644
--- a/pkg/chart/util/values.go
+++ b/pkg/chart/v2/util/values.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // GlobalKey is the name of the Values key that is used for storing global vars.
diff --git a/pkg/cli/values/options.go b/pkg/cli/values/options.go
index 2c3706b84..461db3cc2 100644
--- a/pkg/cli/values/options.go
+++ b/pkg/cli/values/options.go
@@ -26,7 +26,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart/loader"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/strvals"
 )
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index e5dac8b10..d38509311 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -36,9 +36,9 @@ import (
 	"helm.sh/helm/v4/internal/resolver"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/internal/urlutil"
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 0229b1833..0d0a398be 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -29,8 +29,8 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/client-go/rest"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 // Engine is an implementation of the Helm rendering implementation for templates.
diff --git a/pkg/engine/files.go b/pkg/engine/files.go
index dc6a67de8..87166728c 100644
--- a/pkg/engine/files.go
+++ b/pkg/engine/files.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/gobwas/glob"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // files is a map of files in a chart that can be accessed from a template.
diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go
index b53400c87..a61d5e43f 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"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 a1e08b58d..598557a97 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/lint/rules/chartfile.go
@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/dependencies.go b/pkg/lint/rules/dependencies.go
index 5f71dd144..2ab56eca5 100644
--- a/pkg/lint/rules/dependencies.go
+++ b/pkg/lint/rules/dependencies.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/lint/rules/deprecations.go b/pkg/lint/rules/deprecations.go
index 0a8e642c9..bd4a4436a 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"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 var (
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index ec434aba5..287968340 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -33,8 +33,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/util/yaml"
 
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 f430178c3..8aae250c6 100644
--- a/pkg/lint/rules/values.go
+++ b/pkg/lint/rules/values.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/provenance/sign.go b/pkg/provenance/sign.go
index bbb68322f..cd7664edd 100644
--- a/pkg/provenance/sign.go
+++ b/pkg/provenance/sign.go
@@ -30,8 +30,8 @@ import (
 	"golang.org/x/crypto/openpgp/packet"    //nolint
 	"sigs.k8s.io/yaml"
 
-	hapi "helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	hapi "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 var defaultPGPConfig = packet.Config{
diff --git a/pkg/pusher/ocipusher.go b/pkg/pusher/ocipusher.go
index a5149d1c7..5cea78a44 100644
--- a/pkg/pusher/ocipusher.go
+++ b/pkg/pusher/ocipusher.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pkg/errors"
 
 	"helm.sh/helm/v4/internal/tlsutil"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/registry"
 	"helm.sh/helm/v4/pkg/time/ctime"
 )
diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 01e5dff7b..ecc7a0d04 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -45,7 +45,7 @@ import (
 	"oras.land/oras-go/v2/registry/remote/retry"
 
 	"helm.sh/helm/v4/internal/version"
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/helmpath"
 )
 
diff --git a/pkg/registry/util.go b/pkg/registry/util.go
index 8c0106fb9..1a96b0768 100644
--- a/pkg/registry/util.go
+++ b/pkg/registry/util.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"helm.sh/helm/v4/internal/tlsutil"
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	helmtime "helm.sh/helm/v4/pkg/time"
 
 	"github.com/Masterminds/semver/v3"
diff --git a/pkg/release/mock.go b/pkg/release/mock.go
index ab21d3cf2..94b4d01f3 100644
--- a/pkg/release/mock.go
+++ b/pkg/release/mock.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/time"
 )
 
diff --git a/pkg/release/release.go b/pkg/release/release.go
index 2a4963d9b..1a7c7b18c 100644
--- a/pkg/release/release.go
+++ b/pkg/release/release.go
@@ -15,7 +15,9 @@ limitations under the License.
 
 package release
 
-import "helm.sh/helm/v4/pkg/chart"
+import (
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+)
 
 // Release describes a deployment of a chart, together with the chart
 // and the variables used to deploy that chart.
diff --git a/pkg/release/util/manifest_sorter.go b/pkg/release/util/manifest_sorter.go
index a598743a6..c4ad62161 100644
--- a/pkg/release/util/manifest_sorter.go
+++ b/pkg/release/util/manifest_sorter.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/repo/chartrepo.go b/pkg/repo/chartrepo.go
index 3629bd24b..52f81be57 100644
--- a/pkg/repo/chartrepo.go
+++ b/pkg/repo/chartrepo.go
@@ -31,7 +31,7 @@ import (
 	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart/loader"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
diff --git a/pkg/repo/index.go b/pkg/repo/index.go
index 2526cba1b..c5f808229 100644
--- a/pkg/repo/index.go
+++ b/pkg/repo/index.go
@@ -33,8 +33,8 @@ import (
 
 	"helm.sh/helm/v4/internal/fileutil"
 	"helm.sh/helm/v4/internal/urlutil"
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/provenance"
 )
 


Test patch:
diff --git a/cmd/helm/completion_test.go b/cmd/helm/completion_test.go
index 4dd427232..3d8383519 100644
--- a/cmd/helm/completion_test.go
+++ b/cmd/helm/completion_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go
index 76fce804c..a8361329e 100644
--- a/cmd/helm/create_test.go
+++ b/cmd/helm/create_test.go
@@ -23,9 +23,9 @@ import (
 	"testing"
 
 	"helm.sh/helm/v4/internal/test/ensure"
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 )
 
diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go
index 76c01d911..022621fe4 100644
--- a/cmd/helm/dependency_build_test.go
+++ b/cmd/helm/dependency_build_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 0732ba7b5..855675f78 100644
--- a/cmd/helm/dependency_update_test.go
+++ b/cmd/helm/dependency_update_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"helm.sh/helm/v4/internal/test/ensure"
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/repo"
diff --git a/cmd/helm/flags_test.go b/cmd/helm/flags_test.go
index 295f55022..3a9d7e6ef 100644
--- a/cmd/helm/flags_test.go
+++ b/cmd/helm/flags_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/release"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index e7a05aecf..cfffa6dc7 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"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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/list_test.go b/cmd/helm/list_test.go
index 01b6d7490..6a462ee28 100644
--- a/cmd/helm/list_test.go
+++ b/cmd/helm/list_test.go
@@ -19,7 +19,7 @@ package main
 import (
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/release"
 	"helm.sh/helm/v4/pkg/time"
 )
diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go
index 107928765..b86bae294 100644
--- a/cmd/helm/package_test.go
+++ b/cmd/helm/package_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 func TestPackage(t *testing.T) {
diff --git a/cmd/helm/rollback_test.go b/cmd/helm/rollback_test.go
index a94327e07..88dbf6524 100644
--- a/cmd/helm/rollback_test.go
+++ b/cmd/helm/rollback_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/cmd/helm/search/search_test.go b/cmd/helm/search/search_test.go
index 175491b36..7a4ba786b 100644
--- a/cmd/helm/search/search_test.go
+++ b/cmd/helm/search/search_test.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/repo"
 )
 
diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go
index 1973fe068..7e51849b1 100644
--- a/cmd/helm/status_test.go
+++ b/cmd/helm/status_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/release"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go
index f97a4a26b..595ca9fc2 100644
--- a/cmd/helm/upgrade_test.go
+++ b/cmd/helm/upgrade_test.go
@@ -24,9 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go
index f7ea06fdf..1e33837a9 100644
--- a/internal/resolver/resolver_test.go
+++ b/internal/resolver/resolver_test.go
@@ -19,7 +19,7 @@ import (
 	"runtime"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/registry"
 )
 
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index aa5d589f8..4c78ef6c1 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 38f2668ae..5be7bf5a9 100644
--- a/pkg/action/dependency_test.go
+++ b/pkg/action/dependency_test.go
@@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"helm.sh/helm/v4/internal/test"
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 func TestList(t *testing.T) {
diff --git a/pkg/action/hooks_test.go b/pkg/action/hooks_test.go
index 0f4a9be34..b39ffe022 100644
--- a/pkg/action/hooks_test.go
+++ b/pkg/action/hooks_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/release"
 )
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 9d90accc5..09715daf3 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -33,8 +33,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"helm.sh/helm/v4/internal/test"
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 a2c68ad64..b4cdb47c8 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"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/release"
 )
 
diff --git a/pkg/action/show_test.go b/pkg/action/show_test.go
index e8c998198..b1c5d6164 100644
--- a/pkg/action/show_test.go
+++ b/pkg/action/show_test.go
@@ -19,7 +19,7 @@ package action
 import (
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestShow(t *testing.T) {
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index 5437490cb..069578025 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/storage/driver"
 
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/chart/chart_test.go b/pkg/chart/v2/chart_test.go
similarity index 99%
rename from pkg/chart/chart_test.go
rename to pkg/chart/v2/chart_test.go
index 62d60765c..d6311085b 100644
--- a/pkg/chart/chart_test.go
+++ b/pkg/chart/v2/chart_test.go
@@ -13,7 +13,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 chart
+package v2
 
 import (
 	"encoding/json"
diff --git a/pkg/chart/dependency_test.go b/pkg/chart/v2/dependency_test.go
similarity index 98%
rename from pkg/chart/dependency_test.go
rename to pkg/chart/v2/dependency_test.go
index 90488a966..35919bd7a 100644
--- a/pkg/chart/dependency_test.go
+++ b/pkg/chart/v2/dependency_test.go
@@ -13,7 +13,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 chart
+package v2
 
 import (
 	"testing"
diff --git a/pkg/chart/fuzz_test.go b/pkg/chart/v2/fuzz_test.go
similarity index 98%
rename from pkg/chart/fuzz_test.go
rename to pkg/chart/v2/fuzz_test.go
index f3c768444..a897ef7b9 100644
--- a/pkg/chart/fuzz_test.go
+++ b/pkg/chart/v2/fuzz_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package chart
+package v2
 
 import (
 	"testing"
diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/v2/loader/load_test.go
similarity index 99%
rename from pkg/chart/loader/load_test.go
rename to pkg/chart/v2/loader/load_test.go
index e34124829..2e16b8560 100644
--- a/pkg/chart/loader/load_test.go
+++ b/pkg/chart/v2/loader/load_test.go
@@ -30,7 +30,7 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestLoadDir(t *testing.T) {
diff --git a/pkg/chart/metadata_test.go b/pkg/chart/v2/metadata_test.go
similarity index 99%
rename from pkg/chart/metadata_test.go
rename to pkg/chart/v2/metadata_test.go
index 62aea7261..7892f0209 100644
--- a/pkg/chart/metadata_test.go
+++ b/pkg/chart/v2/metadata_test.go
@@ -13,7 +13,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 chart
+package v2
 
 import (
 	"testing"
diff --git a/pkg/chart/util/chartfile_test.go b/pkg/chart/v2/util/chartfile_test.go
similarity index 98%
rename from pkg/chart/util/chartfile_test.go
rename to pkg/chart/v2/util/chartfile_test.go
index 6eb599680..a2896b235 100644
--- a/pkg/chart/util/chartfile_test.go
+++ b/pkg/chart/v2/util/chartfile_test.go
@@ -19,7 +19,7 @@ package util
 import (
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 const testfile = "testdata/chartfiletest.yaml"
diff --git a/pkg/chart/util/coalesce_test.go b/pkg/chart/v2/util/coalesce_test.go
similarity index 99%
rename from pkg/chart/util/coalesce_test.go
rename to pkg/chart/v2/util/coalesce_test.go
index 5a8dfe94a..3d4ee4fa8 100644
--- a/pkg/chart/util/coalesce_test.go
+++ b/pkg/chart/v2/util/coalesce_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
diff --git a/pkg/chart/util/create_test.go b/pkg/chart/v2/util/create_test.go
similarity index 98%
rename from pkg/chart/util/create_test.go
rename to pkg/chart/v2/util/create_test.go
index e67ce3e1f..086c4e5c8 100644
--- a/pkg/chart/util/create_test.go
+++ b/pkg/chart/v2/util/create_test.go
@@ -22,8 +22,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 func TestCreate(t *testing.T) {
diff --git a/pkg/chart/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go
similarity index 99%
rename from pkg/chart/util/dependencies_test.go
rename to pkg/chart/v2/util/dependencies_test.go
index 10fca265e..5bd332990 100644
--- a/pkg/chart/util/dependencies_test.go
+++ b/pkg/chart/v2/util/dependencies_test.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 func loadChart(t *testing.T, path string) *chart.Chart {
diff --git a/pkg/chart/util/jsonschema_test.go b/pkg/chart/v2/util/jsonschema_test.go
similarity index 99%
rename from pkg/chart/util/jsonschema_test.go
rename to pkg/chart/v2/util/jsonschema_test.go
index c5600044a..3e3315732 100644
--- a/pkg/chart/util/jsonschema_test.go
+++ b/pkg/chart/v2/util/jsonschema_test.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestValidateAgainstSingleSchema(t *testing.T) {
diff --git a/pkg/chart/util/save_test.go b/pkg/chart/v2/util/save_test.go
similarity index 98%
rename from pkg/chart/util/save_test.go
rename to pkg/chart/v2/util/save_test.go
index a7338c8d7..ff96331b5 100644
--- a/pkg/chart/util/save_test.go
+++ b/pkg/chart/v2/util/save_test.go
@@ -29,8 +29,8 @@ import (
 	"testing"
 	"time"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 func TestSave(t *testing.T) {
diff --git a/pkg/chart/util/values_test.go b/pkg/chart/v2/util/values_test.go
similarity index 99%
rename from pkg/chart/util/values_test.go
rename to pkg/chart/v2/util/values_test.go
index 660b7e4ed..6a5400f78 100644
--- a/pkg/chart/util/values_test.go
+++ b/pkg/chart/v2/util/values_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"text/template"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestReadValues(t *testing.T) {
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index 8731fb003..b8b009f1b 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/repo"
 	"helm.sh/helm/v4/pkg/repo/repotest"
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index 4c28c2965..a54e99cad 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -30,8 +30,8 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/dynamic/fake"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 func TestSortTemplates(t *testing.T) {
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index bba024d59..067d140f6 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 6d709790a..061d90e33 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/lint/rules/chartfile_test.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 e946b1c01..1369b2372 100644
--- a/pkg/lint/rules/dependencies_test.go
+++ b/pkg/lint/rules/dependencies_test.go
@@ -19,8 +19,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/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 d3185d8c8..7205ace6d 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
diff --git a/pkg/registry/util_test.go b/pkg/registry/util_test.go
index 93a11a998..c8ce4e4a4 100644
--- a/pkg/registry/util_test.go
+++ b/pkg/registry/util_test.go
@@ -23,7 +23,7 @@ import (
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go
index e3330b8eb..42d00e0ee 100644
--- a/pkg/repo/chartrepo_test.go
+++ b/pkg/repo/chartrepo_test.go
@@ -30,7 +30,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 )
diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go
index 8c22bdc3e..f50c7e65e 100644
--- a/pkg/repo/index_test.go
+++ b/pkg/repo/index_test.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/chart"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index 7b004dbc3..709a6f5fd 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -34,9 +34,9 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart"
-	"helm.sh/helm/v4/pkg/chart/loader"
-	chartutil "helm.sh/helm/v4/pkg/chart/util"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	ociRegistry "helm.sh/helm/v4/pkg/registry"
 	"helm.sh/helm/v4/pkg/repo"
 )