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 Signed-off-by: Matt Farina <matt.farina@suse.com>
6 months ago · 61d3eca55c
parent 841f4b1256
commit 61d3eca55c
456 changed files with 168 additions and 143 deletions
--- a/4
+++ b/4
@ -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
--- 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"
 )

--- 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"
 )

--- 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"
 )

--- 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"
--- 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"
--- 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"
 )
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
 )
--- 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) {
--- 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"
 )

--- 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"
 )

--- 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"
 )
--- 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"
 )
--- 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"
 )
--- 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"
--- 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"
 )

--- 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.
--- 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"
--- 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"
 )

--- 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"
--- 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"
--- 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.
--- 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) {
--- 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.
--- 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.
--- 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"
 )

--- 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"
 )
--- 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"
--- 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"
--- 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"
 )
--- 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"
 )

--- 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"
--- 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"
 )

--- 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"
 )
--- 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"
 )

--- 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) {
--- 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"
--- 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"
--- 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"
--- a/pkg/chart/v2/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"
--- a/pkg/chart/v2/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"
--- a/pkg/chart/v2/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"

--- a/pkg/chart/v2/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"
--- a/pkg/chart/v2/doc.go
+++ 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
--- a/pkg/chart/v2/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"

--- a/pkg/chart/v2/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.
 //
--- a/pkg/chart/v2/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"
--- a/pkg/chart/v2/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]:/`)
--- a/pkg/chart/v2/loader/archive_test.go
+++ b/pkg/chart/v2/loader/archive_test.go
--- a/pkg/chart/v2/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"
 )

--- a/pkg/chart/v2/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.
--- a/pkg/chart/v2/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) {
--- a/pkg/chart/v2/loader/testdata/LICENSE
+++ b/pkg/chart/v2/loader/testdata/LICENSE
--- a/pkg/chart/v2/loader/testdata/albatross/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/albatross/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/albatross/values.yaml
+++ b/pkg/chart/v2/loader/testdata/albatross/values.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz-1.2.3.tgz
+++ b/pkg/chart/v2/loader/testdata/frobnitz-1.2.3.tgz
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1.tgz
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1.tgz
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/.helmignore
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/.helmignore
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.lock
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.lock
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/INSTALL.txt
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/INSTALL.txt
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/LICENSE
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/LICENSE
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/README.md
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/_ignore_me
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/_ignore_me
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/README.md
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/values.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/values.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/docs/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/docs/README.md
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/icon.svg
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/icon.svg
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/ignore/me.txt
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/ignore/me.txt
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/requirements.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/requirements.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/templates/template.tpl
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/templates/template.tpl
--- a/pkg/chart/v2/loader/testdata/frobnitz.v1/values.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v1/values.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/.helmignore
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/.helmignore
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/INSTALL.txt
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/INSTALL.txt
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/LICENSE
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/LICENSE
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/README.md
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml
--- a/pkg/chart/v2/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
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/docs/README.md
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/docs/README.md
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/icon.svg
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/icon.svg
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/ignore/me.txt
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/ignore/me.txt
--- a/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/requirements.yaml
+++ b/pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/requirements.yaml
--- a/Show More
+++ b/Show More