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

Merge branch 'main' into post-renderer-once

Browse Source
pull/30572/head
Yarden Shoham 7 months ago
parent dd728861a9 35a8bd3a77
commit 79dadc6fe4
475 changed files with 312 additions and 183 deletions
Show Stats Download Patch File Download Diff File

4
.github/workflows/scorecards.yml vendored
Unescape View File

@ -33,7 +33,7 @@ jobs:
persist-credentials: false
- name: "Run analysis"
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
with:
results_file: results.sarif
results_format: sarif
@ -55,7 +55,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
with:
name: SARIF file
path: results.sarif

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

2
cmd/helm/completion_test.go
Unescape View File

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

4
cmd/helm/create.go
Unescape View File

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

6
cmd/helm/create_test.go
Unescape View File

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

2
cmd/helm/dependency_build_test.go
Unescape View File

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

4
cmd/helm/dependency_update_test.go
Unescape View File

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

3
cmd/helm/flags_test.go
Unescape View File

@ -21,9 +21,8 @@ import (
"testing"
"github.com/stretchr/testify/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/release"
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/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"

4
cmd/helm/history.go
Unescape View File

@ -27,10 +27,10 @@ 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"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
helmtime "helm.sh/helm/v4/pkg/time"
)

4
cmd/helm/install.go
Unescape View File

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

2
cmd/helm/lint.go
Unescape View File

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

2
cmd/helm/list_test.go
Unescape View File

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

4
cmd/helm/package_test.go
Unescape View File

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

2
cmd/helm/rollback_test.go
Unescape View File

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

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

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

2
cmd/helm/status.go
Unescape View File

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

2
cmd/helm/status_test.go
Unescape View File

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

4
cmd/helm/template.go
Unescape View File

@ -34,9 +34,9 @@ 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"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
const templateDesc = `

2
cmd/helm/upgrade.go
Unescape View File

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

6
cmd/helm/upgrade_test.go
Unescape View File

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

4
go.mod
Unescape View File

@ -33,9 +33,10 @@ require (
github.com/spf13/pflag v1.0.6
github.com/stretchr/testify v1.10.0
github.com/xeipuuv/gojsonschema v1.2.0
golang.org/x/crypto v0.33.0
golang.org/x/crypto v0.35.0
golang.org/x/term v0.29.0
golang.org/x/text v0.22.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver v0.32.2
k8s.io/apimachinery v0.32.2
@ -173,7 +174,6 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

4
go.sum
Unescape View File

@ -400,8 +400,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=

2
internal/monocular/search.go
Unescape View File

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

4
internal/resolver/resolver.go
Unescape View File

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

2
internal/resolver/resolver_test.go
Unescape View File

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

6
pkg/action/action.go
Unescape View File

@ -33,14 +33,14 @@ 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"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"
"helm.sh/helm/v4/pkg/time"

4
pkg/action/action_test.go
Unescape View File

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

4
pkg/action/dependency.go
Unescape View File

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

4
pkg/action/dependency_test.go
Unescape View File

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

2
pkg/action/get_metadata.go
Unescape View File

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

2
pkg/action/get_values.go
Unescape View File

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

2
pkg/action/history.go
Unescape View File

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

2
pkg/action/hooks_test.go
Unescape View File

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

6
pkg/action/install.go
Unescape View File

@ -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"
@ -49,7 +49,7 @@ import (
"helm.sh/helm/v4/pkg/postrender"
"helm.sh/helm/v4/pkg/registry"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/repo"
"helm.sh/helm/v4/pkg/storage"
"helm.sh/helm/v4/pkg/storage/driver"

4
pkg/action/install_test.go
Unescape View File

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

2
pkg/action/lint.go
Unescape View File

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

2
pkg/action/list.go
Unescape View File

@ -23,7 +23,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
// ListStates represents zero or more status codes that a list item may have set

4
pkg/action/package.go
Unescape View File

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

2
pkg/action/pull.go
Unescape View File

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

2
pkg/action/release_testing.go
Unescape View File

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

2
pkg/action/resource_policy.go
Unescape View File

@ -20,7 +20,7 @@ import (
"strings"
"helm.sh/helm/v4/pkg/kube"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
)
func filterManifestsToKeep(manifests []releaseutil.Manifest) (keep, remaining []releaseutil.Manifest) {

2
pkg/action/rollback.go
Unescape View File

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

6
pkg/action/show.go
Unescape View File

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

2
pkg/action/show_test.go
Unescape View File

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

4
pkg/action/uninstall.go
Unescape View File

@ -24,10 +24,10 @@ 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"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
helmtime "helm.sh/helm/v4/pkg/time"
)

6
pkg/action/upgrade.go
Unescape View File

@ -28,13 +28,13 @@ 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"
"helm.sh/helm/v4/pkg/release"
"helm.sh/helm/v4/pkg/releaseutil"
releaseutil "helm.sh/helm/v4/pkg/release/util"
"helm.sh/helm/v4/pkg/storage/driver"
)

2
pkg/action/upgrade_test.go
Unescape View File

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

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.
*/
package chart
package v2
import (
"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
limitations under the License.
*/
package chart
package v2
import (
"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.
*/
package chart
package v2
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
limitations under the License.
*/
package chart
package v2
import (
"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.
*/
package chart
package v2
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.
*/
package chart
package v2
// 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.
*/
package chart
package v2
import (
"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"
"helm.sh/helm/v4/pkg/chart"
chart "helm.sh/helm/v4/pkg/chart/v2"
)
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"
"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"
)

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"
"sigs.k8s.io/yaml"
"helm.sh/helm/v4/pkg/chart"
chart "helm.sh/helm/v4/pkg/chart/v2"
)
// 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"
"time"
"helm.sh/helm/v4/pkg/chart"
chart "helm.sh/helm/v4/pkg/chart/v2"
)
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

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

Write Preview
Loading…
Cancel
Save