msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Move pkg/chart to pkg/chart/v2 to prepare for v3 charts

Browse Source 
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>
pull/30586/head
Matt Farina 6 months ago
parent 841f4b1256
commit 61d3eca55c
No known key found for this signature in database
GPG Key ID: 92C44A3D421FF7F9
456 changed files with 168 additions and 143 deletions
Show Stats Download Patch File Download Diff File

4
Makefile
Unescape View File

@ -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.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/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/v2/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.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
.PHONY: all .PHONY: all
all: build all: build

2
cmd/helm/completion_test.go
Unescape View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
"testing" "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/release"
) )

4
cmd/helm/create.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/helmpath" "helm.sh/helm/v4/pkg/helmpath"
) )

6
cmd/helm/create_test.go
Unescape View File

@ -23,9 +23,9 @@ import (
"testing" "testing"
"helm.sh/helm/v4/internal/test/ensure" "helm.sh/helm/v4/internal/test/ensure"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/helmpath" "helm.sh/helm/v4/pkg/helmpath"
) )

2
cmd/helm/dependency_build_test.go
Unescape View File

@ -22,7 +22,7 @@ import (
"strings" "strings"
"testing" "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/provenance"
"helm.sh/helm/v4/pkg/repo" "helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/repo/repotest" "helm.sh/helm/v4/pkg/repo/repotest"

4
cmd/helm/dependency_update_test.go
Unescape View File

@ -23,8 +23,8 @@ import (
"testing" "testing"
"helm.sh/helm/v4/internal/test/ensure" "helm.sh/helm/v4/internal/test/ensure"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/helmpath" "helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/provenance" "helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/repo" "helm.sh/helm/v4/pkg/repo"

2
cmd/helm/flags_test.go
Unescape View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"testing" "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/release"
helmtime "helm.sh/helm/v4/pkg/time" helmtime "helm.sh/helm/v4/pkg/time"
) )

2
cmd/helm/helm_test.go
Unescape View File

@ -30,7 +30,7 @@ import (
"helm.sh/helm/v4/internal/test" "helm.sh/helm/v4/internal/test"
"helm.sh/helm/v4/pkg/action" "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" "helm.sh/helm/v4/pkg/cli"
kubefake "helm.sh/helm/v4/pkg/kube/fake" kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"

2
cmd/helm/history.go
Unescape View File

@ -27,7 +27,7 @@ import (
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/action" "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/cli/output"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
releaseutil "helm.sh/helm/v4/pkg/release/util" releaseutil "helm.sh/helm/v4/pkg/release/util"

4
cmd/helm/install.go
Unescape View File

@ -32,8 +32,8 @@ import (
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/action" "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/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
"helm.sh/helm/v4/pkg/cli/output" "helm.sh/helm/v4/pkg/cli/output"
"helm.sh/helm/v4/pkg/cli/values" "helm.sh/helm/v4/pkg/cli/values"
"helm.sh/helm/v4/pkg/downloader" "helm.sh/helm/v4/pkg/downloader"

2
cmd/helm/lint.go
Unescape View File

@ -27,7 +27,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"helm.sh/helm/v4/pkg/action" "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/cli/values"
"helm.sh/helm/v4/pkg/getter" "helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/lint/support" "helm.sh/helm/v4/pkg/lint/support"

2
cmd/helm/list_test.go
Unescape View File

@ -19,7 +19,7 @@ package main
import ( import (
"testing" "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/release"
"helm.sh/helm/v4/pkg/time" "helm.sh/helm/v4/pkg/time"
) )

4
cmd/helm/package_test.go
Unescape View File

@ -23,8 +23,8 @@ import (
"strings" "strings"
"testing" "testing"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
) )
func TestPackage(t *testing.T) { func TestPackage(t *testing.T) {

2
cmd/helm/rollback_test.go
Unescape View File

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"testing" "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/release"
) )

2
cmd/helm/search/search_test.go
Unescape View File

@ -20,7 +20,7 @@ import (
"strings" "strings"
"testing" "testing"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/repo" "helm.sh/helm/v4/pkg/repo"
) )

2
cmd/helm/status.go
Unescape View File

@ -30,7 +30,7 @@ import (
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/action" "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/cli/output"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
) )

2
cmd/helm/status_test.go
Unescape View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"time" "time"
"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/release"
helmtime "helm.sh/helm/v4/pkg/time" helmtime "helm.sh/helm/v4/pkg/time"
) )

2
cmd/helm/template.go
Unescape View File

@ -34,7 +34,7 @@ import (
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/action" "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/cli/values"
releaseutil "helm.sh/helm/v4/pkg/release/util" releaseutil "helm.sh/helm/v4/pkg/release/util"
) )

2
cmd/helm/upgrade.go
Unescape View File

@ -31,7 +31,7 @@ import (
"helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/cmd/helm/require"
"helm.sh/helm/v4/pkg/action" "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/output"
"helm.sh/helm/v4/pkg/cli/values" "helm.sh/helm/v4/pkg/cli/values"
"helm.sh/helm/v4/pkg/downloader" "helm.sh/helm/v4/pkg/downloader"

6
cmd/helm/upgrade_test.go
Unescape View File

@ -24,9 +24,9 @@ import (
"strings" "strings"
"testing" "testing"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
) )

2
internal/monocular/search.go
Unescape View File

@ -25,7 +25,7 @@ import (
"time" "time"
"helm.sh/helm/v4/internal/version" "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. // SearchPath is the url path to the search API in monocular.

4
internal/resolver/resolver.go
Unescape View File

@ -27,8 +27,8 @@ import (
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
"helm.sh/helm/v4/pkg/helmpath" "helm.sh/helm/v4/pkg/helmpath"
"helm.sh/helm/v4/pkg/provenance" "helm.sh/helm/v4/pkg/provenance"
"helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/registry"

2
internal/resolver/resolver_test.go
Unescape View File

@ -19,7 +19,7 @@ import (
"runtime" "runtime"
"testing" "testing"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/registry"
) )

4
pkg/action/action.go
Unescape View File

@ -33,8 +33,8 @@ import (
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/engine" "helm.sh/helm/v4/pkg/engine"
"helm.sh/helm/v4/pkg/kube" "helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/postrender" "helm.sh/helm/v4/pkg/postrender"

4
pkg/action/action_test.go
Unescape View File

@ -24,8 +24,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
fakeclientset "k8s.io/client-go/kubernetes/fake" fakeclientset "k8s.io/client-go/kubernetes/fake"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
kubefake "helm.sh/helm/v4/pkg/kube/fake" kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"

4
pkg/action/dependency.go
Unescape View File

@ -26,8 +26,8 @@ import (
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/gosuri/uitable" "github.com/gosuri/uitable"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
) )
// Dependency is the action for building a given chart's dependency tree. // Dependency is the action for building a given chart's dependency tree.

4
pkg/action/dependency_test.go
Unescape View File

@ -25,8 +25,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"helm.sh/helm/v4/internal/test" "helm.sh/helm/v4/internal/test"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
) )
func TestList(t *testing.T) { func TestList(t *testing.T) {

2
pkg/action/get_metadata.go
Unescape View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
"time" "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. // GetMetadata is the action for checking a given release's metadata.

2
pkg/action/get_values.go
Unescape View File

@ -17,7 +17,7 @@ limitations under the License.
package action package action
import ( 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. // GetValues is the action for checking a given release's values.

2
pkg/action/history.go
Unescape View File

@ -19,7 +19,7 @@ package action
import ( import (
"github.com/pkg/errors" "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" "helm.sh/helm/v4/pkg/release"
) )

2
pkg/action/hooks_test.go
Unescape View File

@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert" "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" kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
) )

4
pkg/action/install.go
Unescape View File

@ -39,8 +39,8 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
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/cli"
"helm.sh/helm/v4/pkg/downloader" "helm.sh/helm/v4/pkg/downloader"
"helm.sh/helm/v4/pkg/getter" "helm.sh/helm/v4/pkg/getter"

4
pkg/action/install_test.go
Unescape View File

@ -33,8 +33,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"helm.sh/helm/v4/internal/test" "helm.sh/helm/v4/internal/test"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
kubefake "helm.sh/helm/v4/pkg/kube/fake" kubefake "helm.sh/helm/v4/pkg/kube/fake"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/storage/driver" "helm.sh/helm/v4/pkg/storage/driver"

2
pkg/action/lint.go
Unescape View File

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors" "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"
"helm.sh/helm/v4/pkg/lint/support" "helm.sh/helm/v4/pkg/lint/support"
) )

4
pkg/action/package.go
Unescape View File

@ -26,8 +26,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/term" "golang.org/x/term"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
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/provenance"
) )

2
pkg/action/pull.go
Unescape View File

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "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/cli"
"helm.sh/helm/v4/pkg/downloader" "helm.sh/helm/v4/pkg/downloader"
"helm.sh/helm/v4/pkg/getter" "helm.sh/helm/v4/pkg/getter"

2
pkg/action/release_testing.go
Unescape View File

@ -27,7 +27,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
v1 "k8s.io/api/core/v1" 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" "helm.sh/helm/v4/pkg/release"
) )

2
pkg/action/rollback.go
Unescape View File

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "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" "helm.sh/helm/v4/pkg/release"
helmtime "helm.sh/helm/v4/pkg/time" helmtime "helm.sh/helm/v4/pkg/time"
) )

6
pkg/action/show.go
Unescape View File

@ -25,9 +25,9 @@ import (
"k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/printers"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/chart/loader" "helm.sh/helm/v4/pkg/chart/v2/loader"
chartutil "helm.sh/helm/v4/pkg/chart/util" chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
"helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/registry"
) )

2
pkg/action/show_test.go
Unescape View File

@ -19,7 +19,7 @@ package action
import ( import (
"testing" "testing"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
) )
func TestShow(t *testing.T) { func TestShow(t *testing.T) {

2
pkg/action/uninstall.go
Unescape View File

@ -24,7 +24,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" 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/kube"
"helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/release"
releaseutil "helm.sh/helm/v4/pkg/release/util" releaseutil "helm.sh/helm/v4/pkg/release/util"

4
pkg/action/upgrade.go
Unescape View File

@ -28,8 +28,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
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/kube"
"helm.sh/helm/v4/pkg/postrender" "helm.sh/helm/v4/pkg/postrender"
"helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/registry"

2
pkg/action/upgrade_test.go
Unescape View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"time" "time"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
"helm.sh/helm/v4/pkg/storage/driver" "helm.sh/helm/v4/pkg/storage/driver"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
pkg/chart/chart.go → pkg/chart/v2/chart.go
Unescape View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import ( import (
"path/filepath" "path/filepath"

2
pkg/chart/chart_test.go → pkg/chart/v2/chart_test.go
Unescape View File

@ -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 See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import ( import (
"encoding/json" "encoding/json"

2
pkg/chart/dependency.go → pkg/chart/v2/dependency.go
Unescape View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import "time" import "time"

2
pkg/chart/dependency_test.go → pkg/chart/v2/dependency_test.go
Unescape View File

@ -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 See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import ( import (
"testing" "testing"

23
pkg/chart/v2/doc.go
Unescape View File

@ -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

2
pkg/chart/errors.go → pkg/chart/v2/errors.go
Unescape View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import "fmt" import "fmt"

2
pkg/chart/file.go → pkg/chart/v2/file.go
Unescape View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
// File represents a file as a name/value pair. // File represents a file as a name/value pair.
// //

2
pkg/chart/fuzz_test.go → pkg/chart/v2/fuzz_test.go
Unescape View File

@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package chart package v2
import ( import (
"testing" "testing"

2
pkg/chart/loader/archive.go → pkg/chart/v2/loader/archive.go
Unescape View File

@ -30,7 +30,7 @@ import (
"github.com/pkg/errors" "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]:/`) var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)

0
pkg/chart/loader/archive_test.go → pkg/chart/v2/loader/archive_test.go
Unescape View File

2
pkg/chart/loader/directory.go → pkg/chart/v2/loader/directory.go
Unescape View File

@ -26,7 +26,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v4/internal/sympath" "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" "helm.sh/helm/v4/pkg/ignore"
) )

2
pkg/chart/loader/load.go → pkg/chart/v2/loader/load.go
Unescape View File

@ -30,7 +30,7 @@ import (
utilyaml "k8s.io/apimachinery/pkg/util/yaml" utilyaml "k8s.io/apimachinery/pkg/util/yaml"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
) )
// ChartLoader loads a chart. // ChartLoader loads a chart.

2
pkg/chart/loader/load_test.go → pkg/chart/v2/loader/load_test.go
Unescape View File

@ -30,7 +30,7 @@ import (
"testing" "testing"
"time" "time"
"helm.sh/helm/v4/pkg/chart" chart "helm.sh/helm/v4/pkg/chart/v2"
) )
func TestLoadDir(t *testing.T) { func TestLoadDir(t *testing.T) {

0
pkg/chart/loader/testdata/LICENSE → pkg/chart/v2/loader/testdata/LICENSE vendored
Unescape View File

0
pkg/chart/loader/testdata/albatross/Chart.yaml → pkg/chart/v2/loader/testdata/albatross/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/albatross/values.yaml → pkg/chart/v2/loader/testdata/albatross/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz-1.2.3.tgz → pkg/chart/v2/loader/testdata/frobnitz-1.2.3.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1.tgz → pkg/chart/v2/loader/testdata/frobnitz.v1.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/.helmignore → pkg/chart/v2/loader/testdata/frobnitz.v1/.helmignore vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/Chart.lock → pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.lock vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/INSTALL.txt → pkg/chart/v2/loader/testdata/frobnitz.v1/INSTALL.txt vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/LICENSE → pkg/chart/v2/loader/testdata/frobnitz.v1/LICENSE vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/README.md → pkg/chart/v2/loader/testdata/frobnitz.v1/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/_ignore_me → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/_ignore_me vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/README.md → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast1/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/charts/mast2-0.1.0.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/templates/alpine-pod.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/alpine/values.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/alpine/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz → pkg/chart/v2/loader/testdata/frobnitz.v1/charts/mariner-4.3.2.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/docs/README.md → pkg/chart/v2/loader/testdata/frobnitz.v1/docs/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/icon.svg → pkg/chart/v2/loader/testdata/frobnitz.v1/icon.svg vendored
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

0
pkg/chart/loader/testdata/frobnitz.v1/ignore/me.txt → pkg/chart/v2/loader/testdata/frobnitz.v1/ignore/me.txt vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/requirements.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/requirements.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/templates/template.tpl → pkg/chart/v2/loader/testdata/frobnitz.v1/templates/template.tpl vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v1/values.yaml → pkg/chart/v2/loader/testdata/frobnitz.v1/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/.helmignore → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/.helmignore vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/INSTALL.txt → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/INSTALL.txt vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/LICENSE → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/LICENSE vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/README.md → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/_ignore_me vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/Chart.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast1/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/charts/mast2-0.1.0.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/templates/alpine-pod.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/alpine/values.yaml vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/charts/mariner-4.3.2.tgz vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/docs/README.md → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/docs/README.md vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/icon.svg → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/icon.svg vendored
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/ignore/me.txt → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/ignore/me.txt vendored
Unescape View File

0
pkg/chart/loader/testdata/frobnitz.v2.reqs/requirements.yaml → pkg/chart/v2/loader/testdata/frobnitz.v2.reqs/requirements.yaml vendored
Unescape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save