From f25e0d607362857144bd9bfd263213262e5f1f93 Mon Sep 17 00:00:00 2001
From: Daniel Pap <papfdani@gmail.com>
Date: Sun, 10 Dec 2023 05:55:25 +0100
Subject: [PATCH 001/211] show crds command output separated by document
 separator

Signed-off-by: Daniel Pap <papfdani@gmail.com>
---
 pkg/action/show.go      | 6 +++---
 pkg/action/show_test.go | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/action/show.go b/pkg/action/show.go
index 6ed855b83..46ba81ff6 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -139,10 +139,10 @@ func (s *Show) Run(chartpath string) (string, error) {
 	if s.OutputFormat == ShowCRDs || s.OutputFormat == ShowAll {
 		crds := s.chart.CRDObjects()
 		if len(crds) > 0 {
-			if s.OutputFormat == ShowAll && !bytes.HasPrefix(crds[0].File.Data, []byte("---")) {
-				fmt.Fprintln(&out, "---")
-			}
 			for _, crd := range crds {
+				if !bytes.HasPrefix(crd.File.Data, []byte("---")) {
+					fmt.Fprintln(&out, "---")
+				}
 				fmt.Fprintf(&out, "%s\n", string(crd.File.Data))
 			}
 		}
diff --git a/pkg/action/show_test.go b/pkg/action/show_test.go
index 8b617ea85..ab6f464ec 100644
--- a/pkg/action/show_test.go
+++ b/pkg/action/show_test.go
@@ -32,6 +32,7 @@ func TestShow(t *testing.T) {
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
+			{Name: "crds/baz.yaml", Data: []byte("baz\n")},
 		},
 		Raw: []*chart.File{
 			{Name: "values.yaml", Data: []byte("VALUES\n")},
@@ -58,6 +59,9 @@ foo
 ---
 bar
 
+---
+baz
+
 `
 	if output != expect {
 		t.Errorf("Expected\n%q\nGot\n%q\n", expect, output)
@@ -102,6 +106,7 @@ func TestShowCRDs(t *testing.T) {
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
+			{Name: "crds/baz.yaml", Data: []byte("baz\n")},
 		},
 	}
 
@@ -116,6 +121,9 @@ foo
 ---
 bar
 
+---
+baz
+
 `
 	if output != expect {
 		t.Errorf("Expected\n%q\nGot\n%q\n", expect, output)

From be88c963c4281984b2b2bd97d88b119f123d6a71 Mon Sep 17 00:00:00 2001
From: "Leo R. Lundgren" <leo@finalresort.org>
Date: Fri, 14 Jun 2024 23:19:39 +0200
Subject: [PATCH 002/211] style(pkg/chartutil): add missing dots and
 indentation to defaultValues

Pure cosmetics, add missing dots to a few comments and make indentation
coherent between different parts of the defaultValues YAML.

Signed-off-by: Leo R. Lundgren <leo@finalresort.org>
---
 pkg/chartutil/create.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 50212f9d5..f9cdbc463 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -119,14 +119,14 @@ nameOverride: ""
 fullnameOverride: ""
 
 serviceAccount:
-  # Specifies whether a service account should be created
+  # Specifies whether a service account should be created.
   create: true
   # Automatically mount a ServiceAccount's API credentials?
   automount: true
-  # Annotations to add to the service account
+  # Annotations to add to the service account.
   annotations: {}
   # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
+  # If not set and create is true, a name is generated using the fullname template.
   name: ""
 
 podAnnotations: {}
@@ -159,9 +159,9 @@ ingress:
         - path: /
           pathType: ImplementationSpecific
   tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+    # - secretName: chart-example-tls
+    #   hosts:
+    #     - chart-example.local
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -193,16 +193,16 @@ autoscaling:
 
 # Additional volumes on the output Deployment definition.
 volumes: []
-# - name: foo
-#   secret:
-#     secretName: mysecret
-#     optional: false
+  # - name: foo
+  #   secret:
+  #     secretName: mysecret
+  #     optional: false
 
 # Additional volumeMounts on the output Deployment definition.
 volumeMounts: []
-# - name: foo
-#   mountPath: "/etc/foo"
-#   readOnly: true
+  # - name: foo
+  #   mountPath: "/etc/foo"
+  #   readOnly: true
 
 nodeSelector: {}
 

From 5635ce585e53a10ae4e4daff96315b0153881707 Mon Sep 17 00:00:00 2001
From: satoru <satorulogic@gmail.com>
Date: Sun, 8 Jan 2023 10:37:17 +0800
Subject: [PATCH 003/211] Refactor, use sort.Slice to reduce boilerplate code

Signed-off-by: satoru <satorulogic@gmail.com>
---
 pkg/releaseutil/sorter.go | 43 ++++++++++-----------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/pkg/releaseutil/sorter.go b/pkg/releaseutil/sorter.go
index 1a8aa78a6..1ea5ef30d 100644
--- a/pkg/releaseutil/sorter.go
+++ b/pkg/releaseutil/sorter.go
@@ -22,35 +22,6 @@ import (
 	rspb "helm.sh/helm/v3/pkg/release"
 )
 
-type list []*rspb.Release
-
-func (s list) Len() int      { return len(s) }
-func (s list) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// ByName sorts releases by name
-type ByName struct{ list }
-
-// Less compares to releases
-func (s ByName) Less(i, j int) bool { return s.list[i].Name < s.list[j].Name }
-
-// ByDate sorts releases by date
-type ByDate struct{ list }
-
-// Less compares to releases
-func (s ByDate) Less(i, j int) bool {
-	ti := s.list[i].Info.LastDeployed.Unix()
-	tj := s.list[j].Info.LastDeployed.Unix()
-	return ti < tj
-}
-
-// ByRevision sorts releases by revision number
-type ByRevision struct{ list }
-
-// Less compares to releases
-func (s ByRevision) Less(i, j int) bool {
-	return s.list[i].Version < s.list[j].Version
-}
-
 // Reverse reverses the list of releases sorted by the sort func.
 func Reverse(list []*rspb.Release, sortFn func([]*rspb.Release)) {
 	sortFn(list)
@@ -62,17 +33,25 @@ func Reverse(list []*rspb.Release, sortFn func([]*rspb.Release)) {
 // SortByName returns the list of releases sorted
 // in lexicographical order.
 func SortByName(list []*rspb.Release) {
-	sort.Sort(ByName{list})
+	sort.Slice(list, func(i, j int) bool {
+		return list[i].Name < list[j].Name
+	})
 }
 
 // SortByDate returns the list of releases sorted by a
 // release's last deployed time (in seconds).
 func SortByDate(list []*rspb.Release) {
-	sort.Sort(ByDate{list})
+	sort.Slice(list, func(i, j int) bool {
+		ti := list[i].Info.LastDeployed.Unix()
+		tj := list[j].Info.LastDeployed.Unix()
+		return ti < tj
+	})
 }
 
 // SortByRevision returns the list of releases sorted by a
 // release's revision number (release.Version).
 func SortByRevision(list []*rspb.Release) {
-	sort.Sort(ByRevision{list})
+	sort.Slice(list, func(i, j int) bool {
+		return list[i].Version < list[j].Version
+	})
 }

From ab5084e0660a9d8014669b0c177787ee6fb2ea40 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 10:56:52 +0530
Subject: [PATCH 004/211] Create bug.md

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug.md

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 000000000..386fa2ba8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,20 @@
+---
+name: Bug report
+about: Share about things that are not working as expected
+labels: kind/bug
+
+---
+
+**What happened (please include outputs or screenshots)**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Kubernetes version (`kubectl version`):
+- OS (e.g., MacOS 10.13.6):
+- Python version (`python --version`)
+- helm version

From 61e313908f520ce8915dcad855cf873374258c47 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 10:58:51 +0530
Subject: [PATCH 005/211] Added issue templates for documentation & features

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/documentation.md | 10 ++++++++++
 .github/ISSUE_TEMPLATE/feature.md       | 10 ++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature.md

diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 000000000..75bef6b7d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,10 @@
+---
+name: Documentation
+about: Report any mistakes or missing information from the documentation or the examples
+labels: kind/documentation
+
+---
+
+**Link to the issue (please include a link to the specific documentation or example)**:
+
+**Description of the issue (please include outputs or screenshots if possible)**:
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 000000000..466b4f87b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Suggest a new feature for the project
+labels: kind/feature
+
+---
+
+**What is the feature and why do you need it**:
+
+**Describe the solution you'd like to see**:

From d448cf1943735d3e99e1485d85bf73418707a8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= <unguiculus@gmail.com>
Date: Thu, 22 May 2025 12:14:29 +0200
Subject: [PATCH 006/211] Add timeout flag to repo add and update flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>

# Conflicts:
#	pkg/cmd/repo_update.go
---
 pkg/cmd/repo_add.go       |  4 +++-
 pkg/cmd/repo_update.go    |  7 ++++++-
 pkg/getter/getter.go      | 34 +++++++++++++++++++++-------------
 pkg/getter/getter_test.go | 18 ++++++++++++++++++
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/pkg/cmd/repo_add.go b/pkg/cmd/repo_add.go
index 24c1eecab..187234486 100644
--- a/pkg/cmd/repo_add.go
+++ b/pkg/cmd/repo_add.go
@@ -52,6 +52,7 @@ type repoAddOptions struct {
 	passCredentialsAll   bool
 	forceUpdate          bool
 	allowDeprecatedRepos bool
+	timeout              time.Duration
 
 	certFile              string
 	keyFile               string
@@ -96,6 +97,7 @@ func newRepoAddCmd(out io.Writer) *cobra.Command {
 	f.BoolVar(&o.insecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the repository")
 	f.BoolVar(&o.allowDeprecatedRepos, "allow-deprecated-repos", false, "by default, this command will not allow adding official repos that have been permanently deleted. This disables that behavior")
 	f.BoolVar(&o.passCredentialsAll, "pass-credentials", false, "pass credentials to all domains")
+	f.DurationVar(&o.timeout, "timeout", getter.DefaultHTTPTimeout*time.Second, "time to wait for the index file download to complete")
 
 	return cmd
 }
@@ -199,7 +201,7 @@ func (o *repoAddOptions) run(out io.Writer) error {
 		return nil
 	}
 
-	r, err := repo.NewChartRepository(&c, getter.All(settings))
+	r, err := repo.NewChartRepository(&c, getter.All(settings, getter.WithTimeout(o.timeout)))
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/repo_update.go b/pkg/cmd/repo_update.go
index 9f4a603ae..23856d85e 100644
--- a/pkg/cmd/repo_update.go
+++ b/pkg/cmd/repo_update.go
@@ -22,6 +22,7 @@ import (
 	"io"
 	"slices"
 	"sync"
+	"time"
 
 	"github.com/spf13/cobra"
 
@@ -46,6 +47,7 @@ type repoUpdateOptions struct {
 	repoFile  string
 	repoCache string
 	names     []string
+	timeout   time.Duration
 }
 
 func newRepoUpdateCmd(out io.Writer) *cobra.Command {
@@ -68,6 +70,9 @@ func newRepoUpdateCmd(out io.Writer) *cobra.Command {
 		},
 	}
 
+	f := cmd.Flags()
+	f.DurationVar(&o.timeout, "timeout", getter.DefaultHTTPTimeout*time.Second, "time to wait for the index file download to complete")
+
 	return cmd
 }
 
@@ -94,7 +99,7 @@ func (o *repoUpdateOptions) run(out io.Writer) error {
 
 	for _, cfg := range f.Repositories {
 		if updateAllRepos || isRepoRequested(cfg.Name, o.names) {
-			r, err := repo.NewChartRepository(cfg, getter.All(settings))
+			r, err := repo.NewChartRepository(cfg, getter.All(settings, getter.WithTimeout(o.timeout)))
 			if err != nil {
 				return err
 			}
diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go
index 1aa38cac1..5605e043f 100644
--- a/pkg/getter/getter.go
+++ b/pkg/getter/getter.go
@@ -191,24 +191,32 @@ const (
 
 var defaultOptions = []Option{WithTimeout(time.Second * DefaultHTTPTimeout)}
 
-var httpProvider = Provider{
-	Schemes: []string{"http", "https"},
-	New: func(options ...Option) (Getter, error) {
-		options = append(options, defaultOptions...)
-		return NewHTTPGetter(options...)
-	},
-}
-
-var ociProvider = Provider{
-	Schemes: []string{registry.OCIScheme},
-	New:     NewOCIGetter,
+func Getters(extraOpts ...Option) Providers {
+	return Providers{
+		Provider{
+			Schemes: []string{"http", "https"},
+			New: func(options ...Option) (Getter, error) {
+				options = append(options, defaultOptions...)
+				options = append(options, extraOpts...)
+				return NewHTTPGetter(options...)
+			},
+		},
+		Provider{
+			Schemes: []string{registry.OCIScheme},
+			New: func(options ...Option) (Getter, error) {
+				options = append(options, defaultOptions...)
+				options = append(options, extraOpts...)
+				return NewOCIGetter(options...)
+			},
+		},
+	}
 }
 
 // All finds all of the registered getters as a list of Provider instances.
 // Currently, the built-in getters and the discovered plugins with downloader
 // notations are collected.
-func All(settings *cli.EnvSettings) Providers {
-	result := Providers{httpProvider, ociProvider}
+func All(settings *cli.EnvSettings, opts ...Option) Providers {
+	result := Getters(opts...)
 	pluginDownloaders, _ := collectPlugins(settings)
 	result = append(result, pluginDownloaders...)
 	return result
diff --git a/pkg/getter/getter_test.go b/pkg/getter/getter_test.go
index a14301900..83920e809 100644
--- a/pkg/getter/getter_test.go
+++ b/pkg/getter/getter_test.go
@@ -17,6 +17,7 @@ package getter
 
 import (
 	"testing"
+	"time"
 
 	"helm.sh/helm/v4/pkg/cli"
 )
@@ -52,6 +53,23 @@ func TestProviders(t *testing.T) {
 	}
 }
 
+func TestProvidersWithTimeout(t *testing.T) {
+	want := time.Hour
+	getters := Getters(WithTimeout(want))
+	getter, err := getters.ByScheme("http")
+	if err != nil {
+		t.Error(err)
+	}
+	client, err := getter.(*HTTPGetter).httpClient()
+	if err != nil {
+		t.Error(err)
+	}
+	got := client.Timeout
+	if got != want {
+		t.Errorf("Expected %q, got %q", want, got)
+	}
+}
+
 func TestAll(t *testing.T) {
 	env := cli.New()
 	env.PluginsDirectory = pluginDir

From fcef3131971ebb045994d885116dbd53112a3434 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 11:05:07 +0530
Subject: [PATCH 007/211] Delete .github/issue_template.md

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/issue_template.md | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .github/issue_template.md

diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 48f48e5b6..000000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- If you need help or think you have found a bug, please help us with your issue by entering the following information (otherwise you can delete this text): -->
-
-Output of `helm version`:
-
-Output of `kubectl version`:
-
-Cloud Provider/Platform (AKS, GKE, Minikube etc.): 
-
-

From 03d8e1eaf2b82b74284f7bda83633e8fdff495e0 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 11:07:52 +0530
Subject: [PATCH 008/211] Update and rename bug.md to bug-report.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-report.yaml | 80 ++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug.md          | 20 -------
 2 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.yaml
 delete mode 100644 .github/ISSUE_TEMPLATE/bug.md

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
new file mode 100644
index 000000000..99c18fc16
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,80 @@
+name: Bug Report
+description: Report a bug encountered while operating helm
+labels: kind/bug
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: What happened?
+      description: |
+        Please provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: What did you expect to happen?
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro
+    attributes:
+      label: How can we reproduce it (as minimally and precisely as possible)?
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Anything else we need to know?
+
+  - type: textarea
+    id: kubeVersion
+    attributes:
+      label: Kubernetes version
+      value: |
+        <details>
+
+        ```console
+        $ kubectl version
+        # paste output here
+        ```
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    id: cloudProvider
+    attributes:
+      label: Cloud provider
+      value: |
+        <details>
+
+        </details>
+    validations:
+      required: true
+
+  - type: textarea
+    id: osVersion
+    attributes:
+      label: OS version
+      value: |
+        <details>
+
+        ```console
+        # On Linux:
+        $ cat /etc/os-release
+        # paste output here
+        $ uname -a
+        # paste output here
+
+        # On Windows:
+        C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
+        # paste output here
+        ```
+
+        </details>
+
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 386fa2ba8..000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Bug report
-about: Share about things that are not working as expected
-labels: kind/bug
-
----
-
-**What happened (please include outputs or screenshots)**:
-
-**What you expected to happen**:
-
-**How to reproduce it (as minimally and precisely as possible)**:
-
-**Anything else we need to know?**:
-
-**Environment**:
-- Kubernetes version (`kubectl version`):
-- OS (e.g., MacOS 10.13.6):
-- Python version (`python --version`)
-- helm version

From ca89ae2d7aa7edf0cfa1c70bf009ebba8ba9808e Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 11:09:05 +0530
Subject: [PATCH 009/211] Update and rename feature.md to feature.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/feature.md   | 10 ----------
 .github/ISSUE_TEMPLATE/feature.yaml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 10 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/feature.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature.yaml

diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index 466b4f87b..000000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature for the project
-labels: kind/feature
-
----
-
-**What is the feature and why do you need it**:
-
-**Describe the solution you'd like to see**:
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
new file mode 100644
index 000000000..a4dfef621
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -0,0 +1,20 @@
+name: Enhancement Tracking Issue
+description: Provide supporting details for a feature in development
+labels: kind/feature
+body:
+  - type: textarea
+    id: feature
+    attributes:
+      label: What would you like to be added?
+      description: |
+        Feature requests are unlikely to make progress as issues.
+        A proposal that works through the design along with the implications of the change can be opened as a KEP.
+    validations:
+      required: true
+
+  - type: textarea
+    id: rationale
+    attributes:
+      label: Why is this needed?
+    validations:
+      required: true

From 94318741e5bf672062afbaa4b8fb740856f99cfa Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 26 May 2025 11:10:30 +0530
Subject: [PATCH 010/211] Update and rename documentation.md to
 documentation.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/documentation.md   | 10 ----------
 .github/ISSUE_TEMPLATE/documentation.yaml | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 10 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.yaml

diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
deleted file mode 100644
index 75bef6b7d..000000000
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Documentation
-about: Report any mistakes or missing information from the documentation or the examples
-labels: kind/documentation
-
----
-
-**Link to the issue (please include a link to the specific documentation or example)**:
-
-**Description of the issue (please include outputs or screenshots if possible)**:
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
new file mode 100644
index 000000000..32ddd8cac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -0,0 +1,19 @@
+name: Documentation
+description: Report any mistakes or missing information from the documentation or the examples
+labels: kind/documentation
+body:
+  - type: textarea
+    id: feature
+    attributes:
+      label: What would you like to be added?
+      description: |
+        Link to the issue (please include a link to the specific documentation or example).
+    validations:
+      required: true
+
+  - type: textarea
+    id: rationale
+    attributes:
+      label: Why is this needed?
+    validations:
+      required: true

From 372dc303685a6f13c29391fa2b97e95af16518d2 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:28:42 +0530
Subject: [PATCH 011/211] Incorporated review comments

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-report.yaml    | 26 ++---------------------
 .github/ISSUE_TEMPLATE/documentation.yaml |  8 +++++++
 .github/ISSUE_TEMPLATE/feature.yaml       |  5 +++--
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 99c18fc16..b133f872e 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report a bug encountered while operating helm
+description: Report a bug encountered in Helm
 labels: kind/bug
 body:
   - type: textarea
@@ -49,32 +49,10 @@ body:
   - type: textarea
     id: cloudProvider
     attributes:
-      label: Cloud provider
+      label: Cloud provider/platform (AKS, GKE, Minikube etc.)
       value: |
         <details>
 
         </details>
     validations:
       required: true
-
-  - type: textarea
-    id: osVersion
-    attributes:
-      label: OS version
-      value: |
-        <details>
-
-        ```console
-        # On Linux:
-        $ cat /etc/os-release
-        # paste output here
-        $ uname -a
-        # paste output here
-
-        # On Windows:
-        C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
-        # paste output here
-        ```
-
-        </details>
-
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
index 32ddd8cac..bb1b7537c 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yaml
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -2,12 +2,19 @@ name: Documentation
 description: Report any mistakes or missing information from the documentation or the examples
 labels: kind/documentation
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ⚠️ **Note**: Most documentation lives in [helm/helm-www](https://github.com/helm/helm-www).
+        If your issue is about Helm website documentation or examples, please [open an issue there](https://github.com/helm/helm-www/issues/new/choose).
+
   - type: textarea
     id: feature
     attributes:
       label: What would you like to be added?
       description: |
         Link to the issue (please include a link to the specific documentation or example).
+        Link to the issue raised in [Helm Documentation Improvement Proposal](https://github.com/helm/helm-www)
     validations:
       required: true
 
@@ -17,3 +24,4 @@ body:
       label: Why is this needed?
     validations:
       required: true
+
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index a4dfef621..45b9c3f94 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -1,4 +1,4 @@
-name: Enhancement Tracking Issue
+name: Enhancement/feature
 description: Provide supporting details for a feature in development
 labels: kind/feature
 body:
@@ -8,7 +8,8 @@ body:
       label: What would you like to be added?
       description: |
         Feature requests are unlikely to make progress as issues.
-        A proposal that works through the design along with the implications of the change can be opened as a KEP.
+        Initial discussion and ideas can happen on an issue.
+        But significant changes or features must be proposed as a [Helm Improvement Proposal](https://github.com/helm/community/blob/main/hips/hip-0001.md) (HIP)
     validations:
       required: true
 

From 210e29d489fed86b59b6925106ba10fb7cd1fa7c Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 9 Jun 2025 08:55:35 +0530
Subject: [PATCH 012/211] Update bug-report.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-report.yaml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index b133f872e..42961b70e 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -22,9 +22,23 @@ body:
     id: repro
     attributes:
       label: How can we reproduce it (as minimally and precisely as possible)?
+      description: |
+        Please list steps someone can follow to trigger the issue.
+        
+        For example:
+        1. Run `helm install mychart ./path-to-chart -f values.yaml`
+        2. Observe the following error: ...
+
+        You can include:
+        - a sample `values.yaml` block
+        - a link to a chart
+        - specific `helm` commands used
+
+        This helps others reproduce and debug your issue more effectively.
     validations:
       required: true
 
+
   - type: textarea
     id: additional
     attributes:
@@ -45,14 +59,3 @@ body:
         </details>
     validations:
       required: true
-
-  - type: textarea
-    id: cloudProvider
-    attributes:
-      label: Cloud provider/platform (AKS, GKE, Minikube etc.)
-      value: |
-        <details>
-
-        </details>
-    validations:
-      required: true

From b305a501e84d4a6a4a881b3550bcd6b2d7424490 Mon Sep 17 00:00:00 2001
From: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
Date: Thu, 13 Mar 2025 13:28:21 +0000
Subject: [PATCH 013/211] added documentation and test cases for api-versions
 flag

Signed-off-by: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
---
 pkg/cmd/template.go                              |   2 +-
 pkg/cmd/template_test.go                         |   7 ++++++-
 .../output/template-with-api-version.txt         |   1 +
 .../issue-7233/charts/alpine-0.1.0.tgz           | Bin 0 -> 1166 bytes
 .../testcharts/subchart/templates/service.yaml   |   3 +++
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz

diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go
index 7a565ef85..bb0319264 100644
--- a/pkg/cmd/template.go
+++ b/pkg/cmd/template.go
@@ -201,7 +201,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&skipTests, "skip-tests", false, "skip tests from templated output")
 	f.BoolVar(&client.IsUpgrade, "is-upgrade", false, "set .Release.IsUpgrade instead of .Release.IsInstall")
 	f.StringVar(&kubeVersion, "kube-version", "", "Kubernetes version used for Capabilities.KubeVersion")
-	f.StringSliceVarP(&extraAPIs, "api-versions", "a", []string{}, "Kubernetes api versions used for Capabilities.APIVersions")
+	f.StringSliceVarP(&extraAPIs, "api-versions", "a", []string{}, "Kubernetes api versions used for Capabilities.APIVersions ( Can specify multiple or separate values with commands. Example --api-versions value1 --api-versions value2 or --api-versions value1, value2)")
 	f.BoolVar(&client.UseReleaseName, "release-name", false, "use release name in the output-dir path.")
 	bindPostRenderFlag(cmd, &client.PostRenderer)
 
diff --git a/pkg/cmd/template_test.go b/pkg/cmd/template_test.go
index a6c848e08..5bcccf5d0 100644
--- a/pkg/cmd/template_test.go
+++ b/pkg/cmd/template_test.go
@@ -83,7 +83,12 @@ func TestTemplateCmd(t *testing.T) {
 		},
 		{
 			name:   "check kube api versions",
-			cmd:    fmt.Sprintf("template --api-versions helm.k8s.io/test '%s'", chartPath),
+			cmd:    fmt.Sprintf("template --api-versions helm.k8s.io/test,helm.k8s.io/test2 '%s'", chartPath),
+			golden: "output/template-with-api-version.txt",
+		},
+		{
+			name:   "check kube api versions",
+			cmd:    fmt.Sprintf("template --api-versions helm.k8s.io/test --api-versions helm.k8s.io/test2 '%s'", chartPath),
 			golden: "output/template-with-api-version.txt",
 		},
 		{
diff --git a/pkg/cmd/testdata/output/template-with-api-version.txt b/pkg/cmd/testdata/output/template-with-api-version.txt
index 7e1c35001..8b6074cdb 100644
--- a/pkg/cmd/testdata/output/template-with-api-version.txt
+++ b/pkg/cmd/testdata/output/template-with-api-version.txt
@@ -75,6 +75,7 @@ metadata:
     kube-version/minor: "20"
     kube-version/version: "v1.20.0"
     kube-api-version/test: v1
+    kube-api-version/test2: v2
 spec:
   type: ClusterIP
   ports:
diff --git a/pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz b/pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..87db21817badafc36ad9eb7b7a12e35261c72202
GIT binary patch
literal 1166
zcmV;91abQxiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI-XZsRr+&b6LmpuJto@+rakF8FtWf6;caNQ(uEqNvBx*djua
zDoI&!y?*zC2RX6QO$v1F^q{#BM3En7hV#t~g}h>dhW{&2nPiJ4zxeu+rfGUPow{e5
zrrl>cp3N>s)2qwrY&M!)rWfgGJe^%$KzagQ9!aeYs*Ch5@6|Q#A0k+>Poy-HVh)>8
zgjIETjVH;QILb+9idDu9y`_rFEg&pWvkb0X@W8iB)OS$HJSt>Kb100d^n5rhh?j{j
z+%pnrKlyNrw5(M|dL9i9lh@1?^)kt1>E`=In^u=J86|1-($4x9O5pznc}@C63E(;Y
zr{lEC|EqM|^Zy+3!O^nZ4gxb@TAyCdD}n!p%8H{QJ@f;EO6FfJ8$84R@nkyg@P9U)
z_WVDKbn5>t6ZsrI$~-E`V2%do5rD7V@otyg5GT}>*tD_V4|cocldl|pAdUbyE{SWq
z4B!>~P!PmeRmp9=Bqhj@PM92)C~!^rV7ZO`0$>_yO*t3|MqzdfO~JAPjFdb;<*xal
z91zxQLjp3_w8DE67O!d!E2#kUk_in>A)!HGETkrara%**ls7{ILWRn(tmdfPUKUD`
zuB6ax$;sj+ZqZXV%;AA+z9+R|8Np}xwU&lpzkk{lOlX55qZl$NHY9AP1ts2+24;Xz
zZ=FvV0k(PvKqCP;2e|@M5PWk$wFdYG3rv9q8d3zAA~e={+L`QEbsh30Q(GO647Eqz
zwes=OLkqXtLE^6&*M}zap>vpiY&F(7Gya^R*0>G|wvDCx-~-bm--o4t58L>_1n^ys
zGvX+0BVAEuBR1%v3)yHWWMg%xwe`GaWyQ%OBz{)II0r7}tq(e=P;1HuO!!$2E<?^K
zw+CWSnU9jQY@5LQl{J!S5YoU()*^px2OOZ?&K_q@E3CN*J36r4t{sd&(1uhD$r12=
zZ!r-xXY0c7Ey&8SlKn<Ggi{Ey;?PQIqv8;9$U$#~!8_-kBV70losHeG9nG2lk#@n!
z9VH{M+Ztqol*<!?kYE~QhLk%gR^r;G9AAy*Ux*!ls+lZHv}x<7c(`O@s5wy;zmDIe
zX&V3BcQj8*sQ)+buHSz5E-CX<?D1UxKfAo@_W$XqzyF^_UWH5i9Io3O_kZH0&$&@_
zQwx{;#F~@6;oAiA@YbJ1k;{d2hi+|y8rCF8xmr`(g)W-~j>4jF;I0;hp8*SpL9n>*
zK^KrSMVXOm+olSe*EXcKt&&!kw#-4pOaT~WvbLY(%2qfm$&k`5_=5}X0#=OEJ@BJ!
zt6f63d2-R|h8NH(nMBc#vW5%=xZ=n;n1_z=rh9YS3CZwa@k<~3K?48j&M5rlM1KLE
zz5h=p9sW;8qfyWQbBG~rYz_AR0bCdid>H(FVzigjN#MV222Vx*Kf(X*{eN;bzUujZ
g4msw(4TGNkz4X#cFaHJkJpcgz|4sJjy8s{n0PDUu(*OVf

literal 0
HcmV?d00001

diff --git a/pkg/cmd/testdata/testcharts/subchart/templates/service.yaml b/pkg/cmd/testdata/testcharts/subchart/templates/service.yaml
index fee94dced..19c931cc3 100644
--- a/pkg/cmd/testdata/testcharts/subchart/templates/service.yaml
+++ b/pkg/cmd/testdata/testcharts/subchart/templates/service.yaml
@@ -11,6 +11,9 @@ metadata:
 {{- if .Capabilities.APIVersions.Has "helm.k8s.io/test" }}
     kube-api-version/test: v1
 {{- end }}
+{{- if .Capabilities.APIVersions.Has "helm.k8s.io/test2" }}
+    kube-api-version/test2: v2
+{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

From 0389407cbc7e0a11b3e3c11a5654fb7c93976f97 Mon Sep 17 00:00:00 2001
From: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
Date: Wed, 30 Apr 2025 07:43:40 +0000
Subject: [PATCH 014/211] removed unnecessary binary file

Signed-off-by: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
---
 .../issue-7233/charts/alpine-0.1.0.tgz           | Bin 1166 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz

diff --git a/pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz b/pkg/cmd/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz
deleted file mode 100644
index 87db21817badafc36ad9eb7b7a12e35261c72202..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1166
zcmV;91abQxiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI-XZsRr+&b6LmpuJto@+rakF8FtWf6;caNQ(uEqNvBx*djua
zDoI&!y?*zC2RX6QO$v1F^q{#BM3En7hV#t~g}h>dhW{&2nPiJ4zxeu+rfGUPow{e5
zrrl>cp3N>s)2qwrY&M!)rWfgGJe^%$KzagQ9!aeYs*Ch5@6|Q#A0k+>Poy-HVh)>8
zgjIETjVH;QILb+9idDu9y`_rFEg&pWvkb0X@W8iB)OS$HJSt>Kb100d^n5rhh?j{j
z+%pnrKlyNrw5(M|dL9i9lh@1?^)kt1>E`=In^u=J86|1-($4x9O5pznc}@C63E(;Y
zr{lEC|EqM|^Zy+3!O^nZ4gxb@TAyCdD}n!p%8H{QJ@f;EO6FfJ8$84R@nkyg@P9U)
z_WVDKbn5>t6ZsrI$~-E`V2%do5rD7V@otyg5GT}>*tD_V4|cocldl|pAdUbyE{SWq
z4B!>~P!PmeRmp9=Bqhj@PM92)C~!^rV7ZO`0$>_yO*t3|MqzdfO~JAPjFdb;<*xal
z91zxQLjp3_w8DE67O!d!E2#kUk_in>A)!HGETkrara%**ls7{ILWRn(tmdfPUKUD`
zuB6ax$;sj+ZqZXV%;AA+z9+R|8Np}xwU&lpzkk{lOlX55qZl$NHY9AP1ts2+24;Xz
zZ=FvV0k(PvKqCP;2e|@M5PWk$wFdYG3rv9q8d3zAA~e={+L`QEbsh30Q(GO647Eqz
zwes=OLkqXtLE^6&*M}zap>vpiY&F(7Gya^R*0>G|wvDCx-~-bm--o4t58L>_1n^ys
zGvX+0BVAEuBR1%v3)yHWWMg%xwe`GaWyQ%OBz{)II0r7}tq(e=P;1HuO!!$2E<?^K
zw+CWSnU9jQY@5LQl{J!S5YoU()*^px2OOZ?&K_q@E3CN*J36r4t{sd&(1uhD$r12=
zZ!r-xXY0c7Ey&8SlKn<Ggi{Ey;?PQIqv8;9$U$#~!8_-kBV70losHeG9nG2lk#@n!
z9VH{M+Ztqol*<!?kYE~QhLk%gR^r;G9AAy*Ux*!ls+lZHv}x<7c(`O@s5wy;zmDIe
zX&V3BcQj8*sQ)+buHSz5E-CX<?D1UxKfAo@_W$XqzyF^_UWH5i9Io3O_kZH0&$&@_
zQwx{;#F~@6;oAiA@YbJ1k;{d2hi+|y8rCF8xmr`(g)W-~j>4jF;I0;hp8*SpL9n>*
zK^KrSMVXOm+olSe*EXcKt&&!kw#-4pOaT~WvbLY(%2qfm$&k`5_=5}X0#=OEJ@BJ!
zt6f63d2-R|h8NH(nMBc#vW5%=xZ=n;n1_z=rh9YS3CZwa@k<~3K?48j&M5rlM1KLE
zz5h=p9sW;8qfyWQbBG~rYz_AR0bCdid>H(FVzigjN#MV222Vx*Kf(X*{eN;bzUujZ
g4msw(4TGNkz4X#cFaHJkJpcgz|4sJjy8s{n0PDUu(*OVf


From e060fbe1851221487394bd56de631522812732d3 Mon Sep 17 00:00:00 2001
From: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
Date: Mon, 9 Jun 2025 06:11:05 +0000
Subject: [PATCH 015/211] updated docs

Signed-off-by: Ashmit Bhardwaj <ashmit.bhardwaj@fmr.com>
---
 pkg/cmd/template.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go
index bb0319264..ac20a45b3 100644
--- a/pkg/cmd/template.go
+++ b/pkg/cmd/template.go
@@ -201,7 +201,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&skipTests, "skip-tests", false, "skip tests from templated output")
 	f.BoolVar(&client.IsUpgrade, "is-upgrade", false, "set .Release.IsUpgrade instead of .Release.IsInstall")
 	f.StringVar(&kubeVersion, "kube-version", "", "Kubernetes version used for Capabilities.KubeVersion")
-	f.StringSliceVarP(&extraAPIs, "api-versions", "a", []string{}, "Kubernetes api versions used for Capabilities.APIVersions ( Can specify multiple or separate values with commands. Example --api-versions value1 --api-versions value2 or --api-versions value1, value2)")
+	f.StringSliceVarP(&extraAPIs, "api-versions", "a", []string{}, "Kubernetes api versions used for Capabilities.APIVersions (multiple can be specified)")
 	f.BoolVar(&client.UseReleaseName, "release-name", false, "use release name in the output-dir path.")
 	bindPostRenderFlag(cmd, &client.PostRenderer)
 

From b9008b2caa4c3914a115e5ebd26dc2ca097ad53a Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Mon, 9 Jun 2025 17:59:12 +0530
Subject: [PATCH 016/211] Update bug-report.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-report.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 42961b70e..950c2a66c 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -38,11 +38,19 @@ body:
     validations:
       required: true
 
-
   - type: textarea
-    id: additional
+    id: helmVersion
     attributes:
-      label: Anything else we need to know?
+      label: Helm version
+      value: |
+        <details>
+        ```console
+        $ helm version
+        # paste output here
+        ```
+        </details>
+    validations:
+      required: true
 
   - type: textarea
     id: kubeVersion

From 47980159b30ecac81ccd52a7fc462389cf42b39b Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 4 Jun 2025 14:12:23 -0600
Subject: [PATCH 017/211] fix: user username password for login

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/client.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 6cfa09a5a..3ea68f181 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -230,16 +230,16 @@ func (c *Client) Login(host string, options ...LoginOption) error {
 		return err
 	}
 	reg.PlainHTTP = c.plainHTTP
+	cred := auth.Credential{Username: c.username, Password: c.password}
+	c.authorizer.ForceAttemptOAuth2 = true
 	reg.Client = c.authorizer
 
 	ctx := context.Background()
-	cred, err := c.authorizer.Credential(ctx, host)
-	if err != nil {
-		return fmt.Errorf("fetching credentials for %q: %w", host, err)
-	}
-
 	if err := reg.Ping(ctx); err != nil {
-		return fmt.Errorf("authenticating to %q: %w", host, err)
+		c.authorizer.ForceAttemptOAuth2 = false
+		if err := reg.Ping(ctx); err != nil {
+			return fmt.Errorf("authenticating to %q: %w", host, err)
+		}
 	}
 
 	key := credentials.ServerAddressFromRegistry(host)

From a5084dc0a794d452a7c49ca5e3cfbd56572b1a45 Mon Sep 17 00:00:00 2001
From: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
Date: Sun, 15 Jun 2025 19:24:49 +0530
Subject: [PATCH 018/211] Update bug-report.yaml

Signed-off-by: Bhargavkonidena <Bhargavkonidena@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-report.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 950c2a66c..4309d800b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -26,7 +26,7 @@ body:
         Please list steps someone can follow to trigger the issue.
         
         For example:
-        1. Run `helm install mychart ./path-to-chart -f values.yaml`
+        1. Run `helm install mychart ./path-to-chart -f values.yaml --debug`
         2. Observe the following error: ...
 
         You can include:

From f55c462a79720b0ba56d94d9e28529f8c5b8c7d9 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Thu, 19 Jun 2025 19:42:45 -0600
Subject: [PATCH 019/211] fix: force bearer oauth for everything

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/client.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 3ea68f181..339939c6f 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -134,6 +134,7 @@ func NewClient(options ...ClientOption) (*Client, error) {
 			authorizer.Cache = auth.NewCache()
 		}
 
+		authorizer.ForceAttemptOAuth2 = true
 		client.authorizer = &authorizer
 	}
 

From bfc1af68fbf3cc28662d1e668721095b415abc92 Mon Sep 17 00:00:00 2001
From: curlwget <curlwget@icloud.com>
Date: Tue, 24 Jun 2025 15:48:08 +0800
Subject: [PATCH 020/211] chore: fix function in comment

Signed-off-by: curlwget <curlwget@icloud.com>
---
 pkg/chart/v2/util/dependencies_test.go | 2 +-
 pkg/kube/wait.go                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go
index 5947eac69..d645d7bf5 100644
--- a/pkg/chart/v2/util/dependencies_test.go
+++ b/pkg/chart/v2/util/dependencies_test.go
@@ -133,7 +133,7 @@ func TestDependencyEnabled(t *testing.T) {
 	}
 }
 
-// extractCharts recursively searches chart dependencies returning all charts found
+// extractChartNames recursively searches chart dependencies returning all charts found
 func extractChartNames(c *chart.Chart) []string {
 	var out []string
 	var fn func(c *chart.Chart)
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index ebb5b3257..8a3bacdcc 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -117,7 +117,7 @@ func (hw *legacyWaiter) isRetryableHTTPStatusCode(httpStatusCode int32) bool {
 	return httpStatusCode == 0 || httpStatusCode == http.StatusTooManyRequests || (httpStatusCode >= 500 && httpStatusCode != http.StatusNotImplemented)
 }
 
-// waitForDeletedResources polls to check if all the resources are deleted or a timeout is reached
+// WaitForDelete polls to check if all the resources are deleted or a timeout is reached
 func (hw *legacyWaiter) WaitForDelete(deleted ResourceList, timeout time.Duration) error {
 	slog.Debug("beginning wait for resources to be deleted", "count", len(deleted), "timeout", timeout)
 

From cc733a0ca9d454d0982c1f891d929832f535c937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= <andrped94@gmail.com>
Date: Wed, 25 Jun 2025 19:29:54 +0200
Subject: [PATCH 021/211] [docs] Typofix in README
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Pedersen <andrped94@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39b70fb7e..ef994e742 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ including installing pre-releases.
 
 ## Docs
 
-Get started with the [Quick Start guide](https://helm.sh/docs/intro/quickstart/) or plunge into the [complete documentation](https://helm.sh/docs)
+Get started with the [Quick Start guide](https://helm.sh/docs/intro/quickstart/) or plunge into the [complete documentation](https://helm.sh/docs).
 
 ## Roadmap
 

From abe4e7f6923c7012c69464ef92f9881dbccadb01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 22:12:03 +0000
Subject: [PATCH 022/211] build(deps): bump sigs.k8s.io/yaml from 1.4.0 to
 1.5.0

Bumps [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](https://github.com/kubernetes-sigs/yaml/compare/v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 4 +++-
 go.sum | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 66de5f821..4d8a4ccd6 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	k8s.io/kubectl v0.33.1
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
-	sigs.k8s.io/yaml v1.4.0
+	sigs.k8s.io/yaml v1.5.0
 )
 
 require (
@@ -154,6 +154,8 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.3 // indirect
 	golang.org/x/mod v0.25.0 // indirect
 	golang.org/x/net v0.40.0 // indirect
 	golang.org/x/oauth2 v0.29.0 // indirect
diff --git a/go.sum b/go.sum
index 29ce847c9..b408d67fc 100644
--- a/go.sum
+++ b/go.sum
@@ -376,6 +376,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
+go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -539,5 +543,6 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
 sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
+sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

From d4e444370fbd7d56cb802e7c4cc34bfc4f66302e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Jun 2025 12:55:48 +0000
Subject: [PATCH 023/211] build(deps): bump the k8s-io group with 7 updates

Bumps the k8s-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.33.1` | `0.33.2` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.1` | `0.33.2` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.1` | `0.33.2` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.33.1` | `0.33.2` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.1` | `0.33.2` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.1` | `0.33.2` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.33.1` | `0.33.2` |


Updates `k8s.io/api` from 0.33.1 to 0.33.2
- [Commits](https://github.com/kubernetes/api/compare/v0.33.1...v0.33.2)

Updates `k8s.io/apiextensions-apiserver` from 0.33.1 to 0.33.2
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.33.1...v0.33.2)

Updates `k8s.io/apimachinery` from 0.33.1 to 0.33.2
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.33.1...v0.33.2)

Updates `k8s.io/apiserver` from 0.33.1 to 0.33.2
- [Commits](https://github.com/kubernetes/apiserver/compare/v0.33.1...v0.33.2)

Updates `k8s.io/cli-runtime` from 0.33.1 to 0.33.2
- [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.33.1...v0.33.2)

Updates `k8s.io/client-go` from 0.33.1 to 0.33.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.33.1...v0.33.2)

Updates `k8s.io/kubectl` from 0.33.1 to 0.33.2
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.33.1...v0.33.2)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiserver
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-version: 0.33.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 16 ++++++++--------
 go.sum | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 4d8a4ccd6..799a521bf 100644
--- a/go.mod
+++ b/go.mod
@@ -35,14 +35,14 @@ require (
 	golang.org/x/term v0.32.0
 	golang.org/x/text v0.26.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.33.1
-	k8s.io/apiextensions-apiserver v0.33.1
-	k8s.io/apimachinery v0.33.1
-	k8s.io/apiserver v0.33.1
-	k8s.io/cli-runtime v0.33.1
-	k8s.io/client-go v0.33.1
+	k8s.io/api v0.33.2
+	k8s.io/apiextensions-apiserver v0.33.2
+	k8s.io/apimachinery v0.33.2
+	k8s.io/apiserver v0.33.2
+	k8s.io/cli-runtime v0.33.2
+	k8s.io/client-go v0.33.2
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubectl v0.33.1
+	k8s.io/kubectl v0.33.2
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/yaml v1.5.0
@@ -170,7 +170,7 @@ 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
-	k8s.io/component-base v0.33.1 // indirect
+	k8s.io/component-base v0.33.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
diff --git a/go.sum b/go.sum
index b408d67fc..77591443e 100644
--- a/go.sum
+++ b/go.sum
@@ -506,26 +506,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw=
-k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw=
-k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI=
-k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA=
-k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4=
-k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo=
-k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs=
-k8s.io/cli-runtime v0.33.1 h1:TvpjEtF71ViFmPeYMj1baZMJR4iWUEplklsUQ7D3quA=
-k8s.io/cli-runtime v0.33.1/go.mod h1:9dz5Q4Uh8io4OWCLiEf/217DXwqNgiTS/IOuza99VZE=
-k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4=
-k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA=
-k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI=
-k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY=
+k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
+k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
+k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
+k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
+k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
+k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
+k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
+k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
+k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
+k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
+k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
+k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
-k8s.io/kubectl v0.33.1 h1:OJUXa6FV5bap6iRy345ezEjU9dTLxqv1zFTVqmeHb6A=
-k8s.io/kubectl v0.33.1/go.mod h1:Z07pGqXoP4NgITlPRrnmiM3qnoo1QrK1zjw85Aiz8J0=
+k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
+k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
 k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
 k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

From 74472a8640effba5941aa38e6faf9506a3470af8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Jun 2025 15:02:18 +0000
Subject: [PATCH 024/211] Bump github.com/Masterminds/semver/v3 from 3.3.0 to
 3.3.1

Bumps [github.com/Masterminds/semver/v3](https://github.com/Masterminds/semver) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/Masterminds/semver/releases)
- [Changelog](https://github.com/Masterminds/semver/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Masterminds/semver/compare/v3.3.0...v3.3.1)

---
updated-dependencies:
- dependency-name: github.com/Masterminds/semver/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 799a521bf..106c499b2 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
 	github.com/BurntSushi/toml v1.5.0
 	github.com/DATA-DOG/go-sqlmock v1.5.2
-	github.com/Masterminds/semver/v3 v3.3.0
+	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/Masterminds/vcs v1.13.3
diff --git a/go.sum b/go.sum
index 77591443e..8d8fe710e 100644
--- a/go.sum
+++ b/go.sum
@@ -14,8 +14,8 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
 github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=

From f0cf9c28f091767d134070cdf230a65bc3d8f618 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Tue, 1 Jul 2025 15:04:30 -0400
Subject: [PATCH 025/211] Move logging setup to be configurable

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 cmd/helm/helm.go        |  2 +-
 pkg/cmd/helpers_test.go |  2 +-
 pkg/cmd/root.go         | 35 +++++++++++++++++++++++------------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 0e912cda4..05e7e7ba2 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -34,7 +34,7 @@ func main() {
 	// manager as picked up by the automated name detection.
 	kube.ManagedFieldsManager = "helm"
 
-	cmd, err := helmcmd.NewRootCmd(os.Stdout, os.Args[1:])
+	cmd, err := helmcmd.NewRootCmd(os.Stdout, os.Args[1:], helmcmd.SetupLogging)
 	if err != nil {
 		slog.Warn("command failed", slog.Any("error", err))
 		os.Exit(1)
diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go
index 5d71fecad..8c06db4ae 100644
--- a/pkg/cmd/helpers_test.go
+++ b/pkg/cmd/helpers_test.go
@@ -94,7 +94,7 @@ func executeActionCommandStdinC(store *storage.Storage, in *os.File, cmd string)
 		Capabilities: chartutil.DefaultCapabilities,
 	}
 
-	root, err := newRootCmdWithConfig(actionConfig, buf, args)
+	root, err := newRootCmdWithConfig(actionConfig, buf, args, SetupLogging)
 	if err != nil {
 		return nil, "", err
 	}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index ee22533f0..4eb5da494 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -98,9 +98,9 @@ By default, the default directories depend on the Operating System. The defaults
 
 var settings = cli.New()
 
-func NewRootCmd(out io.Writer, args []string) (*cobra.Command, error) {
+func NewRootCmd(out io.Writer, args []string, logSetup func(bool)) (*cobra.Command, error) {
 	actionConfig := new(action.Configuration)
-	cmd, err := newRootCmdWithConfig(actionConfig, out, args)
+	cmd, err := newRootCmdWithConfig(actionConfig, out, args, logSetup)
 	if err != nil {
 		return nil, err
 	}
@@ -117,7 +117,19 @@ func NewRootCmd(out io.Writer, args []string) (*cobra.Command, error) {
 	return cmd, nil
 }
 
-func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, args []string) (*cobra.Command, error) {
+// SetupLogging sets up Helm logging used by the Helm client.
+// This function is passed to the NewRootCmd function to enable logging. Any other
+// application that uses the NewRootCmd function to setup all the Helm commands may
+// use this function to setup logging or their own. Using a custom logging setup function
+// enables applications using Helm commands to integrate with their existing logging
+// system.
+// The debug argument is the value if Helm is set for debugging (i.e. --debug flag)
+func SetupLogging(debug bool) {
+	logger := logging.NewLogger(func() bool { return debug })
+	slog.SetDefault(logger)
+}
+
+func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, args []string, logSetup func(bool)) (*cobra.Command, error) {
 	cmd := &cobra.Command{
 		Use:          "helm",
 		Short:        "The Helm package manager for Kubernetes.",
@@ -140,8 +152,14 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	settings.AddFlags(flags)
 	addKlogFlags(flags)
 
-	logger := logging.NewLogger(func() bool { return settings.Debug })
-	slog.SetDefault(logger)
+	// We can safely ignore any errors that flags.Parse encounters since
+	// those errors will be caught later during the call to cmd.Execution.
+	// This call is required to gather configuration information prior to
+	// execution.
+	flags.ParseErrorsWhitelist.UnknownFlags = true
+	flags.Parse(args)
+
+	logSetup(settings.Debug)
 
 	// Setup shell completion for the namespace flag
 	err := cmd.RegisterFlagCompletionFunc("namespace", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
@@ -190,13 +208,6 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 		log.Fatal(err)
 	}
 
-	// We can safely ignore any errors that flags.Parse encounters since
-	// those errors will be caught later during the call to cmd.Execution.
-	// This call is required to gather configuration information prior to
-	// execution.
-	flags.ParseErrorsWhitelist.UnknownFlags = true
-	flags.Parse(args)
-
 	registryClient, err := newDefaultRegistryClient(false, "", "")
 	if err != nil {
 		return nil, err

From afd63fed77909448d3ff08720d1898a63b90fc13 Mon Sep 17 00:00:00 2001
From: Thiago Presa <thiago.addevico@gmail.com>
Date: Thu, 26 Jun 2025 20:24:25 -0300
Subject: [PATCH 026/211] test: increase test coverage for pkg/pusher

Signed-off-by: Thiago Presa <thiago.addevico@gmail.com>
---
 pkg/pusher/ocipusher_test.go | 332 +++++++++++++++++++++++++++++++++++
 1 file changed, 332 insertions(+)

diff --git a/pkg/pusher/ocipusher_test.go b/pkg/pusher/ocipusher_test.go
index 760da8404..24f52a7ad 100644
--- a/pkg/pusher/ocipusher_test.go
+++ b/pkg/pusher/ocipusher_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 /*
 Copyright The Helm Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +18,10 @@ limitations under the License.
 package pusher
 
 import (
+	"io"
+	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"helm.sh/helm/v4/pkg/registry"
@@ -94,3 +99,330 @@ func TestNewOCIPusher(t *testing.T) {
 		t.Errorf("Expected NewOCIPusher to contain %p as RegistryClient, got %p", registryClient, op.opts.registryClient)
 	}
 }
+
+func TestOCIPusher_Push_ErrorHandling(t *testing.T) {
+	tests := []struct {
+		name          string
+		chartRef      string
+		expectedError string
+		setupFunc     func() string
+	}{
+		{
+			name:          "non-existent file",
+			chartRef:      "/non/existent/file.tgz",
+			expectedError: "no such file",
+		},
+		{
+			name:          "directory instead of file",
+			expectedError: "cannot push directory, must provide chart archive (.tgz)",
+			setupFunc: func() string {
+				tempDir := t.TempDir()
+				return tempDir
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			pusher, err := NewOCIPusher()
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			chartRef := tt.chartRef
+			if tt.setupFunc != nil {
+				chartRef = tt.setupFunc()
+			}
+
+			err = pusher.Push(chartRef, "oci://localhost:5000/test")
+			if err == nil {
+				t.Fatal("Expected error but got none")
+			}
+
+			if !strings.Contains(err.Error(), tt.expectedError) {
+				t.Errorf("Expected error containing %q, got %q", tt.expectedError, err.Error())
+			}
+		})
+	}
+}
+
+func TestOCIPusher_newRegistryClient(t *testing.T) {
+	cd := "../../testdata"
+	join := filepath.Join
+	ca, pub, priv := join(cd, "rootca.crt"), join(cd, "crt.pem"), join(cd, "key.pem")
+
+	tests := []struct {
+		name          string
+		opts          []Option
+		expectError   bool
+		errorContains string
+	}{
+		{
+			name: "plain HTTP",
+			opts: []Option{WithPlainHTTP(true)},
+		},
+		{
+			name: "with TLS client config",
+			opts: []Option{
+				WithTLSClientConfig(pub, priv, ca),
+			},
+		},
+		{
+			name: "with insecure skip TLS verify",
+			opts: []Option{
+				WithInsecureSkipTLSVerify(true),
+			},
+		},
+		{
+			name: "with cert and key only",
+			opts: []Option{
+				WithTLSClientConfig(pub, priv, ""),
+			},
+		},
+		{
+			name: "with CA file only",
+			opts: []Option{
+				WithTLSClientConfig("", "", ca),
+			},
+		},
+		{
+			name: "default client without options",
+			opts: []Option{},
+		},
+		{
+			name: "invalid cert file",
+			opts: []Option{
+				WithTLSClientConfig("/non/existent/cert.pem", priv, ca),
+			},
+			expectError:   true,
+			errorContains: "can't create TLS config",
+		},
+		{
+			name: "invalid key file",
+			opts: []Option{
+				WithTLSClientConfig(pub, "/non/existent/key.pem", ca),
+			},
+			expectError:   true,
+			errorContains: "can't create TLS config",
+		},
+		{
+			name: "invalid CA file",
+			opts: []Option{
+				WithTLSClientConfig("", "", "/non/existent/ca.crt"),
+			},
+			expectError:   true,
+			errorContains: "can't create TLS config",
+		},
+		{
+			name: "combined TLS options",
+			opts: []Option{
+				WithTLSClientConfig(pub, priv, ca),
+				WithInsecureSkipTLSVerify(true),
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			pusher, err := NewOCIPusher(tt.opts...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			op, ok := pusher.(*OCIPusher)
+			if !ok {
+				t.Fatal("Expected *OCIPusher")
+			}
+
+			client, err := op.newRegistryClient()
+			if tt.expectError {
+				if err == nil {
+					t.Fatal("Expected error but got none")
+				}
+				if tt.errorContains != "" && !strings.Contains(err.Error(), tt.errorContains) {
+					t.Errorf("Expected error containing %q, got %q", tt.errorContains, err.Error())
+				}
+			} else {
+				if err != nil {
+					t.Fatalf("Unexpected error: %v", err)
+				}
+				if client == nil {
+					t.Fatal("Expected non-nil registry client")
+				}
+			}
+		})
+	}
+}
+
+func TestOCIPusher_Push_ChartOperations(t *testing.T) {
+	// Path to test charts
+	chartPath := "../../pkg/cmd/testdata/testcharts/compressedchart-0.1.0.tgz"
+	chartWithProvPath := "../../pkg/cmd/testdata/testcharts/signtest-0.1.0.tgz"
+
+	tests := []struct {
+		name          string
+		chartRef      string
+		href          string
+		options       []Option
+		setupFunc     func(t *testing.T) (string, func())
+		expectError   bool
+		errorContains string
+	}{
+		{
+			name:          "invalid chart file",
+			chartRef:      "../../pkg/action/testdata/charts/corrupted-compressed-chart.tgz",
+			href:          "oci://localhost:5000/test",
+			expectError:   true,
+			errorContains: "does not appear to be a gzipped archive",
+		},
+		{
+			name: "chart read error",
+			setupFunc: func(t *testing.T) (string, func()) {
+				t.Helper()
+				// Create a valid chart file that we'll make unreadable
+				tempDir := t.TempDir()
+				tempChart := filepath.Join(tempDir, "temp-chart.tgz")
+
+				// Copy a valid chart
+				src, err := os.Open(chartPath)
+				if err != nil {
+					t.Fatal(err)
+				}
+				defer src.Close()
+
+				dst, err := os.Create(tempChart)
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				if _, err := io.Copy(dst, src); err != nil {
+					t.Fatal(err)
+				}
+				dst.Close()
+
+				// Make the file unreadable
+				if err := os.Chmod(tempChart, 0000); err != nil {
+					t.Fatal(err)
+				}
+
+				return tempChart, func() {
+					os.Chmod(tempChart, 0644) // Restore permissions for cleanup
+				}
+			},
+			href:          "oci://localhost:5000/test",
+			expectError:   true,
+			errorContains: "permission denied",
+		},
+		{
+			name:     "push with provenance file - loading phase",
+			chartRef: chartWithProvPath,
+			href:     "oci://registry.example.com/charts",
+			setupFunc: func(t *testing.T) (string, func()) {
+				t.Helper()
+				// Copy chart and create a .prov file for it
+				tempDir := t.TempDir()
+				tempChart := filepath.Join(tempDir, "signtest-0.1.0.tgz")
+				tempProv := filepath.Join(tempDir, "signtest-0.1.0.tgz.prov")
+
+				// Copy chart file
+				src, err := os.Open(chartWithProvPath)
+				if err != nil {
+					t.Fatal(err)
+				}
+				defer src.Close()
+
+				dst, err := os.Create(tempChart)
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				if _, err := io.Copy(dst, src); err != nil {
+					t.Fatal(err)
+				}
+				dst.Close()
+
+				// Create provenance file
+				if err := os.WriteFile(tempProv, []byte("test provenance data"), 0644); err != nil {
+					t.Fatal(err)
+				}
+
+				return tempChart, func() {}
+			},
+			expectError:   true, // Will fail at the registry push step
+			errorContains: "",   // Error depends on registry client behavior
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			chartRef := tt.chartRef
+			var cleanup func()
+
+			if tt.setupFunc != nil {
+				chartRef, cleanup = tt.setupFunc(t)
+				if cleanup != nil {
+					defer cleanup()
+				}
+			}
+
+			// Skip test if chart file doesn't exist and we're not expecting an error
+			if _, err := os.Stat(chartRef); err != nil && !tt.expectError {
+				t.Skipf("Test chart %s not found, skipping test", chartRef)
+			}
+
+			pusher, err := NewOCIPusher(tt.options...)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			err = pusher.Push(chartRef, tt.href)
+
+			if tt.expectError {
+				if err == nil {
+					t.Fatal("Expected error but got none")
+				}
+				if tt.errorContains != "" && !strings.Contains(err.Error(), tt.errorContains) {
+					t.Errorf("Expected error containing %q, got %q", tt.errorContains, err.Error())
+				}
+			} else {
+				if err != nil {
+					t.Fatalf("Unexpected error: %v", err)
+				}
+			}
+		})
+	}
+}
+
+func TestOCIPusher_Push_MultipleOptions(t *testing.T) {
+	chartPath := "../../pkg/cmd/testdata/testcharts/compressedchart-0.1.0.tgz"
+
+	// Skip test if chart file doesn't exist
+	if _, err := os.Stat(chartPath); err != nil {
+		t.Skipf("Test chart %s not found, skipping test", chartPath)
+	}
+
+	pusher, err := NewOCIPusher()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Test that multiple options are applied correctly
+	err = pusher.Push(chartPath, "oci://localhost:5000/test",
+		WithPlainHTTP(true),
+		WithInsecureSkipTLSVerify(true),
+	)
+
+	// We expect an error since we're not actually pushing to a registry
+	if err == nil {
+		t.Fatal("Expected error when pushing without a valid registry")
+	}
+
+	// Verify options were applied
+	op := pusher.(*OCIPusher)
+	if !op.opts.plainHTTP {
+		t.Error("Expected plainHTTP option to be applied")
+	}
+	if !op.opts.insecureSkipTLSverify {
+		t.Error("Expected insecureSkipTLSverify option to be applied")
+	}
+}

From 21b9aa3d942bc96df9be7cd8996b5730c49b0ccb Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Thu, 26 Jun 2025 14:07:54 -0700
Subject: [PATCH 027/211] Lint the `crds/` directory.

This checks that the `crds/` dir only contains YAML files that define
K8s resources with `kind: CustomResourceDefinition`.

Checking that the YAML files are not templates will be done in a
separate commit.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/lint.go                              |  1 +
 pkg/lint/lint_test.go                         | 11 +++
 pkg/lint/rules/crds.go                        | 96 +++++++++++++++++++
 pkg/lint/rules/crds_test.go                   | 51 ++++++++++
 pkg/lint/rules/testdata/badcrdfile/Chart.yaml |  6 ++
 .../testdata/badcrdfile/crds/bad-crd.yaml     |  2 +
 .../rules/testdata/badcrdfile/values.yaml     |  1 +
 .../rules/testdata/invalidcrdsdir/Chart.yaml  |  6 ++
 pkg/lint/rules/testdata/invalidcrdsdir/crds   |  0
 .../rules/testdata/invalidcrdsdir/values.yaml |  1 +
 pkg/lint/rules/testdata/withcrd/Chart.yaml    |  5 +
 .../rules/testdata/withcrd/crds/test-crd.yaml | 19 ++++
 12 files changed, 199 insertions(+)
 create mode 100644 pkg/lint/rules/crds.go
 create mode 100644 pkg/lint/rules/crds_test.go
 create mode 100644 pkg/lint/rules/testdata/badcrdfile/Chart.yaml
 create mode 100644 pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
 create mode 100644 pkg/lint/rules/testdata/badcrdfile/values.yaml
 create mode 100644 pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml
 create mode 100644 pkg/lint/rules/testdata/invalidcrdsdir/crds
 create mode 100644 pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
 create mode 100644 pkg/lint/rules/testdata/withcrd/Chart.yaml
 create mode 100644 pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml

diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go
index a61d5e43f..64b2a6057 100644
--- a/pkg/lint/lint.go
+++ b/pkg/lint/lint.go
@@ -60,6 +60,7 @@ func RunAll(baseDir string, values map[string]interface{}, namespace string, opt
 	rules.ValuesWithOverrides(&result, values)
 	rules.TemplatesWithSkipSchemaValidation(&result, values, namespace, lo.KubeVersion, lo.SkipSchemaValidation)
 	rules.Dependencies(&result)
+	rules.Crds(&result)
 
 	return result
 }
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 888d3dfe6..45e24f533 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -32,6 +32,7 @@ const namespace = "testNamespace"
 const badChartDir = "rules/testdata/badchartfile"
 const badValuesFileDir = "rules/testdata/badvaluesfile"
 const badYamlFileDir = "rules/testdata/albatross"
+const badCrdFileDir = "rules/testdata/badcrdfile"
 const goodChartDir = "rules/testdata/goodone"
 const subChartValuesDir = "rules/testdata/withsubchart"
 const malformedTemplate = "rules/testdata/malformed-template"
@@ -111,6 +112,16 @@ func TestBadValues(t *testing.T) {
 	}
 }
 
+func TestBadCrdFile(t *testing.T) {
+	m := RunAll(badCrdFileDir, values, namespace).Messages
+	if len(m) < 1 {
+		t.Fatalf("All didn't fail with expected errors, got %#v", m)
+	}
+	if !strings.Contains(m[0].Err.Error(), "object kind is not 'CustomResourceDefinition'") {
+		t.Errorf("All didn't have the error for invalid CRD: %s", m[0].Err)
+	}
+}
+
 func TestGoodChart(t *testing.T) {
 	m := RunAll(goodChartDir, values, namespace).Messages
 	if len(m) != 0 {
diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
new file mode 100644
index 000000000..bba06ddc3
--- /dev/null
+++ b/pkg/lint/rules/crds.go
@@ -0,0 +1,96 @@
+/*
+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 rules
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
+	"k8s.io/apimachinery/pkg/util/yaml"
+
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	"helm.sh/helm/v4/pkg/lint/support"
+)
+
+// Crds lints the CRDs in the Linter.
+func Crds(linter *support.Linter) {
+	fpath := "crds/"
+	crdsPath := filepath.Join(linter.ChartDir, fpath)
+
+	crdsDirExist := linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
+
+	// crds directory is optional
+	if !crdsDirExist {
+		return
+	}
+
+	// Load chart and parse CRDs
+	chart, err := loader.Load(linter.ChartDir)
+
+	chartLoaded := linter.RunLinterRule(support.ErrorSev, fpath, err)
+
+	if !chartLoaded {
+		return
+	}
+
+	/* Iterate over all the CRDs to check:
+	- It is a YAML file
+	- The kind is CustomResourceDefinition
+	*/
+	for _, crd := range chart.CRDObjects() {
+		fileName := crd.Name
+		fpath = fileName
+
+		decoder := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(crd.File.Data), 4096)
+		for {
+			var yamlStruct *K8sYamlStruct
+
+			err := decoder.Decode(&yamlStruct)
+			if err == io.EOF {
+				break
+			}
+
+			// If YAML linting fails here, it will always fail in the next block as well, so we should return here.
+			if !linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err)) {
+				return
+			}
+
+			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdKind(yamlStruct))
+		}
+	}
+}
+
+// Validation functions
+func validateCrdsDir(crdsPath string) error {
+	if fi, err := os.Stat(crdsPath); err == nil {
+		if !fi.IsDir() {
+			return errors.New("not a directory")
+		}
+	}
+	return nil
+}
+
+func validateCrdKind(obj *K8sYamlStruct) error {
+	if obj.Kind != "CustomResourceDefinition" {
+		return fmt.Errorf("object kind is not 'CustomResourceDefinition'")
+	}
+	return nil
+}
diff --git a/pkg/lint/rules/crds_test.go b/pkg/lint/rules/crds_test.go
new file mode 100644
index 000000000..52432a130
--- /dev/null
+++ b/pkg/lint/rules/crds_test.go
@@ -0,0 +1,51 @@
+/*
+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 rules
+
+import (
+	"strings"
+	"testing"
+
+	"helm.sh/helm/v4/pkg/lint/support"
+)
+
+const crdsTestBasedir = "./testdata/withcrd"
+const invalidCrdsDir = "./testdata/invalidcrdsdir"
+
+func TestCrdsDir(t *testing.T) {
+	linter := support.Linter{ChartDir: crdsTestBasedir}
+	Crds(&linter)
+	res := linter.Messages
+
+	if len(res) > 0 {
+		t.Fatalf("Expected no errors, got %d, %v", len(res), res)
+	}
+}
+
+func TestInvalidCrdsDir(t *testing.T) {
+	linter := support.Linter{ChartDir: invalidCrdsDir}
+	Crds(&linter)
+	res := linter.Messages
+
+	if len(res) != 1 {
+		t.Fatalf("Expected one error, got %d, %v", len(res), res)
+	}
+
+	if !strings.Contains(res[0].Err.Error(), "not a directory") {
+		t.Errorf("Unexpected error: %s", res[0])
+	}
+}
diff --git a/pkg/lint/rules/testdata/badcrdfile/Chart.yaml b/pkg/lint/rules/testdata/badcrdfile/Chart.yaml
new file mode 100644
index 000000000..08c4b61ac
--- /dev/null
+++ b/pkg/lint/rules/testdata/badcrdfile/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+description: A Helm chart for Kubernetes
+version: 0.1.0
+name: badcrdfile
+type: application
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml b/pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
new file mode 100644
index 000000000..523b97f85
--- /dev/null
+++ b/pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
@@ -0,0 +1,2 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: NotACustomResourceDefinition
diff --git a/pkg/lint/rules/testdata/badcrdfile/values.yaml b/pkg/lint/rules/testdata/badcrdfile/values.yaml
new file mode 100644
index 000000000..2fffc7715
--- /dev/null
+++ b/pkg/lint/rules/testdata/badcrdfile/values.yaml
@@ -0,0 +1 @@
+# Default values for badcrdfile.
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml b/pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml
new file mode 100644
index 000000000..18e30f70f
--- /dev/null
+++ b/pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+description: A Helm chart for Kubernetes
+version: 0.1.0
+name: invalidcrdsdir
+type: application
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/crds b/pkg/lint/rules/testdata/invalidcrdsdir/crds
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml b/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
new file mode 100644
index 000000000..2fffc7715
--- /dev/null
+++ b/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
@@ -0,0 +1 @@
+# Default values for badcrdfile.
diff --git a/pkg/lint/rules/testdata/withcrd/Chart.yaml b/pkg/lint/rules/testdata/withcrd/Chart.yaml
new file mode 100644
index 000000000..58e3a0c27
--- /dev/null
+++ b/pkg/lint/rules/testdata/withcrd/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+name: withcrd
+description: testing chart with a CRD
+version: 199.44.12345-Alpha.1+cafe009
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml b/pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml
new file mode 100644
index 000000000..1d7350f1d
--- /dev/null
+++ b/pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml
@@ -0,0 +1,19 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: tests.test.io
+spec:
+  group: test.io
+  names:
+    kind: Test
+    listKind: TestList
+    plural: tests
+    singular: test
+  scope: Namespaced
+  versions:
+    - name : v1alpha2
+      served: true
+      storage: true
+    - name : v1alpha1
+      served: true
+      storage: false

From bc35ea5ad749653e744ab50d32fa5bbc98be0187 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Fri, 27 Jun 2025 11:13:34 -0700
Subject: [PATCH 028/211] Fix comment in
 pkg/lint/rules/testdata/invalidcrdsdir/values.yaml

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/testdata/invalidcrdsdir/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml b/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
index 2fffc7715..6b1611a64 100644
--- a/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
+++ b/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
@@ -1 +1 @@
-# Default values for badcrdfile.
+# Default values for invalidcrdsdir.

From e4c88faeff8b3b5752a49dbb1e3bd54306462d55 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Fri, 27 Jun 2025 11:54:39 -0700
Subject: [PATCH 029/211] Update test assertions

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 .../output/lint-chart-with-bad-subcharts-with-subcharts.txt     | 2 ++
 pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt       | 1 +
 pkg/cmd/testdata/output/lint-quiet-with-error.txt               | 1 +
 pkg/lint/lint_test.go                                           | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
index 6e2efcecd..2432563f5 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
@@ -3,6 +3,7 @@
 [ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
+[ERROR] crds/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
 ==> Linting testdata/testcharts/chart-with-bad-subcharts/charts/bad-subchart
 [ERROR] Chart.yaml: name is required
@@ -12,6 +13,7 @@
 [ERROR] templates/: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	validation: chart.metadata.name is required
+[ERROR] crds/: validation: chart.metadata.name is required
 
 ==> Linting testdata/testcharts/chart-with-bad-subcharts/charts/good-subchart
 [INFO] Chart.yaml: icon is recommended
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
index af533797b..c514a100a 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
@@ -3,5 +3,6 @@
 [ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
+[ERROR] crds/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
 Error: 1 chart(s) linted, 1 chart(s) failed
diff --git a/pkg/cmd/testdata/output/lint-quiet-with-error.txt b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
index e3d29a5a3..f8ae55eb3 100644
--- a/pkg/cmd/testdata/output/lint-quiet-with-error.txt
+++ b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
@@ -4,5 +4,6 @@
 [ERROR] templates/: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 [ERROR] : unable to load chart
 	cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
+[ERROR] crds/: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 
 Error: 2 chart(s) linted, 1 chart(s) failed
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 45e24f533..6c380409c 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -40,7 +40,7 @@ const invalidChartFileDir = "rules/testdata/invalidchartfile"
 
 func TestBadChart(t *testing.T) {
 	m := RunAll(badChartDir, values, namespace).Messages
-	if len(m) != 8 {
+	if len(m) != 9 {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}

From d6ddd8e6618e132fc43eaa56c0c26b903b6c9693 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Fri, 27 Jun 2025 14:49:49 -0700
Subject: [PATCH 030/211] Document that attempting to parse YAML checks that
 the CRD is not a template

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index bba06ddc3..c978bfc53 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -52,7 +52,7 @@ func Crds(linter *support.Linter) {
 	}
 
 	/* Iterate over all the CRDs to check:
-	- It is a YAML file
+	- It is a YAML file and not a template
 	- The kind is CustomResourceDefinition
 	*/
 	for _, crd := range chart.CRDObjects() {
@@ -68,7 +68,8 @@ func Crds(linter *support.Linter) {
 				break
 			}
 
-			// If YAML linting fails here, it will always fail in the next block as well, so we should return here.
+			// If YAML parsing fails here, it will always fail in the next block as well, so we should return here.
+			// This also confirms the YAML is not a template, since templates can't be decoded into a K8sYamlStruct.
 			if !linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err)) {
 				return
 			}

From 562ff982cb37aada7b98a755c8c37563c1e45577 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Tue, 1 Jul 2025 13:52:15 -0700
Subject: [PATCH 031/211] Early return if the `/crds` directory does not exist
 and don't silently discard the error from `os.Stat`.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/lint_test.go       |  2 +-
 pkg/lint/rules/crds.go      | 17 ++++++++++-------
 pkg/lint/rules/crds_test.go |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 6c380409c..45e24f533 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -40,7 +40,7 @@ const invalidChartFileDir = "rules/testdata/invalidchartfile"
 
 func TestBadChart(t *testing.T) {
 	m := RunAll(badChartDir, values, namespace).Messages
-	if len(m) != 9 {
+	if len(m) != 8 {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index c978bfc53..4740157b3 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 
@@ -35,13 +36,13 @@ func Crds(linter *support.Linter) {
 	fpath := "crds/"
 	crdsPath := filepath.Join(linter.ChartDir, fpath)
 
-	crdsDirExist := linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
-
 	// crds directory is optional
-	if !crdsDirExist {
+	if _, err := os.Stat(crdsPath); errors.Is(err, fs.ErrNotExist) {
 		return
 	}
 
+	linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
+
 	// Load chart and parse CRDs
 	chart, err := loader.Load(linter.ChartDir)
 
@@ -81,10 +82,12 @@ func Crds(linter *support.Linter) {
 
 // Validation functions
 func validateCrdsDir(crdsPath string) error {
-	if fi, err := os.Stat(crdsPath); err == nil {
-		if !fi.IsDir() {
-			return errors.New("not a directory")
-		}
+	fi, err := os.Stat(crdsPath)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New("not a directory")
 	}
 	return nil
 }
diff --git a/pkg/lint/rules/crds_test.go b/pkg/lint/rules/crds_test.go
index 52432a130..a84b62a50 100644
--- a/pkg/lint/rules/crds_test.go
+++ b/pkg/lint/rules/crds_test.go
@@ -23,11 +23,11 @@ import (
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
-const crdsTestBasedir = "./testdata/withcrd"
+const crdsTestBaseDir = "./testdata/withcrd"
 const invalidCrdsDir = "./testdata/invalidcrdsdir"
 
 func TestCrdsDir(t *testing.T) {
-	linter := support.Linter{ChartDir: crdsTestBasedir}
+	linter := support.Linter{ChartDir: crdsTestBaseDir}
 	Crds(&linter)
 	res := linter.Messages
 

From a99c3700f0484c3fabca2f191ebe23db9d32d67c Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Tue, 1 Jul 2025 13:52:15 -0700
Subject: [PATCH 032/211] Return early if the `/crds` directory does not exist.

Don't silently discard the error from `os.Stat`.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 .../output/lint-chart-with-bad-subcharts-with-subcharts.txt     | 2 --
 pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt       | 1 -
 pkg/cmd/testdata/output/lint-quiet-with-error.txt               | 1 -
 3 files changed, 4 deletions(-)

diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
index 2432563f5..6e2efcecd 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
@@ -3,7 +3,6 @@
 [ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
-[ERROR] crds/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
 ==> Linting testdata/testcharts/chart-with-bad-subcharts/charts/bad-subchart
 [ERROR] Chart.yaml: name is required
@@ -13,7 +12,6 @@
 [ERROR] templates/: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	validation: chart.metadata.name is required
-[ERROR] crds/: validation: chart.metadata.name is required
 
 ==> Linting testdata/testcharts/chart-with-bad-subcharts/charts/good-subchart
 [INFO] Chart.yaml: icon is recommended
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
index c514a100a..af533797b 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
@@ -3,6 +3,5 @@
 [ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
-[ERROR] crds/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
 Error: 1 chart(s) linted, 1 chart(s) failed
diff --git a/pkg/cmd/testdata/output/lint-quiet-with-error.txt b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
index f8ae55eb3..e3d29a5a3 100644
--- a/pkg/cmd/testdata/output/lint-quiet-with-error.txt
+++ b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
@@ -4,6 +4,5 @@
 [ERROR] templates/: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 [ERROR] : unable to load chart
 	cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
-[ERROR] crds/: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 
 Error: 2 chart(s) linted, 1 chart(s) failed

From b703d5b4bb109c6ec679fc3327021eb7b90c3bc1 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Tue, 1 Jul 2025 14:29:29 -0700
Subject: [PATCH 033/211] Return early when linting if the `templates/` dir
 does not exist

The `vaildateTemplatesDir` function would still return `nil` if the directory doesn't exist,
so the early return that was documented never occurs.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 ...t-chart-with-bad-subcharts-with-subcharts.txt |  2 --
 .../output/lint-chart-with-bad-subcharts.txt     |  1 -
 .../testdata/output/lint-quiet-with-error.txt    |  1 -
 pkg/lint/lint_test.go                            |  2 +-
 pkg/lint/rules/template.go                       | 16 +++++++++-------
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
index 6e2efcecd..2a84d8739 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
@@ -1,6 +1,5 @@
 ==> Linting testdata/testcharts/chart-with-bad-subcharts
 [INFO] Chart.yaml: icon is recommended
-[ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
@@ -9,7 +8,6 @@
 [ERROR] Chart.yaml: apiVersion is required. The value must be either "v1" or "v2"
 [ERROR] Chart.yaml: version is required
 [INFO] Chart.yaml: icon is recommended
-[ERROR] templates/: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	validation: chart.metadata.name is required
 
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
index af533797b..0cba1c52b 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
@@ -1,6 +1,5 @@
 ==> Linting testdata/testcharts/chart-with-bad-subcharts
 [INFO] Chart.yaml: icon is recommended
-[ERROR] templates/: error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
diff --git a/pkg/cmd/testdata/output/lint-quiet-with-error.txt b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
index e3d29a5a3..2711d9397 100644
--- a/pkg/cmd/testdata/output/lint-quiet-with-error.txt
+++ b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
@@ -1,7 +1,6 @@
 ==> Linting testdata/testcharts/chart-bad-requirements
 [ERROR] Chart.yaml: unable to parse YAML
 	error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
-[ERROR] templates/: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 [ERROR] : unable to load chart
 	cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 
diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 888d3dfe6..6e7f40ef6 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -39,7 +39,7 @@ const invalidChartFileDir = "rules/testdata/invalidchartfile"
 
 func TestBadChart(t *testing.T) {
 	m := RunAll(badChartDir, values, namespace).Messages
-	if len(m) != 8 {
+	if len(m) != 7 {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 72b81f191..55bc0ec89 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -54,13 +54,13 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 	fpath := "templates/"
 	templatesPath := filepath.Join(linter.ChartDir, fpath)
 
-	templatesDirExist := linter.RunLinterRule(support.WarningSev, fpath, validateTemplatesDir(templatesPath))
-
 	// Templates directory is optional for now
-	if !templatesDirExist {
+	if _, err := os.Stat(templatesPath); errors.Is(err, os.ErrNotExist) {
 		return
 	}
 
+	linter.RunLinterRule(support.WarningSev, fpath, validateTemplatesDir(templatesPath))
+
 	// Load chart and parse templates
 	chart, err := loader.Load(linter.ChartDir)
 
@@ -195,10 +195,12 @@ func validateTopIndentLevel(content string) error {
 
 // Validation functions
 func validateTemplatesDir(templatesPath string) error {
-	if fi, err := os.Stat(templatesPath); err == nil {
-		if !fi.IsDir() {
-			return errors.New("not a directory")
-		}
+	fi, err := os.Stat(templatesPath)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New("not a directory")
 	}
 	return nil
 }

From 3b26ddc22ba4c99292dba724170b2e30a94aebef Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Tue, 1 Jul 2025 15:29:19 -0700
Subject: [PATCH 034/211] Update tests in create_test.go and package_test.go to
 work in a temp dir.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/cmd/create_test.go  | 8 +++-----
 pkg/cmd/package_test.go | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg/cmd/create_test.go b/pkg/cmd/create_test.go
index 103cd3bc0..2a4ca95ca 100644
--- a/pkg/cmd/create_test.go
+++ b/pkg/cmd/create_test.go
@@ -30,10 +30,9 @@ import (
 )
 
 func TestCreateCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	ensure.HelmHome(t)
 	cname := "testchart"
-	dir := t.TempDir()
-	defer t.Chdir(dir)
 
 	// Run a create
 	if _, _, err := executeActionCommand("create " + cname); err != nil {
@@ -64,9 +63,7 @@ func TestCreateStarterCmd(t *testing.T) {
 	ensure.HelmHome(t)
 	cname := "testchart"
 	defer resetEnv()()
-	os.MkdirAll(helmpath.CachePath(), 0o755)
-	defer t.Chdir(helmpath.CachePath())
-
+	t.Chdir(t.TempDir())
 	// Create a starter.
 	starterchart := helmpath.DataPath("starters")
 	os.MkdirAll(starterchart, 0o755)
@@ -125,6 +122,7 @@ func TestCreateStarterCmd(t *testing.T) {
 }
 
 func TestCreateStarterAbsoluteCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	defer resetEnv()()
 	ensure.HelmHome(t)
 	cname := "testchart"
diff --git a/pkg/cmd/package_test.go b/pkg/cmd/package_test.go
index b17684aa6..349cb662f 100644
--- a/pkg/cmd/package_test.go
+++ b/pkg/cmd/package_test.go
@@ -110,8 +110,7 @@ func TestPackage(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cachePath := t.TempDir()
-			defer t.Chdir(cachePath)
+			t.Chdir(t.TempDir())
 
 			if err := os.MkdirAll("toot", 0o777); err != nil {
 				t.Fatal(err)

From e6362d74c815ad6d1c8ccc1c617aa4246a4b5b05 Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Thu, 29 May 2025 04:39:57 +0800
Subject: [PATCH 035/211] Allow post-renderer to process hooks

This annotates and merges all manifests before sending to the
postrender, reversing the process and recovering the filenames
afterwards.

closes #7891

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 go.mod                    |   2 +-
 pkg/action/action.go      | 105 ++++++-
 pkg/action/action_test.go | 578 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 677 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 106c499b2..1d98d916e 100644
--- a/go.mod
+++ b/go.mod
@@ -45,6 +45,7 @@ require (
 	k8s.io/kubectl v0.33.2
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
+	sigs.k8s.io/kustomize/kyaml v0.19.0
 	sigs.k8s.io/yaml v1.5.0
 )
 
@@ -175,7 +176,6 @@ require (
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/kustomize/api v0.19.0 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 )
diff --git a/pkg/action/action.go b/pkg/action/action.go
index 40194dfd7..9c99a6cfa 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -34,6 +34,8 @@ import (
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"sigs.k8s.io/kustomize/kyaml/kio"
+	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
@@ -91,6 +93,76 @@ type Configuration struct {
 	mutex sync.Mutex
 }
 
+const (
+	// FilenameAnnotation is the annotation key used to store the original filename
+	// information in manifest annotations for post-rendering reconstruction.
+	FilenameAnnotation = "helm-postrender-filename"
+)
+
+// AnnotateAndMerge combines multiple YAML files into a single stream of documents,
+// adding filename annotations to each document for later reconstruction.
+func AnnotateAndMerge(files map[string]string) (string, error) {
+	var combinedManifests []*kyaml.RNode
+	for fname, content := range files {
+		// Skip partials and empty files.
+		if strings.HasPrefix(path.Base(fname), "_") || strings.TrimSpace(content) == "" {
+			continue
+		}
+
+		manifests, err := kio.ParseAll(content)
+		if err != nil {
+			return "", fmt.Errorf("parsing %s: %w", fname, err)
+		}
+		for _, manifest := range manifests {
+			if err := manifest.PipeE(kyaml.SetAnnotation(FilenameAnnotation, fname)); err != nil {
+				return "", fmt.Errorf("annotating %s: %w", fname, err)
+			}
+			combinedManifests = append(combinedManifests, manifest)
+		}
+	}
+
+	merged, err := kio.StringAll(combinedManifests)
+	if err != nil {
+		return "", fmt.Errorf("writing merged docs: %w", err)
+	}
+	return merged, nil
+}
+
+// SplitAndDeannotate reconstructs individual files from a merged YAML stream,
+// removing filename annotations and grouping documents by their original filenames.
+func SplitAndDeannotate(postrendered string) (map[string]string, error) {
+	manifests, err := kio.ParseAll(postrendered)
+	if err != nil {
+		return nil, fmt.Errorf("re-parsing merged buffer: %w", err)
+	}
+
+	manifestsByFilename := make(map[string][]*kyaml.RNode)
+	for i, manifest := range manifests {
+		meta, err := manifest.GetMeta()
+		if err != nil {
+			return nil, fmt.Errorf("getting metadata: %w", err)
+		}
+		fname := meta.Annotations[FilenameAnnotation]
+		if fname == "" {
+			fname = fmt.Sprintf("generated-by-postrender-%d.yaml", i)
+		}
+		if err := manifest.PipeE(kyaml.ClearAnnotation(FilenameAnnotation)); err != nil {
+			return nil, fmt.Errorf("clearing filename annotation: %w", err)
+		}
+		manifestsByFilename[fname] = append(manifestsByFilename[fname], manifest)
+	}
+
+	reconstructed := make(map[string]string, len(manifestsByFilename))
+	for fname, docs := range manifestsByFilename {
+		fileContents, err := kio.StringAll(docs)
+		if err != nil {
+			return nil, fmt.Errorf("re-writing %s: %w", fname, err)
+		}
+		reconstructed[fname] = fileContents
+	}
+	return reconstructed, nil
+}
+
 // renderResources renders the templates in a chart
 //
 // TODO: This function is badly in need of a refactor.
@@ -160,6 +232,32 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 	}
 	notes := notesBuffer.String()
 
+	if pr != nil {
+		// We need to send files to the post-renderer before sorting and splitting
+		// hooks from manifests. The post-renderer interface expects a stream of
+		// manifests (similar to what tools like Kustomize and kubectl expect), whereas
+		// the sorter uses filenames.
+		// Here, we merge the documents into a stream, post-render them, and then split
+		// them back into a map of filename -> content.
+
+		// Merge files as stream of documents for sending to post renderer
+		var merged string
+		if merged, err = AnnotateAndMerge(files); err != nil {
+			return hs, b, notes, fmt.Errorf("error merging manifests: %w", err)
+		}
+
+		// Run the post renderer
+		postRendered, err := pr.Run(bytes.NewBufferString(merged))
+		if err != nil {
+			return hs, b, notes, fmt.Errorf("error while running post render on files: %w", err)
+		}
+
+		// Use the file list and contents received from the post renderer
+		if files, err = SplitAndDeannotate(postRendered.String()); err != nil {
+			return hs, b, notes, fmt.Errorf("error while parsing post rendered files: %w", err)
+		}
+	}
+
 	// Sort hooks, manifests, and partials. Only hooks and manifests are returned,
 	// as partials are not used after renderer.Render. Empty manifests are also
 	// removed here.
@@ -220,13 +318,6 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 		}
 	}
 
-	if pr != nil {
-		b, err = pr.Run(b)
-		if err != nil {
-			return hs, b, notes, fmt.Errorf("error while running post render on files: %w", err)
-		}
-	}
-
 	return hs, b, notes, nil
 }
 
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 9436abef5..aaa5b4c16 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -16,13 +16,17 @@ limitations under the License.
 package action
 
 import (
+	"bytes"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
 	"log/slog"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 
 	"helm.sh/helm/v4/internal/logging"
@@ -368,3 +372,577 @@ func TestGetVersionSet(t *testing.T) {
 		t.Error("Non-existent version is reported found.")
 	}
 }
+
+// Mock PostRenderer for testing
+type mockPostRenderer struct {
+	shouldError bool
+	transform   func(string) string
+}
+
+func (m *mockPostRenderer) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, error) {
+	if m.shouldError {
+		return nil, errors.New("mock post-renderer error")
+	}
+
+	content := renderedManifests.String()
+	if m.transform != nil {
+		content = m.transform(content)
+	}
+
+	return bytes.NewBufferString(content), nil
+}
+
+func TestAnnotateAndMerge(t *testing.T) {
+	tests := []struct {
+		name          string
+		files         map[string]string
+		expectedError string
+		expected      string
+	}{
+		{
+			name:     "no files",
+			files:    map[string]string{},
+			expected: "",
+		},
+		{
+			name: "single file with single manifest",
+			files: map[string]string{
+				"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value`,
+			},
+			expected: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    helm-postrender-filename: 'templates/configmap.yaml'
+data:
+  key: value
+`,
+		},
+		{
+			name: "multiple files with multiple manifests",
+			files: map[string]string{
+				"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value`,
+				"templates/secret.yaml": `apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret
+data:
+  password: dGVzdA==`,
+			},
+			expected: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    helm-postrender-filename: 'templates/configmap.yaml'
+data:
+  key: value
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret
+  annotations:
+    helm-postrender-filename: 'templates/secret.yaml'
+data:
+  password: dGVzdA==
+`,
+		},
+		{
+			name: "file with multiple manifests",
+			files: map[string]string{
+				"templates/multi.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+data:
+  key: value1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm2
+data:
+  key: value2`,
+			},
+			expected: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+  annotations:
+    helm-postrender-filename: 'templates/multi.yaml'
+data:
+  key: value1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm2
+  annotations:
+    helm-postrender-filename: 'templates/multi.yaml'
+data:
+  key: value2
+`,
+		},
+		{
+			name: "partials and empty files are removed",
+			files: map[string]string{
+				"templates/cm.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+`,
+				"templates/_partial.tpl": `
+{{-define name}}
+  {{- "abracadabra"}}
+{{- end -}}`,
+				"templates/empty.yaml": ``,
+			},
+			expected: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+  annotations:
+    helm-postrender-filename: 'templates/cm.yaml'
+`,
+		},
+		{
+			name: "empty file",
+			files: map[string]string{
+				"templates/empty.yaml": "",
+			},
+			expected: ``,
+		},
+		{
+			name: "invalid yaml",
+			files: map[string]string{
+				"templates/invalid.yaml": `invalid: yaml: content:
+  - malformed`,
+			},
+			expectedError: "parsing templates/invalid.yaml",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			merged, err := AnnotateAndMerge(tt.files)
+
+			if tt.expectedError != "" {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.expectedError)
+			} else {
+				assert.NoError(t, err)
+				assert.NotNil(t, merged)
+				assert.Equal(t, tt.expected, merged)
+			}
+		})
+	}
+}
+
+func TestSplitAndDeannotate(t *testing.T) {
+	tests := []struct {
+		name          string
+		input         string
+		expectedFiles map[string]string
+		expectedError string
+	}{
+		{
+			name: "single annotated manifest",
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    helm-postrender-filename: templates/configmap.yaml
+data:
+  key: value`,
+			expectedFiles: map[string]string{
+				"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value
+`,
+			},
+		},
+		{
+			name: "multiple manifests with different filenames",
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    helm-postrender-filename: templates/configmap.yaml
+data:
+  key: value
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret
+  annotations:
+    helm-postrender-filename: templates/secret.yaml
+data:
+  password: dGVzdA==`,
+			expectedFiles: map[string]string{
+				"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value
+`,
+				"templates/secret.yaml": `apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret
+data:
+  password: dGVzdA==
+`,
+			},
+		},
+		{
+			name: "multiple manifests with same filename",
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+  annotations:
+    helm-postrender-filename: templates/multi.yaml
+data:
+  key: value1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm2
+  annotations:
+    helm-postrender-filename: templates/multi.yaml
+data:
+  key: value2`,
+			expectedFiles: map[string]string{
+				"templates/multi.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+data:
+  key: value1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm2
+data:
+  key: value2
+`,
+			},
+		},
+		{
+			name: "manifest with other annotations",
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    helm-postrender-filename: templates/configmap.yaml
+    other-annotation: should-remain
+data:
+  key: value`,
+			expectedFiles: map[string]string{
+				"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+  annotations:
+    other-annotation: should-remain
+data:
+  key: value
+`,
+			},
+		},
+		{
+			name:          "invalid yaml input",
+			input:         "invalid: yaml: content:",
+			expectedError: "re-parsing merged buffer",
+		},
+		{
+			name: "manifest without filename annotation",
+			input: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value`,
+			expectedFiles: map[string]string{
+				"generated-by-postrender-0.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value
+`,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			files, err := SplitAndDeannotate(tt.input)
+
+			if tt.expectedError != "" {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.expectedError)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, len(tt.expectedFiles), len(files))
+
+				for expectedFile, expectedContent := range tt.expectedFiles {
+					actualContent, exists := files[expectedFile]
+					assert.True(t, exists, "Expected file %s not found", expectedFile)
+					assert.Equal(t, expectedContent, actualContent)
+				}
+			}
+		})
+	}
+}
+
+func TestAnnotateAndMerge_SplitAndDeannotate_Roundtrip(t *testing.T) {
+	// Test that merge/split operations are symmetric
+	originalFiles := map[string]string{
+		"templates/configmap.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm
+data:
+  key: value`,
+		"templates/secret.yaml": `apiVersion: v1
+kind: Secret
+metadata:
+  name: test-secret
+data:
+  password: dGVzdA==`,
+		"templates/multi.yaml": `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm1
+data:
+  key: value1
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-cm2
+data:
+  key: value2`,
+	}
+
+	// Merge and annotate
+	merged, err := AnnotateAndMerge(originalFiles)
+	require.NoError(t, err)
+
+	// Split and deannotate
+	reconstructed, err := SplitAndDeannotate(merged)
+	require.NoError(t, err)
+
+	// Compare the results
+	assert.Equal(t, len(originalFiles), len(reconstructed))
+	for filename, originalContent := range originalFiles {
+		reconstructedContent, exists := reconstructed[filename]
+		assert.True(t, exists, "File %s should exist in reconstructed files", filename)
+
+		// Normalize whitespace for comparison since YAML processing might affect formatting
+		normalizeContent := func(content string) string {
+			return strings.TrimSpace(strings.ReplaceAll(content, "\r\n", "\n"))
+		}
+
+		assert.Equal(t, normalizeContent(originalContent), normalizeContent(reconstructedContent))
+	}
+}
+
+func TestRenderResources_PostRenderer_Success(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	// Create a simple mock post-renderer
+	mockPR := &mockPostRenderer{
+		transform: func(content string) string {
+			content = strings.ReplaceAll(content, "hello", "yellow")
+			content = strings.ReplaceAll(content, "goodbye", "foodpie")
+			return strings.ReplaceAll(content, "test-cm", "test-cm-postrendered")
+		},
+	}
+
+	ch := buildChart(withSampleTemplates())
+	values := map[string]interface{}{}
+
+	hooks, buf, notes, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		mockPR, false, false, false,
+	)
+
+	assert.NoError(t, err)
+	assert.NotNil(t, hooks)
+	assert.NotNil(t, buf)
+	assert.Equal(t, "", notes)
+	expectedBuf := `---
+# Source: yellow/templates/foodpie
+foodpie: world
+---
+# Source: yellow/templates/with-partials
+yellow: Earth
+---
+# Source: yellow/templates/yellow
+yellow: world
+`
+	expectedHook := `kind: ConfigMap
+metadata:
+  name: test-cm-postrendered
+  annotations:
+    "helm.sh/hook": post-install,pre-delete,post-upgrade
+data:
+  name: value`
+
+	assert.Equal(t, expectedBuf, buf.String())
+	assert.Len(t, hooks, 1)
+	assert.Equal(t, expectedHook, hooks[0].Manifest)
+}
+
+func TestRenderResources_PostRenderer_Error(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	// Create a post-renderer that returns an error
+	mockPR := &mockPostRenderer{
+		shouldError: true,
+	}
+
+	ch := buildChart(withSampleTemplates())
+	values := map[string]interface{}{}
+
+	_, _, _, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		mockPR, false, false, false,
+	)
+
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "error while running post render on files")
+}
+
+func TestRenderResources_PostRenderer_MergeError(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	// Create a mock post-renderer
+	mockPR := &mockPostRenderer{}
+
+	// Create a chart with invalid YAML that would cause AnnotateAndMerge to fail
+	ch := &chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: "v1",
+			Name:       "test-chart",
+			Version:    "0.1.0",
+		},
+		Templates: []*chart.File{
+			{Name: "templates/invalid", Data: []byte("invalid: yaml: content:")},
+		},
+	}
+	values := map[string]interface{}{}
+
+	_, _, _, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		mockPR, false, false, false,
+	)
+
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "error merging manifests")
+}
+
+func TestRenderResources_PostRenderer_SplitError(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	// Create a post-renderer that returns invalid YAML
+	mockPR := &mockPostRenderer{
+		transform: func(_ string) string {
+			return "invalid: yaml: content:"
+		},
+	}
+
+	ch := buildChart(withSampleTemplates())
+	values := map[string]interface{}{}
+
+	_, _, _, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		mockPR, false, false, false,
+	)
+
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "error while parsing post rendered files")
+}
+
+func TestRenderResources_PostRenderer_Integration(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	mockPR := &mockPostRenderer{
+		transform: func(content string) string {
+			return strings.ReplaceAll(content, "metadata:", "color: blue\nmetadata:")
+		},
+	}
+
+	ch := buildChart(withSampleTemplates())
+	values := map[string]interface{}{}
+
+	hooks, buf, notes, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		mockPR, false, false, false,
+	)
+
+	assert.NoError(t, err)
+	assert.NotNil(t, hooks)
+	assert.NotNil(t, buf)
+	assert.Equal(t, "", notes) // Notes should be empty for this test
+
+	// Verify that the post-renderer modifications are present in the output
+	output := buf.String()
+	expected := `---
+# Source: hello/templates/goodbye
+goodbye: world
+color: blue
+---
+# Source: hello/templates/hello
+hello: world
+color: blue
+---
+# Source: hello/templates/with-partials
+hello: Earth
+color: blue
+`
+	assert.Contains(t, output, "color: blue")
+	assert.Equal(t, 3, strings.Count(output, "color: blue"))
+	assert.Equal(t, expected, output)
+}
+
+func TestRenderResources_NoPostRenderer(t *testing.T) {
+	cfg := actionConfigFixture(t)
+
+	ch := buildChart(withSampleTemplates())
+	values := map[string]interface{}{}
+
+	hooks, buf, notes, err := cfg.renderResources(
+		ch, values, "test-release", "", false, false, false,
+		nil, false, false, false,
+	)
+
+	assert.NoError(t, err)
+	assert.NotNil(t, hooks)
+	assert.NotNil(t, buf)
+	assert.Equal(t, "", notes)
+}

From 1d993f9e2d2b1297607d1e60cd6961c7898e1614 Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:00:47 +0800
Subject: [PATCH 036/211] review: make filenameAnnotation private

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 9c99a6cfa..95a38905d 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -94,9 +94,9 @@ type Configuration struct {
 }
 
 const (
-	// FilenameAnnotation is the annotation key used to store the original filename
+	// filenameAnnotation is the annotation key used to store the original filename
 	// information in manifest annotations for post-rendering reconstruction.
-	FilenameAnnotation = "helm-postrender-filename"
+	filenameAnnotation = "helm-postrender-filename"
 )
 
 // AnnotateAndMerge combines multiple YAML files into a single stream of documents,
@@ -114,7 +114,7 @@ func AnnotateAndMerge(files map[string]string) (string, error) {
 			return "", fmt.Errorf("parsing %s: %w", fname, err)
 		}
 		for _, manifest := range manifests {
-			if err := manifest.PipeE(kyaml.SetAnnotation(FilenameAnnotation, fname)); err != nil {
+			if err := manifest.PipeE(kyaml.SetAnnotation(filenameAnnotation, fname)); err != nil {
 				return "", fmt.Errorf("annotating %s: %w", fname, err)
 			}
 			combinedManifests = append(combinedManifests, manifest)
@@ -142,11 +142,11 @@ func SplitAndDeannotate(postrendered string) (map[string]string, error) {
 		if err != nil {
 			return nil, fmt.Errorf("getting metadata: %w", err)
 		}
-		fname := meta.Annotations[FilenameAnnotation]
+		fname := meta.Annotations[filenameAnnotation]
 		if fname == "" {
 			fname = fmt.Sprintf("generated-by-postrender-%d.yaml", i)
 		}
-		if err := manifest.PipeE(kyaml.ClearAnnotation(FilenameAnnotation)); err != nil {
+		if err := manifest.PipeE(kyaml.ClearAnnotation(filenameAnnotation)); err != nil {
 			return nil, fmt.Errorf("clearing filename annotation: %w", err)
 		}
 		manifestsByFilename[fname] = append(manifestsByFilename[fname], manifest)

From 855b5a44b75896c200526af0970e0f6d8bff803d Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:02:21 +0800
Subject: [PATCH 037/211] review: make annotateAndMerge private

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go      | 6 +++---
 pkg/action/action_test.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 95a38905d..4c02031fa 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -99,9 +99,9 @@ const (
 	filenameAnnotation = "helm-postrender-filename"
 )
 
-// AnnotateAndMerge combines multiple YAML files into a single stream of documents,
+// annotateAndMerge combines multiple YAML files into a single stream of documents,
 // adding filename annotations to each document for later reconstruction.
-func AnnotateAndMerge(files map[string]string) (string, error) {
+func annotateAndMerge(files map[string]string) (string, error) {
 	var combinedManifests []*kyaml.RNode
 	for fname, content := range files {
 		// Skip partials and empty files.
@@ -242,7 +242,7 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 
 		// Merge files as stream of documents for sending to post renderer
 		var merged string
-		if merged, err = AnnotateAndMerge(files); err != nil {
+		if merged, err = annotateAndMerge(files); err != nil {
 			return hs, b, notes, fmt.Errorf("error merging manifests: %w", err)
 		}
 
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index aaa5b4c16..c55b726ea 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -536,7 +536,7 @@ metadata:
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			merged, err := AnnotateAndMerge(tt.files)
+			merged, err := annotateAndMerge(tt.files)
 
 			if tt.expectedError != "" {
 				assert.Error(t, err)
@@ -749,7 +749,7 @@ data:
 	}
 
 	// Merge and annotate
-	merged, err := AnnotateAndMerge(originalFiles)
+	merged, err := annotateAndMerge(originalFiles)
 	require.NoError(t, err)
 
 	// Split and deannotate

From b26b473bf6c4755e1b1d6ba9c63a3f2c73dfaa74 Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:03:51 +0800
Subject: [PATCH 038/211] review: make splitAndDeannotate private

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go      | 6 +++---
 pkg/action/action_test.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 4c02031fa..643dddc45 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -128,9 +128,9 @@ func annotateAndMerge(files map[string]string) (string, error) {
 	return merged, nil
 }
 
-// SplitAndDeannotate reconstructs individual files from a merged YAML stream,
+// splitAndDeannotate reconstructs individual files from a merged YAML stream,
 // removing filename annotations and grouping documents by their original filenames.
-func SplitAndDeannotate(postrendered string) (map[string]string, error) {
+func splitAndDeannotate(postrendered string) (map[string]string, error) {
 	manifests, err := kio.ParseAll(postrendered)
 	if err != nil {
 		return nil, fmt.Errorf("re-parsing merged buffer: %w", err)
@@ -253,7 +253,7 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 		}
 
 		// Use the file list and contents received from the post renderer
-		if files, err = SplitAndDeannotate(postRendered.String()); err != nil {
+		if files, err = splitAndDeannotate(postRendered.String()); err != nil {
 			return hs, b, notes, fmt.Errorf("error while parsing post rendered files: %w", err)
 		}
 	}
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index c55b726ea..401451a42 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -699,7 +699,7 @@ data:
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			files, err := SplitAndDeannotate(tt.input)
+			files, err := splitAndDeannotate(tt.input)
 
 			if tt.expectedError != "" {
 				assert.Error(t, err)
@@ -753,7 +753,7 @@ data:
 	require.NoError(t, err)
 
 	// Split and deannotate
-	reconstructed, err := SplitAndDeannotate(merged)
+	reconstructed, err := splitAndDeannotate(merged)
 	require.NoError(t, err)
 
 	// Compare the results

From 859721bd770a5a0eba196813b643d95dc0c181cc Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:12:24 +0800
Subject: [PATCH 039/211] review: rewrite error messages from the end-user
 perspective

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go      | 4 ++--
 pkg/action/action_test.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 643dddc45..4c028df5f 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -133,7 +133,7 @@ func annotateAndMerge(files map[string]string) (string, error) {
 func splitAndDeannotate(postrendered string) (map[string]string, error) {
 	manifests, err := kio.ParseAll(postrendered)
 	if err != nil {
-		return nil, fmt.Errorf("re-parsing merged buffer: %w", err)
+		return nil, fmt.Errorf("error parsing YAML: %w", err)
 	}
 
 	manifestsByFilename := make(map[string][]*kyaml.RNode)
@@ -254,7 +254,7 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 
 		// Use the file list and contents received from the post renderer
 		if files, err = splitAndDeannotate(postRendered.String()); err != nil {
-			return hs, b, notes, fmt.Errorf("error while parsing post rendered files: %w", err)
+			return hs, b, notes, fmt.Errorf("error while parsing post rendered output: %w", err)
 		}
 	}
 
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 401451a42..892c4c226 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -675,7 +675,7 @@ data:
 		{
 			name:          "invalid yaml input",
 			input:         "invalid: yaml: content:",
-			expectedError: "re-parsing merged buffer",
+			expectedError: "error parsing YAML: MalformedYAMLError",
 		},
 		{
 			name: "manifest without filename annotation",
@@ -885,7 +885,7 @@ func TestRenderResources_PostRenderer_SplitError(t *testing.T) {
 	)
 
 	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "error while parsing post rendered files")
+	assert.Contains(t, err.Error(), "error while parsing post rendered output: error parsing YAML: MalformedYAMLError:")
 }
 
 func TestRenderResources_PostRenderer_Integration(t *testing.T) {

From a1416cf2255a01bd25e6efaa515ac24bb95efd86 Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:18:50 +0800
Subject: [PATCH 040/211] review: style changes

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 4c028df5f..d67564688 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -241,8 +241,8 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 		// them back into a map of filename -> content.
 
 		// Merge files as stream of documents for sending to post renderer
-		var merged string
-		if merged, err = annotateAndMerge(files); err != nil {
+		merged, err := annotateAndMerge(files)
+		if err != nil {
 			return hs, b, notes, fmt.Errorf("error merging manifests: %w", err)
 		}
 
@@ -253,7 +253,8 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu
 		}
 
 		// Use the file list and contents received from the post renderer
-		if files, err = splitAndDeannotate(postRendered.String()); err != nil {
+		files, err = splitAndDeannotate(postRendered.String())
+		if err != nil {
 			return hs, b, notes, fmt.Errorf("error while parsing post rendered output: %w", err)
 		}
 	}

From c01e76b5c384886c8daaebf9436a16dbab37c77c Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Sun, 15 Jun 2025 19:20:51 +0800
Subject: [PATCH 041/211] review: change annotation name to
 postrenderer.helm.sh/postrender-filename

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go      |  2 +-
 pkg/action/action_test.go | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index d67564688..b6ac047b7 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -96,7 +96,7 @@ type Configuration struct {
 const (
 	// filenameAnnotation is the annotation key used to store the original filename
 	// information in manifest annotations for post-rendering reconstruction.
-	filenameAnnotation = "helm-postrender-filename"
+	filenameAnnotation = "postrenderer.helm.sh/postrender-filename"
 )
 
 // annotateAndMerge combines multiple YAML files into a single stream of documents,
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 892c4c226..43cf94622 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -419,7 +419,7 @@ kind: ConfigMap
 metadata:
   name: test-cm
   annotations:
-    helm-postrender-filename: 'templates/configmap.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/configmap.yaml'
 data:
   key: value
 `,
@@ -445,7 +445,7 @@ kind: ConfigMap
 metadata:
   name: test-cm
   annotations:
-    helm-postrender-filename: 'templates/configmap.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/configmap.yaml'
 data:
   key: value
 ---
@@ -454,7 +454,7 @@ kind: Secret
 metadata:
   name: test-secret
   annotations:
-    helm-postrender-filename: 'templates/secret.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/secret.yaml'
 data:
   password: dGVzdA==
 `,
@@ -481,7 +481,7 @@ kind: ConfigMap
 metadata:
   name: test-cm1
   annotations:
-    helm-postrender-filename: 'templates/multi.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/multi.yaml'
 data:
   key: value1
 ---
@@ -490,7 +490,7 @@ kind: ConfigMap
 metadata:
   name: test-cm2
   annotations:
-    helm-postrender-filename: 'templates/multi.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/multi.yaml'
 data:
   key: value2
 `,
@@ -514,7 +514,7 @@ kind: ConfigMap
 metadata:
   name: test-cm1
   annotations:
-    helm-postrender-filename: 'templates/cm.yaml'
+    postrenderer.helm.sh/postrender-filename: 'templates/cm.yaml'
 `,
 		},
 		{
@@ -564,7 +564,7 @@ kind: ConfigMap
 metadata:
   name: test-cm
   annotations:
-    helm-postrender-filename: templates/configmap.yaml
+    postrenderer.helm.sh/postrender-filename: templates/configmap.yaml
 data:
   key: value`,
 			expectedFiles: map[string]string{
@@ -584,7 +584,7 @@ kind: ConfigMap
 metadata:
   name: test-cm
   annotations:
-    helm-postrender-filename: templates/configmap.yaml
+    postrenderer.helm.sh/postrender-filename: templates/configmap.yaml
 data:
   key: value
 ---
@@ -593,7 +593,7 @@ kind: Secret
 metadata:
   name: test-secret
   annotations:
-    helm-postrender-filename: templates/secret.yaml
+    postrenderer.helm.sh/postrender-filename: templates/secret.yaml
 data:
   password: dGVzdA==`,
 			expectedFiles: map[string]string{
@@ -620,7 +620,7 @@ kind: ConfigMap
 metadata:
   name: test-cm1
   annotations:
-    helm-postrender-filename: templates/multi.yaml
+    postrenderer.helm.sh/postrender-filename: templates/multi.yaml
 data:
   key: value1
 ---
@@ -629,7 +629,7 @@ kind: ConfigMap
 metadata:
   name: test-cm2
   annotations:
-    helm-postrender-filename: templates/multi.yaml
+    postrenderer.helm.sh/postrender-filename: templates/multi.yaml
 data:
   key: value2`,
 			expectedFiles: map[string]string{
@@ -656,7 +656,7 @@ kind: ConfigMap
 metadata:
   name: test-cm
   annotations:
-    helm-postrender-filename: templates/configmap.yaml
+    postrenderer.helm.sh/postrender-filename: templates/configmap.yaml
     other-annotation: should-remain
 data:
   key: value`,

From 6991a0a531adb0a514eb7fadf5b8f2a2f6c17007 Mon Sep 17 00:00:00 2001
From: Carlos Lima <carlos@cpan.org>
Date: Wed, 18 Jun 2025 01:43:30 +0800
Subject: [PATCH 042/211] Make annotateAndMerge deterministic

Signed-off-by: Carlos Lima <carlos@cpan.org>
---
 pkg/action/action.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index b6ac047b7..69bcf4da2 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -22,9 +22,11 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"maps"
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"text/template"
@@ -103,7 +105,12 @@ const (
 // adding filename annotations to each document for later reconstruction.
 func annotateAndMerge(files map[string]string) (string, error) {
 	var combinedManifests []*kyaml.RNode
-	for fname, content := range files {
+
+	// Get sorted filenames to ensure result is deterministic
+	fnames := slices.Sorted(maps.Keys(files))
+
+	for _, fname := range fnames {
+		content := files[fname]
 		// Skip partials and empty files.
 		if strings.HasPrefix(path.Base(fname), "_") || strings.TrimSpace(content) == "" {
 			continue

From c48a3435f526ccfd064d44a0e73dbdc5f4516f4f Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Wed, 2 Jul 2025 09:30:59 -0700
Subject: [PATCH 043/211] Remove unnecessary calls for changing directory to
 `helmpath.CachePath`.

This was only set on some tests in create_test.go and isn't
affecting the test.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/cmd/create_test.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkg/cmd/create_test.go b/pkg/cmd/create_test.go
index 2a4ca95ca..90ed90eff 100644
--- a/pkg/cmd/create_test.go
+++ b/pkg/cmd/create_test.go
@@ -60,10 +60,10 @@ func TestCreateCmd(t *testing.T) {
 }
 
 func TestCreateStarterCmd(t *testing.T) {
+	t.Chdir(t.TempDir())
 	ensure.HelmHome(t)
 	cname := "testchart"
 	defer resetEnv()()
-	t.Chdir(t.TempDir())
 	// Create a starter.
 	starterchart := helmpath.DataPath("starters")
 	os.MkdirAll(starterchart, 0o755)
@@ -140,9 +140,6 @@ func TestCreateStarterAbsoluteCmd(t *testing.T) {
 		t.Fatalf("Could not write template: %s", err)
 	}
 
-	os.MkdirAll(helmpath.CachePath(), 0o755)
-	defer t.Chdir(helmpath.CachePath())
-
 	starterChartPath := filepath.Join(starterchart, "starterchart")
 
 	// Run a create

From eaf40b4b4fba2006df55e5f3d8014641a97045ac Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Wed, 2 Jul 2025 16:20:38 -0700
Subject: [PATCH 044/211] Call `ensure.HelmHome()` in package_test.go

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/cmd/package_test.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/cmd/package_test.go b/pkg/cmd/package_test.go
index 349cb662f..db4a2523a 100644
--- a/pkg/cmd/package_test.go
+++ b/pkg/cmd/package_test.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 	"testing"
 
+	"helm.sh/helm/v4/internal/test/ensure"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
@@ -111,6 +112,7 @@ func TestPackage(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Chdir(t.TempDir())
+			ensure.HelmHome(t)
 
 			if err := os.MkdirAll("toot", 0o777); err != nil {
 				t.Fatal(err)

From 5f9cbe6f4afa78be51d9af8a3870d1523c0b4245 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 21 May 2025 11:06:42 -0700
Subject: [PATCH 045/211] fix: Port pluginCommand & command warning

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/plugin/plugin.go      | 12 ++++++------
 pkg/plugin/plugin_test.go |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index 9d79ab4fc..67676b103 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -83,7 +83,7 @@ type Metadata struct {
 	PlatformCommand []PlatformCommand `json:"platformCommand"`
 
 	// Command is the plugin command, as a single string.
-	// Providing a command will result in an error if PlatformCommand is also set.
+	// Providing a command will result in an deprecation warning if PlatformCommand is also set.
 	//
 	// The command will be passed through environment expansion, so env vars can
 	// be present in this command. Unless IgnoreFlags is set, this will
@@ -92,7 +92,7 @@ type Metadata struct {
 	// Note that command is not executed in a shell. To do so, we suggest
 	// pointing the command to a shell script.
 	//
-	// DEPRECATED: Use PlatformCommand instead. Remove in Helm 4.
+	// DEPRECATED: Use PlatformCommand instead
 	Command string `json:"command"`
 
 	// IgnoreFlags ignores any flags passed in from Helm
@@ -119,14 +119,14 @@ type Metadata struct {
 	PlatformHooks PlatformHooks `json:"platformHooks"`
 
 	// Hooks are commands that will run on plugin events, as a single string.
-	// Providing a hooks will result in an error if PlatformHooks is also set.
+	// Providing a command will result in an deprecation warning if PlatformHooks is also set.
 	//
 	// The command will be passed through environment expansion, so env vars can
 	// be present in this command.
 	//
 	// Note that the command is executed in the sh shell.
 	//
-	// DEPRECATED: Use PlatformHooks instead. Remove in Helm 4.
+	// DEPRECATED: Use PlatformHooks instead
 	Hooks Hooks
 
 	// Downloaders field is used if the plugin supply downloader mechanism
@@ -265,11 +265,11 @@ func validatePluginData(plug *Plugin, filepath string) error {
 	plug.Metadata.Usage = sanitizeString(plug.Metadata.Usage)
 
 	if len(plug.Metadata.PlatformCommand) > 0 && len(plug.Metadata.Command) > 0 {
-		return fmt.Errorf("both platformCommand and command are set in %q", filepath)
+		fmt.Printf("WARNING: both 'platformCommand' and 'command' are set in %q (this will become an error in a future Helm version)\n", filepath)
 	}
 
 	if len(plug.Metadata.PlatformHooks) > 0 && len(plug.Metadata.Hooks) > 0 {
-		return fmt.Errorf("both platformHooks and hooks are set in %q", filepath)
+		fmt.Printf("WARNING: both 'platformHooks' and 'hooks' are set in %q (this will become an error in a future Helm version)\n", filepath)
 	}
 
 	// We could also validate SemVer, executable, and other fields should we so choose.
diff --git a/pkg/plugin/plugin_test.go b/pkg/plugin/plugin_test.go
index b96428f6b..20bd2f737 100644
--- a/pkg/plugin/plugin_test.go
+++ b/pkg/plugin/plugin_test.go
@@ -496,8 +496,8 @@ func TestValidatePluginData(t *testing.T) {
 		{false, mockMissingMeta},         // Test if the metadata section missing
 		{true, mockNoCommand},            // Test no command metadata works
 		{true, mockLegacyCommand},        // Test legacy command metadata works
-		{false, mockWithCommand},         // Test platformCommand and command both set fails
-		{false, mockWithHooks},           // Test platformHooks and hooks both set fails
+		{true, mockWithCommand},          // Test platformCommand and command both set works
+		{true, mockWithHooks},            // Test platformHooks and hooks both set works
 	} {
 		err := validatePluginData(item.plug, fmt.Sprintf("test-%d", i))
 		if item.pass && err != nil {

From 62ca98f521a616c1b600405aff00d068303c13e6 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Tue, 1 Jul 2025 08:29:29 -0700
Subject: [PATCH 046/211] fix up verbiage

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/plugin/plugin.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index 67676b103..a30bd06c4 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -83,7 +83,7 @@ type Metadata struct {
 	PlatformCommand []PlatformCommand `json:"platformCommand"`
 
 	// Command is the plugin command, as a single string.
-	// Providing a command will result in an deprecation warning if PlatformCommand is also set.
+	// Providing Command and PlatformCommand will result in a warning being emitted (PlatformCommand takes precedence).
 	//
 	// The command will be passed through environment expansion, so env vars can
 	// be present in this command. Unless IgnoreFlags is set, this will
@@ -119,7 +119,7 @@ type Metadata struct {
 	PlatformHooks PlatformHooks `json:"platformHooks"`
 
 	// Hooks are commands that will run on plugin events, as a single string.
-	// Providing a command will result in an deprecation warning if PlatformHooks is also set.
+	// Providing Hook and PlatformHooks will result in a warning being emitted (PlatformHooks takes precedence).
 	//
 	// The command will be passed through environment expansion, so env vars can
 	// be present in this command.

From de1bdf582035dc4079970e06ccdafd2b1e802263 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 2 Jul 2025 17:31:35 -0700
Subject: [PATCH 047/211] switch to slog

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/plugin/plugin.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index a30bd06c4..2c197f02e 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -17,6 +17,7 @@ package plugin // import "helm.sh/helm/v4/pkg/plugin"
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -265,11 +266,11 @@ func validatePluginData(plug *Plugin, filepath string) error {
 	plug.Metadata.Usage = sanitizeString(plug.Metadata.Usage)
 
 	if len(plug.Metadata.PlatformCommand) > 0 && len(plug.Metadata.Command) > 0 {
-		fmt.Printf("WARNING: both 'platformCommand' and 'command' are set in %q (this will become an error in a future Helm version)\n", filepath)
+		slog.Warn("both 'platformCommand' and 'command' are set (this will become an error in a future Helm version)", slog.String("filepath", filepath))
 	}
 
 	if len(plug.Metadata.PlatformHooks) > 0 && len(plug.Metadata.Hooks) > 0 {
-		fmt.Printf("WARNING: both 'platformHooks' and 'hooks' are set in %q (this will become an error in a future Helm version)\n", filepath)
+		slog.Warn("both 'platformHooks' and 'hooks' are set (this will become an error in a future Helm version)", slog.String("filepath", filepath))
 	}
 
 	// We could also validate SemVer, executable, and other fields should we so choose.

From 5283915c57ba2f474f74f76987c14b9c770746c0 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 2 Jul 2025 20:18:34 -0700
Subject: [PATCH 048/211] Remove deprecated '--create-pods' flag

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/rollback.go | 10 ---------
 pkg/action/upgrade.go  | 49 ------------------------------------------
 pkg/cmd/rollback.go    |  1 -
 pkg/cmd/upgrade.go     |  2 --
 4 files changed, 62 deletions(-)

diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index ac8a28fe0..1dc0c7f84 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -41,7 +41,6 @@ type Rollback struct {
 	WaitForJobs   bool
 	DisableHooks  bool
 	DryRun        bool
-	Recreate      bool // will (if true) recreate pods after a rollback.
 	Force         bool // will (if true) force resource upgrade through uninstall/recreate if needed
 	CleanupOnFail bool
 	MaxHistory    int // MaxHistory limits the maximum number of revisions saved per release
@@ -211,15 +210,6 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		return targetRelease, err
 	}
 
-	if r.Recreate {
-		// NOTE: Because this is not critical for a release to succeed, we just
-		// log if an error occurs and continue onward. If we ever introduce log
-		// levels, we should make these error level logs so users are notified
-		// that they'll need to go do the cleanup on their own
-		if err := recreate(r.cfg, results.Updated); err != nil {
-			slog.Error(err.Error())
-		}
-	}
 	waiter, err := r.cfg.KubeClient.GetWaiter(r.WaitStrategy)
 	if err != nil {
 		return nil, fmt.Errorf("unable to set metadata visitor from target release: %w", err)
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index e2d2ead69..271bc8aa9 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -26,7 +26,6 @@ import (
 	"sync"
 	"time"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/resource"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
@@ -88,8 +87,6 @@ type Upgrade struct {
 	ReuseValues bool
 	// ResetThenReuseValues will reset the values to the chart's built-ins then merge with user's last supplied values.
 	ResetThenReuseValues bool
-	// Recreate will (if true) recreate pods after a rollback.
-	Recreate bool
 	// MaxHistory limits the maximum number of revisions saved per release
 	MaxHistory int
 	// Atomic, if true, will roll back on failure.
@@ -436,15 +433,6 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 		return
 	}
 
-	if u.Recreate {
-		// NOTE: Because this is not critical for a release to succeed, we just
-		// log if an error occurs and continue onward. If we ever introduce log
-		// levels, we should make these error level logs so users are notified
-		// that they'll need to go do the cleanup on their own
-		if err := recreate(u.cfg, results.Updated); err != nil {
-			slog.Error(err.Error())
-		}
-	}
 	waiter, err := u.cfg.KubeClient.GetWaiter(u.WaitStrategy)
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
@@ -537,7 +525,6 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 		}
 		rollin.WaitForJobs = u.WaitForJobs
 		rollin.DisableHooks = u.DisableHooks
-		rollin.Recreate = u.Recreate
 		rollin.Force = u.Force
 		rollin.Timeout = u.Timeout
 		if rollErr := rollin.Run(rel.Name); rollErr != nil {
@@ -602,42 +589,6 @@ func validateManifest(c kube.Interface, manifest []byte, openAPIValidation bool)
 	return err
 }
 
-// recreate captures all the logic for recreating pods for both upgrade and
-// rollback. If we end up refactoring rollback to use upgrade, this can just be
-// made an unexported method on the upgrade action.
-func recreate(cfg *Configuration, resources kube.ResourceList) error {
-	for _, res := range resources {
-		versioned := kube.AsVersioned(res)
-		selector, err := kube.SelectorsForObject(versioned)
-		if err != nil {
-			// If no selector is returned, it means this object is
-			// definitely not a pod, so continue onward
-			continue
-		}
-
-		client, err := cfg.KubernetesClientSet()
-		if err != nil {
-			return fmt.Errorf("unable to recreate pods for object %s/%s because an error occurred: %w", res.Namespace, res.Name, err)
-		}
-
-		pods, err := client.CoreV1().Pods(res.Namespace).List(context.Background(), metav1.ListOptions{
-			LabelSelector: selector.String(),
-		})
-		if err != nil {
-			return fmt.Errorf("unable to recreate pods for object %s/%s because an error occurred: %w", res.Namespace, res.Name, err)
-		}
-
-		// Restart pods
-		for _, pod := range pods.Items {
-			// Delete each pod for get them restarted with changed spec.
-			if err := client.CoreV1().Pods(pod.Namespace).Delete(context.Background(), pod.Name, *metav1.NewPreconditionDeleteOptions(string(pod.UID))); err != nil {
-				return fmt.Errorf("unable to recreate pods for object %s/%s because an error occurred: %w", res.Namespace, res.Name, err)
-			}
-		}
-	}
-	return nil
-}
-
 func objectKey(r *resource.Info) string {
 	gvk := r.Object.GetObjectKind().GroupVersionKind()
 	return fmt.Sprintf("%s/%s/%s/%s", gvk.GroupVersion().String(), gvk.Kind, r.Namespace, r.Name)
diff --git a/pkg/cmd/rollback.go b/pkg/cmd/rollback.go
index 1823432dc..6658d3fd6 100644
--- a/pkg/cmd/rollback.go
+++ b/pkg/cmd/rollback.go
@@ -77,7 +77,6 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	f := cmd.Flags()
 	f.BoolVar(&client.DryRun, "dry-run", false, "simulate a rollback")
-	f.BoolVar(&client.Recreate, "recreate-pods", false, "performs pods restart for the resource if applicable")
 	f.BoolVar(&client.Force, "force", false, "force resource update through delete/recreate if needed")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during rollback")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index b93fa6e64..d4e7b4852 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -268,8 +268,6 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.StringVar(&client.DryRunOption, "dry-run", "", "simulate an install. If --dry-run is set with no option being specified or as '--dry-run=client', it will not attempt cluster connections. Setting '--dry-run=server' allows attempting cluster connections.")
 	f.BoolVar(&client.HideSecret, "hide-secret", false, "hide Kubernetes Secrets when also using the --dry-run flag")
 	f.Lookup("dry-run").NoOptDefVal = "client"
-	f.BoolVar(&client.Recreate, "recreate-pods", false, "performs pods restart for the resource if applicable")
-	f.MarkDeprecated("recreate-pods", "functionality will no longer be updated. Consult the documentation for other methods to recreate pods")
 	f.BoolVar(&client.Force, "force", false, "force resource updates through a replacement strategy")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "disable pre/post upgrade hooks")
 	f.BoolVar(&client.DisableOpenAPIValidation, "disable-openapi-validation", false, "if set, the upgrade process will not validate rendered templates against the Kubernetes OpenAPI Schema")

From a3bcc5b1847e9ed9a3f9334cbdeebc787063b865 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 2 Jul 2025 21:14:22 -0700
Subject: [PATCH 049/211] fix: 'TestRunLinterRule' stateful test

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/lint/support/message_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/lint/support/message_test.go b/pkg/lint/support/message_test.go
index 55675eeee..ce5b5e42e 100644
--- a/pkg/lint/support/message_test.go
+++ b/pkg/lint/support/message_test.go
@@ -21,7 +21,6 @@ import (
 	"testing"
 )
 
-var linter = Linter{}
 var errLint = errors.New("lint failed")
 
 func TestRunLinterRule(t *testing.T) {
@@ -45,6 +44,7 @@ func TestRunLinterRule(t *testing.T) {
 		{-1, errLint, 4, false, ErrorSev},
 	}
 
+	linter := Linter{}
 	for _, test := range tests {
 		isValid := linter.RunLinterRule(test.Severity, "chart", test.LintError)
 		if len(linter.Messages) != test.ExpectedMessages {

From 4c674728d2308442f5b5c42e82a1ce534b5779ba Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Sat, 5 Jul 2025 09:02:58 -0700
Subject: [PATCH 050/211] Privatize 'k8sYamlStruct'

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/lint/rules/deprecations.go      |   4 +-
 pkg/lint/rules/deprecations_test.go |   4 +-
 pkg/lint/rules/template.go          |  19 ++---
 pkg/lint/rules/template_test.go     | 114 ++++++++++++++--------------
 4 files changed, 69 insertions(+), 72 deletions(-)

diff --git a/pkg/lint/rules/deprecations.go b/pkg/lint/rules/deprecations.go
index bd4a4436a..c6d635a5e 100644
--- a/pkg/lint/rules/deprecations.go
+++ b/pkg/lint/rules/deprecations.go
@@ -47,7 +47,7 @@ func (e deprecatedAPIError) Error() string {
 	return msg
 }
 
-func validateNoDeprecations(resource *K8sYamlStruct, kubeVersion *chartutil.KubeVersion) error {
+func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *chartutil.KubeVersion) error {
 	// if `resource` does not have an APIVersion or Kind, we cannot test it for deprecation
 	if resource.APIVersion == "" {
 		return nil
@@ -92,7 +92,7 @@ func validateNoDeprecations(resource *K8sYamlStruct, kubeVersion *chartutil.Kube
 	}
 }
 
-func resourceToRuntimeObject(resource *K8sYamlStruct) (runtime.Object, error) {
+func resourceToRuntimeObject(resource *k8sYamlStruct) (runtime.Object, error) {
 	scheme := runtime.NewScheme()
 	kscheme.AddToScheme(scheme)
 
diff --git a/pkg/lint/rules/deprecations_test.go b/pkg/lint/rules/deprecations_test.go
index c0e64d04f..6add843ce 100644
--- a/pkg/lint/rules/deprecations_test.go
+++ b/pkg/lint/rules/deprecations_test.go
@@ -19,7 +19,7 @@ package rules // import "helm.sh/helm/v4/pkg/lint/rules"
 import "testing"
 
 func TestValidateNoDeprecations(t *testing.T) {
-	deprecated := &K8sYamlStruct{
+	deprecated := &k8sYamlStruct{
 		APIVersion: "extensions/v1beta1",
 		Kind:       "Deployment",
 	}
@@ -32,7 +32,7 @@ func TestValidateNoDeprecations(t *testing.T) {
 		t.Fatalf("Expected error message to be non-blank: %v", err)
 	}
 
-	if err := validateNoDeprecations(&K8sYamlStruct{
+	if err := validateNoDeprecations(&k8sYamlStruct{
 		APIVersion: "v1",
 		Kind:       "Pod",
 	}, nil); err != nil {
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 72b81f191..463bd5341 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -139,9 +139,9 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 
 			// Lint all resources if the file contains multiple documents separated by ---
 			for {
-				// Even though K8sYamlStruct only defines a few fields, an error in any other
+				// Even though k8sYamlStruct only defines a few fields, an error in any other
 				// key will be raised as well
-				var yamlStruct *K8sYamlStruct
+				var yamlStruct *k8sYamlStruct
 
 				err := decoder.Decode(&yamlStruct)
 				if err == io.EOF {
@@ -224,7 +224,7 @@ func validateYamlContent(err error) error {
 // validateMetadataName uses the correct validation function for the object
 // Kind, or if not set, defaults to the standard definition of a subdomain in
 // DNS (RFC 1123), used by most resources.
-func validateMetadataName(obj *K8sYamlStruct) error {
+func validateMetadataName(obj *k8sYamlStruct) error {
 	fn := validateMetadataNameFunc(obj)
 	allErrs := field.ErrorList{}
 	for _, msg := range fn(obj.Metadata.Name, false) {
@@ -249,7 +249,7 @@ func validateMetadataName(obj *K8sYamlStruct) error {
 // If no mapping is defined, returns NameIsDNSSubdomain.  This is used by object
 // kinds that don't have special requirements, so is the most likely to work if
 // new kinds are added.
-func validateMetadataNameFunc(obj *K8sYamlStruct) validation.ValidateNameFunc {
+func validateMetadataNameFunc(obj *k8sYamlStruct) validation.ValidateNameFunc {
 	switch strings.ToLower(obj.Kind) {
 	case "pod", "node", "secret", "endpoints", "resourcequota", // core
 		"controllerrevision", "daemonset", "deployment", "replicaset", "statefulset", // apps
@@ -285,7 +285,7 @@ func validateMetadataNameFunc(obj *K8sYamlStruct) validation.ValidateNameFunc {
 
 // validateMatchSelector ensures that template specs have a selector declared.
 // See https://github.com/helm/helm/issues/1990
-func validateMatchSelector(yamlStruct *K8sYamlStruct, manifest string) error {
+func validateMatchSelector(yamlStruct *k8sYamlStruct, manifest string) error {
 	switch yamlStruct.Kind {
 	case "Deployment", "ReplicaSet", "DaemonSet", "StatefulSet":
 		// verify that matchLabels or matchExpressions is present
@@ -296,7 +296,7 @@ func validateMatchSelector(yamlStruct *K8sYamlStruct, manifest string) error {
 	return nil
 }
 
-func validateListAnnotations(yamlStruct *K8sYamlStruct, manifest string) error {
+func validateListAnnotations(yamlStruct *k8sYamlStruct, manifest string) error {
 	if yamlStruct.Kind == "List" {
 		m := struct {
 			Items []struct {
@@ -319,11 +319,8 @@ func validateListAnnotations(yamlStruct *K8sYamlStruct, manifest string) error {
 	return nil
 }
 
-// K8sYamlStruct stubs a Kubernetes YAML file.
-//
-// DEPRECATED: In Helm 4, this will be made a private type, as it is for use only within
-// the rules package.
-type K8sYamlStruct struct {
+// k8sYamlStruct stubs a Kubernetes YAML file.
+type k8sYamlStruct struct {
 	APIVersion string `json:"apiVersion"`
 	Kind       string
 	Metadata   k8sYamlMetadata
diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go
index bd503368d..787bd6e4b 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/lint/rules/template_test.go
@@ -101,76 +101,76 @@ func TestMultiTemplateFail(t *testing.T) {
 
 func TestValidateMetadataName(t *testing.T) {
 	tests := []struct {
-		obj     *K8sYamlStruct
+		obj     *k8sYamlStruct
 		wantErr bool
 	}{
 		// Most kinds use IsDNS1123Subdomain.
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: ""}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
-		{&K8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
-		{&K8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
-		{&K8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
-		{&K8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "operator:sa"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: ""}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "operator:sa"}}, true},
 
 		// Service uses IsDNS1035Label.
-		{&K8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "123baz"}}, true},
-		{&K8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "123baz"}}, true},
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
 
 		// Namespace uses IsDNS1123Label.
-		{&K8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
-		{&K8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo-bar"}}, false},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo-bar"}}, false},
 
 		// CertificateSigningRequest has no validation.
-		{&K8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: ""}}, false},
-		{&K8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, false},
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: ""}}, false},
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, false},
 
 		// RBAC uses path validation.
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
-		{&K8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
-		{&K8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
-		{&K8sYamlStruct{Kind: "RoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
-		{&K8sYamlStruct{Kind: "ClusterRoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
+		{&k8sYamlStruct{Kind: "RoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
 
 		// Unknown Kind
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: ""}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
-		{&K8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: ""}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
 
 		// No kind
-		{&K8sYamlStruct{Metadata: k8sYamlMetadata{Name: "foo"}}, false},
-		{&K8sYamlStruct{Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+		{&k8sYamlStruct{Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
 	}
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("%s/%s", tt.obj.Kind, tt.obj.Metadata.Name), func(t *testing.T) {
@@ -273,7 +273,7 @@ func TestStrictTemplateParsingMapError(t *testing.T) {
 }
 
 func TestValidateMatchSelector(t *testing.T) {
-	md := &K8sYamlStruct{
+	md := &k8sYamlStruct{
 		APIVersion: "apps/v1",
 		Kind:       "Deployment",
 		Metadata: k8sYamlMetadata{
@@ -401,7 +401,7 @@ func TestEmptyWithCommentsManifests(t *testing.T) {
 	}
 }
 func TestValidateListAnnotations(t *testing.T) {
-	md := &K8sYamlStruct{
+	md := &k8sYamlStruct{
 		APIVersion: "v1",
 		Kind:       "List",
 		Metadata: k8sYamlMetadata{

From 76fdba4c8c2a4829a6b7abb48a08e51fd07fa0b3 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Wed, 2 Jul 2025 15:10:04 -0400
Subject: [PATCH 051/211] Updating link handling

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 pkg/downloader/manager.go      | 14 +++++
 pkg/downloader/manager_test.go | 93 ++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 348c78edb..b43165975 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -851,6 +851,20 @@ func writeLock(chartpath string, lock *chart.Lock, legacyLockfile bool) error {
 		lockfileName = "requirements.lock"
 	}
 	dest := filepath.Join(chartpath, lockfileName)
+
+	info, err := os.Lstat(dest)
+	if err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("error getting info for %q: %w", dest, err)
+	} else if err == nil {
+		if info.Mode()&os.ModeSymlink != 0 {
+			link, err := os.Readlink(dest)
+			if err != nil {
+				return fmt.Errorf("error reading symlink for %q: %w", dest, err)
+			}
+			return fmt.Errorf("the %s file is a symlink to %q", lockfileName, link)
+		}
+	}
+
 	return os.WriteFile(dest, data, 0644)
 }
 
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index 53955c45b..f01a5d7ad 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -23,8 +23,10 @@ import (
 	"path/filepath"
 	"reflect"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/yaml"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
@@ -672,3 +674,94 @@ func TestDedupeRepos(t *testing.T) {
 		})
 	}
 }
+
+func TestWriteLock(t *testing.T) {
+	fixedTime, err := time.Parse(time.RFC3339, "2025-07-04T00:00:00Z")
+	assert.NoError(t, err)
+	lock := &chart.Lock{
+		Generated: fixedTime,
+		Digest:    "sha256:12345",
+		Dependencies: []*chart.Dependency{
+			{
+				Name:       "fantastic-chart",
+				Version:    "1.2.3",
+				Repository: "https://example.com/charts",
+			},
+		},
+	}
+	expectedContent, err := yaml.Marshal(lock)
+	assert.NoError(t, err)
+
+	t.Run("v2 lock file", func(t *testing.T) {
+		dir := t.TempDir()
+		err := writeLock(dir, lock, false)
+		assert.NoError(t, err)
+
+		lockfilePath := filepath.Join(dir, "Chart.lock")
+		_, err = os.Stat(lockfilePath)
+		assert.NoError(t, err, "Chart.lock should exist")
+
+		content, err := os.ReadFile(lockfilePath)
+		assert.NoError(t, err)
+		assert.Equal(t, expectedContent, content)
+
+		// Check that requirements.lock does not exist
+		_, err = os.Stat(filepath.Join(dir, "requirements.lock"))
+		assert.Error(t, err)
+		assert.True(t, os.IsNotExist(err))
+	})
+
+	t.Run("v1 lock file", func(t *testing.T) {
+		dir := t.TempDir()
+		err := writeLock(dir, lock, true)
+		assert.NoError(t, err)
+
+		lockfilePath := filepath.Join(dir, "requirements.lock")
+		_, err = os.Stat(lockfilePath)
+		assert.NoError(t, err, "requirements.lock should exist")
+
+		content, err := os.ReadFile(lockfilePath)
+		assert.NoError(t, err)
+		assert.Equal(t, expectedContent, content)
+
+		// Check that Chart.lock does not exist
+		_, err = os.Stat(filepath.Join(dir, "Chart.lock"))
+		assert.Error(t, err)
+		assert.True(t, os.IsNotExist(err))
+	})
+
+	t.Run("overwrite existing lock file", func(t *testing.T) {
+		dir := t.TempDir()
+		lockfilePath := filepath.Join(dir, "Chart.lock")
+		assert.NoError(t, os.WriteFile(lockfilePath, []byte("old content"), 0644))
+
+		err = writeLock(dir, lock, false)
+		assert.NoError(t, err)
+
+		content, err := os.ReadFile(lockfilePath)
+		assert.NoError(t, err)
+		assert.Equal(t, expectedContent, content)
+	})
+
+	t.Run("lock file is a symlink", func(t *testing.T) {
+		dir := t.TempDir()
+		dummyFile := filepath.Join(dir, "dummy.txt")
+		assert.NoError(t, os.WriteFile(dummyFile, []byte("dummy"), 0644))
+
+		lockfilePath := filepath.Join(dir, "Chart.lock")
+		assert.NoError(t, os.Symlink(dummyFile, lockfilePath))
+
+		err = writeLock(dir, lock, false)
+		assert.Error(t, err)
+		assert.Contains(t, err.Error(), "the Chart.lock file is a symlink to")
+	})
+
+	t.Run("chart path is not a directory", func(t *testing.T) {
+		dir := t.TempDir()
+		filePath := filepath.Join(dir, "not-a-dir")
+		assert.NoError(t, os.WriteFile(filePath, []byte("file"), 0644))
+
+		err = writeLock(filePath, lock, false)
+		assert.Error(t, err)
+	})
+}

From 357957b0d38cdf8119c7bb0e4fd1b587abf6486c Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 11:04:24 -0700
Subject: [PATCH 052/211] Use testify and add a CRD to the `goodone` test case.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/lint_test.go                         | 11 +++++------
 pkg/lint/rules/crds.go                        | 19 ++++++++++++++++---
 pkg/lint/rules/crds_test.go                   | 18 ++++++------------
 .../badcrdfile/crds/bad-apiversion.yaml       |  2 ++
 .../{withcrd => goodone}/crds/test-crd.yaml   |  0
 pkg/lint/rules/testdata/withcrd/Chart.yaml    |  5 -----
 6 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
 rename pkg/lint/rules/testdata/{withcrd => goodone}/crds/test-crd.yaml (100%)
 delete mode 100644 pkg/lint/rules/testdata/withcrd/Chart.yaml

diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 45e24f533..2b591f516 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -21,6 +21,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/lint/support"
 )
@@ -114,12 +116,9 @@ func TestBadValues(t *testing.T) {
 
 func TestBadCrdFile(t *testing.T) {
 	m := RunAll(badCrdFileDir, values, namespace).Messages
-	if len(m) < 1 {
-		t.Fatalf("All didn't fail with expected errors, got %#v", m)
-	}
-	if !strings.Contains(m[0].Err.Error(), "object kind is not 'CustomResourceDefinition'") {
-		t.Errorf("All didn't have the error for invalid CRD: %s", m[0].Err)
-	}
+	assert.Lenf(t, m, 2, "All didn't fail with expected errors, got %#v", m)
+	assert.ErrorContains(t, m[0].Err, "apiVersion is not in 'apiextensions.k8s.io'")
+	assert.ErrorContains(t, m[1].Err, "object kind is not 'CustomResourceDefinition'")
 }
 
 func TestGoodChart(t *testing.T) {
diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index 4740157b3..dd3e145fc 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -24,6 +24,7 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"k8s.io/apimachinery/pkg/util/yaml"
 
@@ -41,7 +42,10 @@ func Crds(linter *support.Linter) {
 		return
 	}
 
-	linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
+	crdsDirValid := linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
+	if !crdsDirValid {
+		return
+	}
 
 	// Load chart and parse CRDs
 	chart, err := loader.Load(linter.ChartDir)
@@ -53,8 +57,9 @@ func Crds(linter *support.Linter) {
 	}
 
 	/* Iterate over all the CRDs to check:
-	- It is a YAML file and not a template
-	- The kind is CustomResourceDefinition
+	1. It is a YAML file and not a template
+	2. The API version is apiextensions.k8s.io
+	3. The kind is CustomResourceDefinition
 	*/
 	for _, crd := range chart.CRDObjects() {
 		fileName := crd.Name
@@ -75,6 +80,7 @@ func Crds(linter *support.Linter) {
 				return
 			}
 
+			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdApiVersion(yamlStruct))
 			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdKind(yamlStruct))
 		}
 	}
@@ -92,6 +98,13 @@ func validateCrdsDir(crdsPath string) error {
 	return nil
 }
 
+func validateCrdApiVersion(obj *K8sYamlStruct) error {
+	if !strings.HasPrefix(obj.APIVersion, "apiextensions.k8s.io") {
+		return fmt.Errorf("apiVersion is not in 'apiextensions.k8s.io'")
+	}
+	return nil
+}
+
 func validateCrdKind(obj *K8sYamlStruct) error {
 	if obj.Kind != "CustomResourceDefinition" {
 		return fmt.Errorf("object kind is not 'CustomResourceDefinition'")
diff --git a/pkg/lint/rules/crds_test.go b/pkg/lint/rules/crds_test.go
index a84b62a50..66da06121 100644
--- a/pkg/lint/rules/crds_test.go
+++ b/pkg/lint/rules/crds_test.go
@@ -17,13 +17,14 @@ limitations under the License.
 package rules
 
 import (
-	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
-const crdsTestBaseDir = "./testdata/withcrd"
+const crdsTestBaseDir = "./testdata/goodone"
 const invalidCrdsDir = "./testdata/invalidcrdsdir"
 
 func TestCrdsDir(t *testing.T) {
@@ -31,9 +32,7 @@ func TestCrdsDir(t *testing.T) {
 	Crds(&linter)
 	res := linter.Messages
 
-	if len(res) > 0 {
-		t.Fatalf("Expected no errors, got %d, %v", len(res), res)
-	}
+	assert.Emptyf(t, res, "Expected no errors, got %v", res)
 }
 
 func TestInvalidCrdsDir(t *testing.T) {
@@ -41,11 +40,6 @@ func TestInvalidCrdsDir(t *testing.T) {
 	Crds(&linter)
 	res := linter.Messages
 
-	if len(res) != 1 {
-		t.Fatalf("Expected one error, got %d, %v", len(res), res)
-	}
-
-	if !strings.Contains(res[0].Err.Error(), "not a directory") {
-		t.Errorf("Unexpected error: %s", res[0])
-	}
+	assert.Lenf(t, res, 1, "Expected one error, got %d, %v", len(res), res)
+	assert.ErrorContains(t, res[0].Err, "not a directory")
 }
diff --git a/pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml b/pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
new file mode 100644
index 000000000..468916053
--- /dev/null
+++ b/pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
@@ -0,0 +1,2 @@
+apiVersion: bad.k8s.io/v1beta1
+kind: CustomResourceDefinition
diff --git a/pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml b/pkg/lint/rules/testdata/goodone/crds/test-crd.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withcrd/crds/test-crd.yaml
rename to pkg/lint/rules/testdata/goodone/crds/test-crd.yaml
diff --git a/pkg/lint/rules/testdata/withcrd/Chart.yaml b/pkg/lint/rules/testdata/withcrd/Chart.yaml
deleted file mode 100644
index 58e3a0c27..000000000
--- a/pkg/lint/rules/testdata/withcrd/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-name: withcrd
-description: testing chart with a CRD
-version: 199.44.12345-Alpha.1+cafe009
-icon: http://riverrun.io

From bf9084a16a1a8b084b15bdb36fc4bca42edcba7c Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 11:09:11 -0700
Subject: [PATCH 053/211] Rename `validateCrdApiVersion` to
 `validateCrdAPIVersion`

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index dd3e145fc..cb867684e 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -80,7 +80,7 @@ func Crds(linter *support.Linter) {
 				return
 			}
 
-			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdApiVersion(yamlStruct))
+			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdAPIVersion(yamlStruct))
 			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdKind(yamlStruct))
 		}
 	}
@@ -98,7 +98,7 @@ func validateCrdsDir(crdsPath string) error {
 	return nil
 }
 
-func validateCrdApiVersion(obj *K8sYamlStruct) error {
+func validateCrdAPIVersion(obj *K8sYamlStruct) error {
 	if !strings.HasPrefix(obj.APIVersion, "apiextensions.k8s.io") {
 		return fmt.Errorf("apiVersion is not in 'apiextensions.k8s.io'")
 	}

From 3b2f9e7d6fdbc66947e145e5a1fae5e9cde54330 Mon Sep 17 00:00:00 2001
From: naving1989 <navinag1989@gmail.com>
Date: Mon, 7 Jul 2025 23:16:36 +0530
Subject: [PATCH 054/211] test: increase test coverage for pkg/cli/options.go
 file

Signed-off-by: naving1989 <navinag1989@gmail.com>
---
 pkg/cli/values/options_test.go | 260 +++++++++++++++++++++++++++++++++
 1 file changed, 260 insertions(+)

diff --git a/pkg/cli/values/options_test.go b/pkg/cli/values/options_test.go
index c3bb0af33..0086d31cb 100644
--- a/pkg/cli/values/options_test.go
+++ b/pkg/cli/values/options_test.go
@@ -17,13 +17,273 @@ limitations under the License.
 package values
 
 import (
+	"bytes"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
 	"reflect"
+	"strings"
 	"testing"
 
 	"helm.sh/helm/v4/pkg/getter"
 )
 
+// mockGetter implements getter.Getter for testing
+type mockGetter struct {
+	content []byte
+	err     error
+}
+
+func (m *mockGetter) Get(url string, options ...getter.Option) (*bytes.Buffer, error) {
+	if m.err != nil {
+		return nil, m.err
+	}
+	return bytes.NewBuffer(m.content), nil
+}
+
+// mockProvider creates a test provider
+func mockProvider(schemes []string, content []byte, err error) getter.Provider {
+	return getter.Provider{
+		Schemes: schemes,
+		New: func(_ ...getter.Option) (getter.Getter, error) {
+			return &mockGetter{content: content, err: err}, nil
+		},
+	}
+}
+
 func TestReadFile(t *testing.T) {
+	tests := []struct {
+		name         string
+		filePath     string
+		providers    getter.Providers
+		setupFunc    func(*testing.T) (string, func()) // setup temp files, return cleanup
+		expectError  bool
+		expectStdin  bool
+		expectedData []byte
+	}{
+		{
+			name:        "stdin input with dash",
+			filePath:    "-",
+			providers:   getter.Providers{},
+			expectStdin: true,
+			expectError: false,
+		},
+		{
+			name:        "stdin input with whitespace",
+			filePath:    "  -  ",
+			providers:   getter.Providers{},
+			expectStdin: true,
+			expectError: false,
+		},
+		{
+			name:        "invalid URL parsing",
+			filePath:    "://invalid-url",
+			providers:   getter.Providers{},
+			expectError: true,
+		},
+		{
+			name:      "local file - existing",
+			filePath:  "test.txt",
+			providers: getter.Providers{},
+			setupFunc: func(t *testing.T) (string, func()) {
+				tmpDir := t.TempDir()
+				filePath := filepath.Join(tmpDir, "test.txt")
+				content := []byte("local file content")
+				err := os.WriteFile(filePath, content, 0644)
+				if err != nil {
+					t.Fatal(err)
+				}
+				return filePath, func() {} // cleanup handled by t.TempDir()
+			},
+			expectError:  false,
+			expectedData: []byte("local file content"),
+		},
+		{
+			name:        "local file - non-existent",
+			filePath:    "/non/existent/file.txt",
+			providers:   getter.Providers{},
+			expectError: true,
+		},
+		{
+			name:     "remote file with http scheme - success",
+			filePath: "http://example.com/values.yaml",
+			providers: getter.Providers{
+				mockProvider([]string{"http", "https"}, []byte("remote content"), nil),
+			},
+			expectError:  false,
+			expectedData: []byte("remote content"),
+		},
+		{
+			name:     "remote file with https scheme - success",
+			filePath: "https://example.com/values.yaml",
+			providers: getter.Providers{
+				mockProvider([]string{"http", "https"}, []byte("https content"), nil),
+			},
+			expectError:  false,
+			expectedData: []byte("https content"),
+		},
+		{
+			name:     "remote file with custom scheme - success",
+			filePath: "oci://registry.example.com/chart",
+			providers: getter.Providers{
+				mockProvider([]string{"oci"}, []byte("oci content"), nil),
+			},
+			expectError:  false,
+			expectedData: []byte("oci content"),
+		},
+		{
+			name:     "remote file - getter error",
+			filePath: "http://example.com/values.yaml",
+			providers: getter.Providers{
+				mockProvider([]string{"http"}, nil, errors.New("network error")),
+			},
+			expectError: true,
+		},
+		{
+			name:     "unsupported scheme fallback to local file",
+			filePath: "ftp://example.com/file.txt",
+			providers: getter.Providers{
+				mockProvider([]string{"http"}, []byte("should not be used"), nil),
+			},
+			setupFunc: func(t *testing.T) (string, func()) {
+				// Create a local file named "ftp://example.com/file.txt"
+				// This tests the fallback behavior when scheme is not supported
+				tmpDir := t.TempDir()
+				fileName := "ftp_file.txt" // Valid filename for filesystem
+				filePath := filepath.Join(tmpDir, fileName)
+				content := []byte("local fallback content")
+				err := os.WriteFile(filePath, content, 0644)
+				if err != nil {
+					t.Fatal(err)
+				}
+				return filePath, func() {}
+			},
+			expectError:  false,
+			expectedData: []byte("local fallback content"),
+		},
+		{
+			name:        "empty file path",
+			filePath:    "",
+			providers:   getter.Providers{},
+			expectError: true, // Empty path should cause error
+		},
+		{
+			name:     "multiple providers - correct selection",
+			filePath: "custom://example.com/resource",
+			providers: getter.Providers{
+				mockProvider([]string{"http", "https"}, []byte("wrong content"), nil),
+				mockProvider([]string{"custom"}, []byte("correct content"), nil),
+				mockProvider([]string{"oci"}, []byte("also wrong"), nil),
+			},
+			expectError:  false,
+			expectedData: []byte("correct content"),
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var actualFilePath string
+			var cleanup func()
+
+			if tt.setupFunc != nil {
+				actualFilePath, cleanup = tt.setupFunc(t)
+				defer cleanup()
+			} else {
+				actualFilePath = tt.filePath
+			}
+
+			// Handle stdin test case
+			if tt.expectStdin {
+				// Save original stdin
+				originalStdin := os.Stdin
+				defer func() { os.Stdin = originalStdin }()
+
+				// Create a pipe for stdin
+				r, w, err := os.Pipe()
+				if err != nil {
+					t.Fatal(err)
+				}
+				defer r.Close()
+				defer w.Close()
+
+				// Replace stdin with our pipe
+				os.Stdin = r
+
+				// Write test data to stdin
+				testData := []byte("stdin test data")
+				go func() {
+					defer w.Close()
+					w.Write(testData)
+				}()
+
+				// Test the function
+				got, err := readFile(actualFilePath, tt.providers)
+				if err != nil {
+					t.Errorf("readFile() error = %v, expected no error for stdin", err)
+					return
+				}
+
+				if !bytes.Equal(got, testData) {
+					t.Errorf("readFile() = %v, want %v", got, testData)
+				}
+				return
+			}
+
+			// Regular test cases
+			got, err := readFile(actualFilePath, tt.providers)
+			if (err != nil) != tt.expectError {
+				t.Errorf("readFile() error = %v, expectError %v", err, tt.expectError)
+				return
+			}
+
+			if !tt.expectError && tt.expectedData != nil {
+				if !bytes.Equal(got, tt.expectedData) {
+					t.Errorf("readFile() = %v, want %v", got, tt.expectedData)
+				}
+			}
+		})
+	}
+}
+
+// TestReadFileErrorMessages tests specific error scenarios and their messages
+func TestReadFileErrorMessages(t *testing.T) {
+	tests := []struct {
+		name      string
+		filePath  string
+		providers getter.Providers
+		wantErr   string
+	}{
+		{
+			name:      "URL parse error",
+			filePath:  "://invalid",
+			providers: getter.Providers{},
+			wantErr:   "missing protocol scheme",
+		},
+		{
+			name:      "getter error with message",
+			filePath:  "http://example.com/file",
+			providers: getter.Providers{mockProvider([]string{"http"}, nil, fmt.Errorf("connection refused"))},
+			wantErr:   "connection refused",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := readFile(tt.filePath, tt.providers)
+			if err == nil {
+				t.Errorf("readFile() expected error containing %q, got nil", tt.wantErr)
+				return
+			}
+			if !strings.Contains(err.Error(), tt.wantErr) {
+				t.Errorf("readFile() error = %v, want error containing %q", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+// Original test case - keeping for backward compatibility
+func TestReadFileOriginal(t *testing.T) {
 	var p getter.Providers
 	filePath := "%a.txt"
 	_, err := readFile(filePath, p)

From c59a0972097fb87c49361347009adda8887a8ee4 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 14:19:35 -0700
Subject: [PATCH 055/211] Remove duplicate test case from crds_test.go

The "good" test case for CRDs is done in `TestGoodChart` in lint_test.go.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds_test.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkg/lint/rules/crds_test.go b/pkg/lint/rules/crds_test.go
index 66da06121..563392377 100644
--- a/pkg/lint/rules/crds_test.go
+++ b/pkg/lint/rules/crds_test.go
@@ -24,17 +24,8 @@ import (
 	"helm.sh/helm/v4/pkg/lint/support"
 )
 
-const crdsTestBaseDir = "./testdata/goodone"
 const invalidCrdsDir = "./testdata/invalidcrdsdir"
 
-func TestCrdsDir(t *testing.T) {
-	linter := support.Linter{ChartDir: crdsTestBaseDir}
-	Crds(&linter)
-	res := linter.Messages
-
-	assert.Emptyf(t, res, "Expected no errors, got %v", res)
-}
-
 func TestInvalidCrdsDir(t *testing.T) {
 	linter := support.Linter{ChartDir: invalidCrdsDir}
 	Crds(&linter)

From cc85352a0eb03c118f8e899fd9f398dfae17054e Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 14:28:19 -0700
Subject: [PATCH 056/211] Use `assert.Len` instead of `assert.Lenf`

The default message from testify is descriptive enough.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/lint/rules/crds_test.go b/pkg/lint/rules/crds_test.go
index 563392377..d497b29ba 100644
--- a/pkg/lint/rules/crds_test.go
+++ b/pkg/lint/rules/crds_test.go
@@ -31,6 +31,6 @@ func TestInvalidCrdsDir(t *testing.T) {
 	Crds(&linter)
 	res := linter.Messages
 
-	assert.Lenf(t, res, 1, "Expected one error, got %d, %v", len(res), res)
+	assert.Len(t, res, 1)
 	assert.ErrorContains(t, res[0].Err, "not a directory")
 }

From 3a318c2fa3dcaf46d7eeca97fa5677cbddc6ba76 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 14:42:08 -0700
Subject: [PATCH 057/211] Update crds.go after
 https://github.com/helm/helm/pull/31029

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index cb867684e..3f5822cc4 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -67,7 +67,7 @@ func Crds(linter *support.Linter) {
 
 		decoder := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(crd.File.Data), 4096)
 		for {
-			var yamlStruct *K8sYamlStruct
+			var yamlStruct *k8sYamlStruct
 
 			err := decoder.Decode(&yamlStruct)
 			if err == io.EOF {
@@ -98,14 +98,14 @@ func validateCrdsDir(crdsPath string) error {
 	return nil
 }
 
-func validateCrdAPIVersion(obj *K8sYamlStruct) error {
+func validateCrdAPIVersion(obj *k8sYamlStruct) error {
 	if !strings.HasPrefix(obj.APIVersion, "apiextensions.k8s.io") {
 		return fmt.Errorf("apiVersion is not in 'apiextensions.k8s.io'")
 	}
 	return nil
 }
 
-func validateCrdKind(obj *K8sYamlStruct) error {
+func validateCrdKind(obj *k8sYamlStruct) error {
 	if obj.Kind != "CustomResourceDefinition" {
 		return fmt.Errorf("object kind is not 'CustomResourceDefinition'")
 	}

From c547d1f2ae1cf453debcae88ba70a8163cbe3800 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Mon, 7 Jul 2025 03:56:07 +0100
Subject: [PATCH 058/211] add color output functionality and tests for release
 statuses

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/environment.go       |   4 +
 pkg/cli/output/color.go      |  70 +++++++++++
 pkg/cli/output/color_test.go | 219 +++++++++++++++++++++++++++++++++++
 pkg/cmd/get_all.go           |   1 +
 pkg/cmd/install.go           |   5 +-
 pkg/cmd/list.go              |  57 +++++++--
 pkg/cmd/release_testing.go   |   1 +
 pkg/cmd/status.go            |   8 +-
 pkg/cmd/upgrade.go           |   2 +
 9 files changed, 350 insertions(+), 17 deletions(-)
 create mode 100644 pkg/cli/output/color.go
 create mode 100644 pkg/cli/output/color_test.go

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 3f2dc00b2..113eef243 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -89,6 +89,8 @@ type EnvSettings struct {
 	BurstLimit int
 	// QPS is queries per second which may be used to avoid throttling.
 	QPS float32
+	// NoColor disables colorized output
+	NoColor bool
 }
 
 func New() *EnvSettings {
@@ -109,6 +111,7 @@ func New() *EnvSettings {
 		RepositoryCache:           envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
 		BurstLimit:                envIntOr("HELM_BURST_LIMIT", defaultBurstLimit),
 		QPS:                       envFloat32Or("HELM_QPS", defaultQPS),
+		NoColor:                   envBoolOr("NO_COLOR", false),
 	}
 	env.Debug, _ = strconv.ParseBool(os.Getenv("HELM_DEBUG"))
 
@@ -160,6 +163,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.RepositoryCache, "repository-cache", s.RepositoryCache, "path to the directory containing cached repository indexes")
 	fs.IntVar(&s.BurstLimit, "burst-limit", s.BurstLimit, "client-side default throttling limit")
 	fs.Float32Var(&s.QPS, "qps", s.QPS, "queries per second used when communicating with the Kubernetes API, not including bursting")
+	fs.BoolVar(&s.NoColor, "no-color", s.NoColor, "disable colorized output")
 }
 
 func envOr(name, def string) string {
diff --git a/pkg/cli/output/color.go b/pkg/cli/output/color.go
new file mode 100644
index 000000000..9d20f770d
--- /dev/null
+++ b/pkg/cli/output/color.go
@@ -0,0 +1,70 @@
+/*
+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 output
+
+import (
+	"os"
+
+	"github.com/fatih/color"
+	"golang.org/x/term"
+
+	release "helm.sh/helm/v4/pkg/release/v1"
+)
+
+// ColorizeStatus returns a colorized version of the status string based on the status value
+func ColorizeStatus(status release.Status, noColor bool) string {
+	// Disable color if requested or if not in a terminal
+	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+		return status.String()
+	}
+
+	switch status {
+	case release.StatusDeployed:
+		return color.GreenString(status.String())
+	case release.StatusFailed:
+		return color.RedString(status.String())
+	case release.StatusPendingInstall, release.StatusPendingUpgrade, release.StatusPendingRollback, release.StatusUninstalling:
+		return color.YellowString(status.String())
+	case release.StatusUnknown:
+		return color.RedString(status.String())
+	default:
+		// For uninstalled, superseded, and any other status
+		return status.String()
+	}
+}
+
+// ColorizeHeader returns a colorized version of a header string
+func ColorizeHeader(header string, noColor bool) string {
+	// Disable color if requested or if not in a terminal
+	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+		return header
+	}
+
+	// Use bold for headers
+	return color.New(color.Bold).Sprint(header)
+}
+
+// ColorizeNamespace returns a colorized version of a namespace string
+func ColorizeNamespace(namespace string, noColor bool) string {
+	// Disable color if requested or if not in a terminal
+	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+		return namespace
+	}
+
+	// Use cyan for namespaces
+	return color.CyanString(namespace)
+}
diff --git a/pkg/cli/output/color_test.go b/pkg/cli/output/color_test.go
new file mode 100644
index 000000000..7e8ddddf0
--- /dev/null
+++ b/pkg/cli/output/color_test.go
@@ -0,0 +1,219 @@
+/*
+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 output
+
+import (
+	"os"
+	"strings"
+	"testing"
+
+	release "helm.sh/helm/v4/pkg/release/v1"
+)
+
+func TestColorizeStatus(t *testing.T) {
+	// Save original NO_COLOR env var
+	originalNoColor := os.Getenv("NO_COLOR")
+	defer func() {
+		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
+			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
+		}
+	}()
+
+	tests := []struct {
+		name       string
+		status     release.Status
+		noColor    bool
+		envNoColor string
+		wantColor  bool // whether we expect color codes in output
+	}{
+		{
+			name:       "deployed status with color",
+			status:     release.StatusDeployed,
+			noColor:    false,
+			envNoColor: "",
+			wantColor:  true,
+		},
+		{
+			name:       "deployed status without color flag",
+			status:     release.StatusDeployed,
+			noColor:    true,
+			envNoColor: "",
+			wantColor:  false,
+		},
+		{
+			name:       "deployed status with NO_COLOR env",
+			status:     release.StatusDeployed,
+			noColor:    false,
+			envNoColor: "1",
+			wantColor:  false,
+		},
+		{
+			name:       "failed status with color",
+			status:     release.StatusFailed,
+			noColor:    false,
+			envNoColor: "",
+			wantColor:  true,
+		},
+		{
+			name:       "pending install status with color",
+			status:     release.StatusPendingInstall,
+			noColor:    false,
+			envNoColor: "",
+			wantColor:  true,
+		},
+		{
+			name:       "unknown status with color",
+			status:     release.StatusUnknown,
+			noColor:    false,
+			envNoColor: "",
+			wantColor:  true,
+		},
+		{
+			name:       "superseded status with color",
+			status:     release.StatusSuperseded,
+			noColor:    false,
+			envNoColor: "",
+			wantColor:  false, // superseded doesn't get colored
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
+				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
+			}
+
+			result := ColorizeStatus(tt.status, tt.noColor)
+
+			// Check if result contains ANSI escape codes
+			hasColor := strings.Contains(result, "\033[")
+
+			// In test environment, term.IsTerminal will be false, so we won't get color
+			// unless we're testing the logic without terminal detection
+			if hasColor && !tt.wantColor {
+				t.Errorf("ColorizeStatus() returned color when none expected: %q", result)
+			}
+
+			// Always check the status text is present
+			if !strings.Contains(result, tt.status.String()) {
+				t.Errorf("ColorizeStatus() = %q, want to contain %q", result, tt.status.String())
+			}
+		})
+	}
+}
+
+func TestColorizeHeader(t *testing.T) {
+	// Save original NO_COLOR env var
+	originalNoColor := os.Getenv("NO_COLOR")
+	defer func() {
+		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
+			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
+		}
+	}()
+
+	tests := []struct {
+		name       string
+		header     string
+		noColor    bool
+		envNoColor string
+	}{
+		{
+			name:       "header with color",
+			header:     "NAME",
+			noColor:    false,
+			envNoColor: "",
+		},
+		{
+			name:       "header without color flag",
+			header:     "NAME",
+			noColor:    true,
+			envNoColor: "",
+		},
+		{
+			name:       "header with NO_COLOR env",
+			header:     "NAME",
+			noColor:    false,
+			envNoColor: "1",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
+				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
+			}
+
+			result := ColorizeHeader(tt.header, tt.noColor)
+
+			// Always check the header text is present
+			if !strings.Contains(result, tt.header) {
+				t.Errorf("ColorizeHeader() = %q, want to contain %q", result, tt.header)
+			}
+		})
+	}
+}
+
+func TestColorizeNamespace(t *testing.T) {
+	// Save original NO_COLOR env var
+	originalNoColor := os.Getenv("NO_COLOR")
+	defer func() {
+		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
+			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
+		}
+	}()
+
+	tests := []struct {
+		name       string
+		namespace  string
+		noColor    bool
+		envNoColor string
+	}{
+		{
+			name:       "namespace with color",
+			namespace:  "default",
+			noColor:    false,
+			envNoColor: "",
+		},
+		{
+			name:       "namespace without color flag",
+			namespace:  "default",
+			noColor:    true,
+			envNoColor: "",
+		},
+		{
+			name:       "namespace with NO_COLOR env",
+			namespace:  "default",
+			noColor:    false,
+			envNoColor: "1",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
+				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
+			}
+
+			result := ColorizeNamespace(tt.namespace, tt.noColor)
+
+			// Always check the namespace text is present
+			if !strings.Contains(result, tt.namespace) {
+				t.Errorf("ColorizeNamespace() = %q, want to contain %q", result, tt.namespace)
+			}
+		})
+	}
+}
diff --git a/pkg/cmd/get_all.go b/pkg/cmd/get_all.go
index aee92df51..9ada32318 100644
--- a/pkg/cmd/get_all.go
+++ b/pkg/cmd/get_all.go
@@ -63,6 +63,7 @@ func newGetAllCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        true,
 				showMetadata: true,
 				hideNotes:    false,
+				noColor:      settings.NoColor,
 			})
 		},
 	}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 3496a4bbd..78f62aa2e 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -168,6 +168,7 @@ func newInstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
+				noColor:      settings.NoColor,
 			})
 		},
 	}
@@ -237,13 +238,13 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 		client.Version = ">0.0.0-0"
 	}
 
-	name, chart, err := client.NameAndChart(args)
+	name, chartRef, err := client.NameAndChart(args)
 	if err != nil {
 		return nil, err
 	}
 	client.ReleaseName = name
 
-	cp, err := client.LocateChart(chart, settings)
+	cp, err := client.LocateChart(chartRef, settings)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index 5af43adad..a1f31459f 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -106,7 +106,7 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				}
 			}
 
-			return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat, client.NoHeaders))
+			return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat, client.NoHeaders, settings.NoColor))
 		},
 	}
 
@@ -146,9 +146,10 @@ type releaseElement struct {
 type releaseListWriter struct {
 	releases  []releaseElement
 	noHeaders bool
+	noColor   bool
 }
 
-func newReleaseListWriter(releases []*release.Release, timeFormat string, noHeaders bool) *releaseListWriter {
+func newReleaseListWriter(releases []*release.Release, timeFormat string, noHeaders bool, noColor bool) *releaseListWriter {
 	// Initialize the array so no results returns an empty array instead of null
 	elements := make([]releaseElement, 0, len(releases))
 	for _, r := range releases {
@@ -173,26 +174,58 @@ func newReleaseListWriter(releases []*release.Release, timeFormat string, noHead
 
 		elements = append(elements, element)
 	}
-	return &releaseListWriter{elements, noHeaders}
+	return &releaseListWriter{elements, noHeaders, noColor}
 }
 
-func (r *releaseListWriter) WriteTable(out io.Writer) error {
+func (w *releaseListWriter) WriteTable(out io.Writer) error {
 	table := uitable.New()
-	if !r.noHeaders {
-		table.AddRow("NAME", "NAMESPACE", "REVISION", "UPDATED", "STATUS", "CHART", "APP VERSION")
+	if !w.noHeaders {
+		table.AddRow(
+			output.ColorizeHeader("NAME", w.noColor),
+			output.ColorizeHeader("NAMESPACE", w.noColor),
+			output.ColorizeHeader("REVISION", w.noColor),
+			output.ColorizeHeader("UPDATED", w.noColor),
+			output.ColorizeHeader("STATUS", w.noColor),
+			output.ColorizeHeader("CHART", w.noColor),
+			output.ColorizeHeader("APP VERSION", w.noColor),
+		)
 	}
-	for _, r := range r.releases {
-		table.AddRow(r.Name, r.Namespace, r.Revision, r.Updated, r.Status, r.Chart, r.AppVersion)
+	for _, r := range w.releases {
+		// Parse the status string back to a release.Status to use color
+		var status release.Status
+		switch r.Status {
+		case "deployed":
+			status = release.StatusDeployed
+		case "failed":
+			status = release.StatusFailed
+		case "pending-install":
+			status = release.StatusPendingInstall
+		case "pending-upgrade":
+			status = release.StatusPendingUpgrade
+		case "pending-rollback":
+			status = release.StatusPendingRollback
+		case "uninstalling":
+			status = release.StatusUninstalling
+		case "uninstalled":
+			status = release.StatusUninstalled
+		case "superseded":
+			status = release.StatusSuperseded
+		case "unknown":
+			status = release.StatusUnknown
+		default:
+			status = release.Status(r.Status)
+		}
+		table.AddRow(r.Name, output.ColorizeNamespace(r.Namespace, w.noColor), r.Revision, r.Updated, output.ColorizeStatus(status, w.noColor), r.Chart, r.AppVersion)
 	}
 	return output.EncodeTable(out, table)
 }
 
-func (r *releaseListWriter) WriteJSON(out io.Writer) error {
-	return output.EncodeJSON(out, r.releases)
+func (w *releaseListWriter) WriteJSON(out io.Writer) error {
+	return output.EncodeJSON(out, w.releases)
 }
 
-func (r *releaseListWriter) WriteYAML(out io.Writer) error {
-	return output.EncodeYAML(out, r.releases)
+func (w *releaseListWriter) WriteYAML(out io.Writer) error {
+	return output.EncodeYAML(out, w.releases)
 }
 
 // Returns all releases from 'releases', except those with names matching 'ignoredReleases'
diff --git a/pkg/cmd/release_testing.go b/pkg/cmd/release_testing.go
index 1dac28534..e43c58145 100644
--- a/pkg/cmd/release_testing.go
+++ b/pkg/cmd/release_testing.go
@@ -78,6 +78,7 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
+				noColor:      settings.NoColor,
 			}); err != nil {
 				return err
 			}
diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go
index 2b1138786..c2960f823 100644
--- a/pkg/cmd/status.go
+++ b/pkg/cmd/status.go
@@ -84,6 +84,7 @@ func newStatusCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        false,
 				showMetadata: false,
 				hideNotes:    false,
+				noColor:      settings.NoColor,
 			})
 		},
 	}
@@ -112,6 +113,7 @@ type statusPrinter struct {
 	debug        bool
 	showMetadata bool
 	hideNotes    bool
+	noColor      bool
 }
 
 func (s statusPrinter) WriteJSON(out io.Writer) error {
@@ -130,8 +132,8 @@ func (s statusPrinter) WriteTable(out io.Writer) error {
 	if !s.release.Info.LastDeployed.IsZero() {
 		_, _ = fmt.Fprintf(out, "LAST DEPLOYED: %s\n", s.release.Info.LastDeployed.Format(time.ANSIC))
 	}
-	_, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", s.release.Namespace)
-	_, _ = fmt.Fprintf(out, "STATUS: %s\n", s.release.Info.Status.String())
+	_, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", output.ColorizeNamespace(s.release.Namespace, s.noColor))
+	_, _ = fmt.Fprintf(out, "STATUS: %s\n", output.ColorizeStatus(s.release.Info.Status, s.noColor))
 	_, _ = fmt.Fprintf(out, "REVISION: %d\n", s.release.Version)
 	if s.showMetadata {
 		_, _ = fmt.Fprintf(out, "CHART: %s\n", s.release.Chart.Metadata.Name)
@@ -218,7 +220,7 @@ func (s statusPrinter) WriteTable(out io.Writer) error {
 
 	// Hide notes from output - option in install and upgrades
 	if !s.hideNotes && len(s.release.Info.Notes) > 0 {
-		fmt.Fprintf(out, "NOTES:\n%s\n", strings.TrimSpace(s.release.Info.Notes))
+		_, _ = fmt.Fprintf(out, "NOTES:\n%s\n", strings.TrimSpace(s.release.Info.Notes))
 	}
 	return nil
 }
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index d4e7b4852..32d4f230b 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -166,6 +166,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 						debug:        settings.Debug,
 						showMetadata: false,
 						hideNotes:    instClient.HideNotes,
+						noColor:      settings.NoColor,
 					})
 				} else if err != nil {
 					return err
@@ -257,6 +258,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
+				noColor:      settings.NoColor,
 			})
 		},
 	}

From 1e00790b8c9692ab95b6c64133ed0f5d8f053930 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Mon, 7 Jul 2025 23:04:17 +0100
Subject: [PATCH 059/211] refactor tests to use t.Setenv for NO_COLOR
 environment variable

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/output/color_test.go | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/pkg/cli/output/color_test.go b/pkg/cli/output/color_test.go
index 7e8ddddf0..c84e2c359 100644
--- a/pkg/cli/output/color_test.go
+++ b/pkg/cli/output/color_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package output
 
 import (
-	"os"
 	"strings"
 	"testing"
 
@@ -25,13 +24,6 @@ import (
 )
 
 func TestColorizeStatus(t *testing.T) {
-	// Save original NO_COLOR env var
-	originalNoColor := os.Getenv("NO_COLOR")
-	defer func() {
-		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
-			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
-		}
-	}()
 
 	tests := []struct {
 		name       string
@@ -93,9 +85,7 @@ func TestColorizeStatus(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
-				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
-			}
+			t.Setenv("NO_COLOR", tt.envNoColor)
 
 			result := ColorizeStatus(tt.status, tt.noColor)
 
@@ -117,13 +107,6 @@ func TestColorizeStatus(t *testing.T) {
 }
 
 func TestColorizeHeader(t *testing.T) {
-	// Save original NO_COLOR env var
-	originalNoColor := os.Getenv("NO_COLOR")
-	defer func() {
-		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
-			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
-		}
-	}()
 
 	tests := []struct {
 		name       string
@@ -153,9 +136,7 @@ func TestColorizeHeader(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
-				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
-			}
+			t.Setenv("NO_COLOR", tt.envNoColor)
 
 			result := ColorizeHeader(tt.header, tt.noColor)
 
@@ -168,13 +149,6 @@ func TestColorizeHeader(t *testing.T) {
 }
 
 func TestColorizeNamespace(t *testing.T) {
-	// Save original NO_COLOR env var
-	originalNoColor := os.Getenv("NO_COLOR")
-	defer func() {
-		if err := os.Setenv("NO_COLOR", originalNoColor); err != nil {
-			t.Errorf("Failed to restore NO_COLOR env var: %v", err)
-		}
-	}()
 
 	tests := []struct {
 		name       string
@@ -204,9 +178,7 @@ func TestColorizeNamespace(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if err := os.Setenv("NO_COLOR", tt.envNoColor); err != nil {
-				t.Fatalf("Failed to set NO_COLOR env var: %v", err)
-			}
+			t.Setenv("NO_COLOR", tt.envNoColor)
 
 			result := ColorizeNamespace(tt.namespace, tt.noColor)
 

From eea2d4577bf08d5cac2bf8f054439db01e0cf97d Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 20:31:41 -0700
Subject: [PATCH 060/211] Raise an error if the `templates/` dir is not valid
 and return early.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/template.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index 55bc0ec89..06a5a2994 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -59,7 +59,10 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 		return
 	}
 
-	linter.RunLinterRule(support.WarningSev, fpath, validateTemplatesDir(templatesPath))
+	validTemplatesDir := linter.RunLinterRule(support.ErrorSev, fpath, validateTemplatesDir(templatesPath))
+	if !validTemplatesDir {
+		return
+	}
 
 	// Load chart and parse templates
 	chart, err := loader.Load(linter.ChartDir)

From fe114387155af63f63133899779c0dc71fcb2c85 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 20:39:22 -0700
Subject: [PATCH 061/211] Raise error instead of warning if `crds/` is not a
 valid directory

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/rules/crds.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/lint/rules/crds.go b/pkg/lint/rules/crds.go
index 3f5822cc4..1b8a73139 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/lint/rules/crds.go
@@ -42,7 +42,7 @@ func Crds(linter *support.Linter) {
 		return
 	}
 
-	crdsDirValid := linter.RunLinterRule(support.WarningSev, fpath, validateCrdsDir(crdsPath))
+	crdsDirValid := linter.RunLinterRule(support.ErrorSev, fpath, validateCrdsDir(crdsPath))
 	if !crdsDirValid {
 		return
 	}

From 35434947a36d8859e16a81c0d4349266d35f0314 Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 21:02:11 -0700
Subject: [PATCH 062/211] Return a lint warning if `templates/` does not exist.

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/action/lint_test.go                               |  6 +++---
 .../lint-chart-with-bad-subcharts-with-subcharts.txt  |  3 +++
 .../testdata/output/lint-chart-with-bad-subcharts.txt |  1 +
 pkg/cmd/testdata/output/lint-quiet-with-error.txt     |  1 +
 pkg/cmd/testdata/output/lint-quiet-with-warning.txt   |  4 ++++
 pkg/lint/rules/template.go                            | 11 ++++++++++-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkg/action/lint_test.go b/pkg/action/lint_test.go
index a01580b0a..613149a4d 100644
--- a/pkg/action/lint_test.go
+++ b/pkg/action/lint_test.go
@@ -154,12 +154,12 @@ func TestLint_ChartWithWarnings(t *testing.T) {
 		}
 	})
 
-	t.Run("should pass with no errors when strict", func(t *testing.T) {
+	t.Run("should fail with one error when strict", func(t *testing.T) {
 		testCharts := []string{chartWithNoTemplatesDir}
 		testLint := NewLint()
 		testLint.Strict = true
-		if result := testLint.Run(testCharts, values); len(result.Errors) != 0 {
-			t.Error("expected no errors, but got", len(result.Errors))
+		if result := testLint.Run(testCharts, values); len(result.Errors) != 1 {
+			t.Error("expected one error, but got", len(result.Errors))
 		}
 	})
 }
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
index 2a84d8739..7b445a69a 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
@@ -1,5 +1,6 @@
 ==> Linting testdata/testcharts/chart-with-bad-subcharts
 [INFO] Chart.yaml: icon is recommended
+[WARNING] templates/: directory does not exist
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
@@ -8,10 +9,12 @@
 [ERROR] Chart.yaml: apiVersion is required. The value must be either "v1" or "v2"
 [ERROR] Chart.yaml: version is required
 [INFO] Chart.yaml: icon is recommended
+[WARNING] templates/: directory does not exist
 [ERROR] : unable to load chart
 	validation: chart.metadata.name is required
 
 ==> Linting testdata/testcharts/chart-with-bad-subcharts/charts/good-subchart
 [INFO] Chart.yaml: icon is recommended
+[WARNING] templates/: directory does not exist
 
 Error: 3 chart(s) linted, 2 chart(s) failed
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
index 0cba1c52b..5a1c388bb 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts.txt
@@ -1,5 +1,6 @@
 ==> Linting testdata/testcharts/chart-with-bad-subcharts
 [INFO] Chart.yaml: icon is recommended
+[WARNING] templates/: directory does not exist
 [ERROR] : unable to load chart
 	error unpacking subchart bad-subchart in chart-with-bad-subcharts: validation: chart.metadata.name is required
 
diff --git a/pkg/cmd/testdata/output/lint-quiet-with-error.txt b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
index 2711d9397..0731a07d1 100644
--- a/pkg/cmd/testdata/output/lint-quiet-with-error.txt
+++ b/pkg/cmd/testdata/output/lint-quiet-with-error.txt
@@ -1,6 +1,7 @@
 ==> Linting testdata/testcharts/chart-bad-requirements
 [ERROR] Chart.yaml: unable to parse YAML
 	error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
+[WARNING] templates/: directory does not exist
 [ERROR] : unable to load chart
 	cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator
 
diff --git a/pkg/cmd/testdata/output/lint-quiet-with-warning.txt b/pkg/cmd/testdata/output/lint-quiet-with-warning.txt
index e69de29bb..ebf6c1989 100644
--- a/pkg/cmd/testdata/output/lint-quiet-with-warning.txt
+++ b/pkg/cmd/testdata/output/lint-quiet-with-warning.txt
@@ -0,0 +1,4 @@
+==> Linting testdata/testcharts/chart-with-only-crds
+[WARNING] templates/: directory does not exist
+
+1 chart(s) linted, 0 chart(s) failed
diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go
index ef355e193..b36153ec6 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/lint/rules/template.go
@@ -55,7 +55,8 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 	templatesPath := filepath.Join(linter.ChartDir, fpath)
 
 	// Templates directory is optional for now
-	if _, err := os.Stat(templatesPath); errors.Is(err, os.ErrNotExist) {
+	templatesDirExists := linter.RunLinterRule(support.WarningSev, fpath, templatesDirExists(templatesPath))
+	if !templatesDirExists {
 		return
 	}
 
@@ -197,6 +198,14 @@ func validateTopIndentLevel(content string) error {
 }
 
 // Validation functions
+func templatesDirExists(templatesPath string) error {
+	_, err := os.Stat(templatesPath)
+	if errors.Is(err, os.ErrNotExist) {
+		return errors.New("directory does not exist")
+	}
+	return nil
+}
+
 func validateTemplatesDir(templatesPath string) error {
 	fi, err := os.Stat(templatesPath)
 	if err != nil {

From 1002ec5ae981b5dd4517b8a75bd4d088efab0bbd Mon Sep 17 00:00:00 2001
From: Zach Burgess <zachburg@google.com>
Date: Mon, 7 Jul 2025 21:11:05 -0700
Subject: [PATCH 063/211] Update tests in lint_test.go

Signed-off-by: Zach Burgess <zachburg@google.com>
---
 pkg/lint/lint_test.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go
index 6e7f40ef6..63cf017e4 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/lint/lint_test.go
@@ -39,18 +39,23 @@ const invalidChartFileDir = "rules/testdata/invalidchartfile"
 
 func TestBadChart(t *testing.T) {
 	m := RunAll(badChartDir, values, namespace).Messages
-	if len(m) != 7 {
+	if len(m) != 8 {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
-	// There should be one INFO, and 2 ERROR messages, check for them
-	var i, e, e2, e3, e4, e5, e6 bool
+	// There should be one INFO, one WARNING, and 2 ERROR messages, check for them
+	var i, w, e, e2, e3, e4, e5, e6 bool
 	for _, msg := range m {
 		if msg.Severity == support.InfoSev {
 			if strings.Contains(msg.Err.Error(), "icon is recommended") {
 				i = true
 			}
 		}
+		if msg.Severity == support.WarningSev {
+			if strings.Contains(msg.Err.Error(), "does not exist") {
+				w = true
+			}
+		}
 		if msg.Severity == support.ErrorSev {
 			if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVer") {
 				e = true
@@ -76,7 +81,7 @@ func TestBadChart(t *testing.T) {
 			}
 		}
 	}
-	if !e || !e2 || !e3 || !e4 || !e5 || !i || !e6 {
+	if !e || !e2 || !e3 || !e4 || !e5 || !i || !e6 || !w {
 		t.Errorf("Didn't find all the expected errors, got %#v", m)
 	}
 }
@@ -93,7 +98,7 @@ func TestInvalidYaml(t *testing.T) {
 
 func TestInvalidChartYaml(t *testing.T) {
 	m := RunAll(invalidChartFileDir, values, namespace).Messages
-	if len(m) != 1 {
+	if len(m) != 2 {
 		t.Fatalf("All didn't fail with expected errors, got %#v", m)
 	}
 	if !strings.Contains(m[0].Err.Error(), "failed to strictly parse chart metadata file") {

From 4310b2bc36763864014ecd85ac7716c109156126 Mon Sep 17 00:00:00 2001
From: naving1989 <navinag1989@gmail.com>
Date: Tue, 8 Jul 2025 11:04:51 +0530
Subject: [PATCH 064/211] Fixed linting issues Signed-off-by: naving1989
 <navinag1989@gmail.com>

---
 pkg/cli/values/options_test.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/cli/values/options_test.go b/pkg/cli/values/options_test.go
index 0086d31cb..4dbc709f1 100644
--- a/pkg/cli/values/options_test.go
+++ b/pkg/cli/values/options_test.go
@@ -35,7 +35,7 @@ type mockGetter struct {
 	err     error
 }
 
-func (m *mockGetter) Get(url string, options ...getter.Option) (*bytes.Buffer, error) {
+func (m *mockGetter) Get(_ string, _ ...getter.Option) (*bytes.Buffer, error) {
 	if m.err != nil {
 		return nil, m.err
 	}
@@ -87,6 +87,7 @@ func TestReadFile(t *testing.T) {
 			filePath:  "test.txt",
 			providers: getter.Providers{},
 			setupFunc: func(t *testing.T) (string, func()) {
+				t.Helper()
 				tmpDir := t.TempDir()
 				filePath := filepath.Join(tmpDir, "test.txt")
 				content := []byte("local file content")
@@ -147,6 +148,7 @@ func TestReadFile(t *testing.T) {
 				mockProvider([]string{"http"}, []byte("should not be used"), nil),
 			},
 			setupFunc: func(t *testing.T) (string, func()) {
+				t.Helper()
 				// Create a local file named "ftp://example.com/file.txt"
 				// This tests the fallback behavior when scheme is not supported
 				tmpDir := t.TempDir()

From 46b1a41631a01fd85011710646157f96d458ed4d Mon Sep 17 00:00:00 2001
From: Yuriy Losev <yuriy.losev@flant.com>
Date: Fri, 27 Jun 2025 13:51:24 +0400
Subject: [PATCH 065/211] Add release labels to the release Metadata

Signed-off-by: Yuriy Losev <yuriy.losev@flant.com>
---
 pkg/action/get_metadata.go                | 14 +++++---
 pkg/action/get_metadata_test.go           | 42 +++++++++++++++++++++++
 pkg/cmd/get_metadata.go                   |  1 +
 pkg/cmd/get_metadata_test.go              |  8 ++---
 pkg/cmd/testdata/output/get-metadata.json |  2 +-
 pkg/cmd/testdata/output/get-metadata.txt  |  1 +
 pkg/cmd/testdata/output/get-metadata.yaml |  2 ++
 pkg/release/v1/mock.go                    |  6 ++++
 8 files changed, 66 insertions(+), 10 deletions(-)
 create mode 100644 pkg/action/get_metadata_test.go

diff --git a/pkg/action/get_metadata.go b/pkg/action/get_metadata.go
index e760ae4d1..4cb77361a 100644
--- a/pkg/action/get_metadata.go
+++ b/pkg/action/get_metadata.go
@@ -34,11 +34,14 @@ type GetMetadata struct {
 }
 
 type Metadata struct {
-	Name         string              `json:"name" yaml:"name"`
-	Chart        string              `json:"chart" yaml:"chart"`
-	Version      string              `json:"version" yaml:"version"`
-	AppVersion   string              `json:"appVersion" yaml:"appVersion"`
-	Annotations  map[string]string   `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	Name       string `json:"name" yaml:"name"`
+	Chart      string `json:"chart" yaml:"chart"`
+	Version    string `json:"version" yaml:"version"`
+	AppVersion string `json:"appVersion" yaml:"appVersion"`
+	// Annotations are fetched from the Chart.yaml file
+	Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
+	// Labels of the release which are stored in driver metadata fields storage
+	Labels       map[string]string   `json:"labels,omitempty" yaml:"labels,omitempty"`
 	Dependencies []*chart.Dependency `json:"dependencies,omitempty" yaml:"dependencies,omitempty"`
 	Namespace    string              `json:"namespace" yaml:"namespace"`
 	Revision     int                 `json:"revision" yaml:"revision"`
@@ -71,6 +74,7 @@ func (g *GetMetadata) Run(name string) (*Metadata, error) {
 		AppVersion:   rel.Chart.Metadata.AppVersion,
 		Dependencies: rel.Chart.Metadata.Dependencies,
 		Annotations:  rel.Chart.Metadata.Annotations,
+		Labels:       rel.Labels,
 		Namespace:    rel.Namespace,
 		Revision:     rel.Version,
 		Status:       rel.Info.Status.String(),
diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
new file mode 100644
index 000000000..08e99d8d6
--- /dev/null
+++ b/pkg/action/get_metadata_test.go
@@ -0,0 +1,42 @@
+/*
+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 action
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	release "helm.sh/helm/v4/pkg/release/v1"
+)
+
+func TestGetMetadata_Labels(t *testing.T) {
+	rel := releaseStub()
+	rel.Info.Status = release.StatusDeployed
+	customLabels := map[string]string{"key1": "value1", "key2": "value2"}
+	rel.Labels = customLabels
+
+	metaGetter := NewGetMetadata(actionConfigFixture(t))
+	err := metaGetter.cfg.Releases.Create(rel)
+	assert.NoError(t, err)
+
+	metadata, err := metaGetter.Run(rel.Name)
+	assert.NoError(t, err)
+
+	assert.Equal(t, metadata.Name, rel.Name)
+	assert.Equal(t, metadata.Labels, customLabels)
+}
diff --git a/pkg/cmd/get_metadata.go b/pkg/cmd/get_metadata.go
index 9f58e0f4e..aea149f5e 100644
--- a/pkg/cmd/get_metadata.go
+++ b/pkg/cmd/get_metadata.go
@@ -80,6 +80,7 @@ func (w metadataWriter) WriteTable(out io.Writer) error {
 	_, _ = fmt.Fprintf(out, "VERSION: %v\n", w.metadata.Version)
 	_, _ = fmt.Fprintf(out, "APP_VERSION: %v\n", w.metadata.AppVersion)
 	_, _ = fmt.Fprintf(out, "ANNOTATIONS: %v\n", k8sLabels.Set(w.metadata.Annotations).String())
+	_, _ = fmt.Fprintf(out, "LABELS: %v\n", k8sLabels.Set(w.metadata.Labels).String())
 	_, _ = fmt.Fprintf(out, "DEPENDENCIES: %v\n", w.metadata.FormattedDepNames())
 	_, _ = fmt.Fprintf(out, "NAMESPACE: %v\n", w.metadata.Namespace)
 	_, _ = fmt.Fprintf(out, "REVISION: %v\n", w.metadata.Revision)
diff --git a/pkg/cmd/get_metadata_test.go b/pkg/cmd/get_metadata_test.go
index a2ab2cba1..59fc3b82c 100644
--- a/pkg/cmd/get_metadata_test.go
+++ b/pkg/cmd/get_metadata_test.go
@@ -27,23 +27,23 @@ func TestGetMetadataCmd(t *testing.T) {
 		name:   "get metadata with a release",
 		cmd:    "get metadata thomas-guide",
 		golden: "output/get-metadata.txt",
-		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide"})},
+		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide", Labels: map[string]string{"key1": "value1"}})},
 	}, {
 		name:      "get metadata requires release name arg",
 		cmd:       "get metadata",
 		golden:    "output/get-metadata-args.txt",
-		rels:      []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide"})},
+		rels:      []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide", Labels: map[string]string{"key1": "value1"}})},
 		wantError: true,
 	}, {
 		name:   "get metadata to json",
 		cmd:    "get metadata thomas-guide --output json",
 		golden: "output/get-metadata.json",
-		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide"})},
+		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide", Labels: map[string]string{"key1": "value1"}})},
 	}, {
 		name:   "get metadata to yaml",
 		cmd:    "get metadata thomas-guide --output yaml",
 		golden: "output/get-metadata.yaml",
-		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide"})},
+		rels:   []*release.Release{release.Mock(&release.MockReleaseOptions{Name: "thomas-guide", Labels: map[string]string{"key1": "value1"}})},
 	}}
 	runTestCmd(t, tests)
 }
diff --git a/pkg/cmd/testdata/output/get-metadata.json b/pkg/cmd/testdata/output/get-metadata.json
index 4c015b977..9166f87ac 100644
--- a/pkg/cmd/testdata/output/get-metadata.json
+++ b/pkg/cmd/testdata/output/get-metadata.json
@@ -1 +1 @@
-{"name":"thomas-guide","chart":"foo","version":"0.1.0-beta.1","appVersion":"1.0","annotations":{"category":"web-apps","supported":"true"},"dependencies":[{"name":"cool-plugin","version":"1.0.0","repository":"https://coolplugin.io/charts","condition":"coolPlugin.enabled","enabled":true},{"name":"crds","version":"2.7.1","repository":"","condition":"crds.enabled"}],"namespace":"default","revision":1,"status":"deployed","deployedAt":"1977-09-02T22:04:05Z"}
+{"name":"thomas-guide","chart":"foo","version":"0.1.0-beta.1","appVersion":"1.0","annotations":{"category":"web-apps","supported":"true"},"labels":{"key1":"value1"},"dependencies":[{"name":"cool-plugin","version":"1.0.0","repository":"https://coolplugin.io/charts","condition":"coolPlugin.enabled","enabled":true},{"name":"crds","version":"2.7.1","repository":"","condition":"crds.enabled"}],"namespace":"default","revision":1,"status":"deployed","deployedAt":"1977-09-02T22:04:05Z"}
diff --git a/pkg/cmd/testdata/output/get-metadata.txt b/pkg/cmd/testdata/output/get-metadata.txt
index 01083b333..5744083dd 100644
--- a/pkg/cmd/testdata/output/get-metadata.txt
+++ b/pkg/cmd/testdata/output/get-metadata.txt
@@ -3,6 +3,7 @@ CHART: foo
 VERSION: 0.1.0-beta.1
 APP_VERSION: 1.0
 ANNOTATIONS: category=web-apps,supported=true
+LABELS: key1=value1
 DEPENDENCIES: cool-plugin,crds
 NAMESPACE: default
 REVISION: 1
diff --git a/pkg/cmd/testdata/output/get-metadata.yaml b/pkg/cmd/testdata/output/get-metadata.yaml
index 6298436c9..98f567837 100644
--- a/pkg/cmd/testdata/output/get-metadata.yaml
+++ b/pkg/cmd/testdata/output/get-metadata.yaml
@@ -14,6 +14,8 @@ dependencies:
   repository: ""
   version: 2.7.1
 deployedAt: "1977-09-02T22:04:05Z"
+labels:
+  key1: value1
 name: thomas-guide
 namespace: default
 revision: 1
diff --git a/pkg/release/v1/mock.go b/pkg/release/v1/mock.go
index 9ca57284c..3d3b0c2e2 100644
--- a/pkg/release/v1/mock.go
+++ b/pkg/release/v1/mock.go
@@ -46,6 +46,7 @@ type MockReleaseOptions struct {
 	Chart     *chart.Chart
 	Status    Status
 	Namespace string
+	Labels    map[string]string
 }
 
 // Mock creates a mock release object based on options set by MockReleaseOptions. This function should typically not be used outside of testing.
@@ -66,6 +67,10 @@ func Mock(opts *MockReleaseOptions) *Release {
 	if namespace == "" {
 		namespace = "default"
 	}
+	var labels map[string]string
+	if len(opts.Labels) > 0 {
+		labels = opts.Labels
+	}
 
 	ch := opts.Chart
 	if opts.Chart == nil {
@@ -130,5 +135,6 @@ func Mock(opts *MockReleaseOptions) *Release {
 			},
 		},
 		Manifest: MockManifest,
+		Labels:   labels,
 	}
 }

From 82bc9adcc20711f6159bdd88e3d762e5782c8676 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 9 Jul 2025 12:59:19 -0600
Subject: [PATCH 066/211] fix: test teardown dns data race

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/utils_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index e8fcba4e3..b270e51cc 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -29,6 +29,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/distribution/distribution/v3/configuration"
@@ -172,6 +173,9 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
 }
 
 func teardown(suite *TestSuite) {
+	var lock sync.Mutex
+	lock.Lock()
+	defer lock.Unlock()
 	if suite.srv != nil {
 		mockdns.UnpatchNet(net.DefaultResolver)
 		suite.srv.Close()

From 4ff0d50f66e6fbfdf8ef518028ed57e14a7af86a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 22:09:15 +0000
Subject: [PATCH 067/211] chore(deps): bump golang.org/x/text from 0.26.0 to
 0.27.0

Bumps [golang.org/x/text](https://github.com/golang/text) from 0.26.0 to 0.27.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.26.0...v0.27.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-version: 0.27.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  8 ++++----
 go.sum | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 106c499b2..30e7d8123 100644
--- a/go.mod
+++ b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.39.0
 	golang.org/x/term v0.32.0
-	golang.org/x/text v0.26.0
+	golang.org/x/text v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.2
 	k8s.io/apiextensions-apiserver v0.33.2
@@ -157,12 +157,12 @@ require (
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.3 // indirect
 	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.29.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/tools v0.33.0 // indirect
+	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.68.1 // indirect
diff --git a/go.sum b/go.sum
index 8d8fe710e..26a9cb1a0 100644
--- a/go.sum
+++ b/go.sum
@@ -411,8 +411,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
 golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -425,8 +425,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -466,8 +466,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
 golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -478,8 +478,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
-golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 2da734d0b26067cda01d39738f9e7e4830e61e8e Mon Sep 17 00:00:00 2001
From: jingchanglu <jingchanglu@outlook.com>
Date: Thu, 10 Jul 2025 15:36:39 +0800
Subject: [PATCH 068/211] chore: fix typo in pkg/repo/chartrepo.go

Signed-off-by: jingchanglu <jingchanglu@outlook.com>
---
 pkg/repo/chartrepo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/repo/chartrepo.go b/pkg/repo/chartrepo.go
index e41226fa4..c54197d60 100644
--- a/pkg/repo/chartrepo.go
+++ b/pkg/repo/chartrepo.go
@@ -160,7 +160,7 @@ func WithClientTLS(certFile, keyFile, caFile string) FindChartInRepoURLOption {
 	}
 }
 
-// WithInsecureSkipTLSverify skips TLS verification for repostory communication
+// WithInsecureSkipTLSverify skips TLS verification for repository communication
 func WithInsecureSkipTLSverify(insecureSkipTLSverify bool) FindChartInRepoURLOption {
 	return func(options *findChartInRepoURLOptions) {
 		options.InsecureSkipTLSverify = insecureSkipTLSverify

From c1740e9081b3fc4590b0bf9bfedf0d94905600d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:32:48 +0000
Subject: [PATCH 069/211] chore(deps): bump golang.org/x/term from 0.32.0 to
 0.33.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.32.0 to 0.33.0.
- [Commits](https://github.com/golang/term/compare/v0.32.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 30e7d8123..0925bd7ec 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.39.0
-	golang.org/x/term v0.32.0
+	golang.org/x/term v0.33.0
 	golang.org/x/text v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.2
@@ -160,7 +160,7 @@ require (
 	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.29.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
 	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
diff --git a/go.sum b/go.sum
index 26a9cb1a0..250a34ee0 100644
--- a/go.sum
+++ b/go.sum
@@ -448,8 +448,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -457,8 +457,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
+golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

From 91a76463279134128bf57490cab57a35e1ac74c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 21:17:57 +0000
Subject: [PATCH 070/211] chore(deps): bump golang.org/x/crypto from 0.39.0 to
 0.40.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.39.0 to 0.40.0.
- [Commits](https://github.com/golang/crypto/compare/v0.39.0...v0.40.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.40.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 0c2017de7..94d8de776 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/crypto v0.39.0
+	golang.org/x/crypto v0.40.0
 	golang.org/x/term v0.33.0
 	golang.org/x/text v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
index 250a34ee0..263e9dcc3 100644
--- a/go.sum
+++ b/go.sum
@@ -388,8 +388,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.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
 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=

From 80b95c00d5061370d4490f6d4afe096e1ae884c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jul 2025 21:18:03 +0000
Subject: [PATCH 071/211] chore(deps): bump sigs.k8s.io/kustomize/kyaml from
 0.19.0 to 0.20.0

Bumps [sigs.k8s.io/kustomize/kyaml](https://github.com/kubernetes-sigs/kustomize) from 0.19.0 to 0.20.0.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](https://github.com/kubernetes-sigs/kustomize/compare/api/v0.19.0...api/v0.20.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/kyaml
  dependency-version: 0.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 0c2017de7..62d7ef682 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	k8s.io/kubectl v0.33.2
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
-	sigs.k8s.io/kustomize/kyaml v0.19.0
+	sigs.k8s.io/kustomize/kyaml v0.20.0
 	sigs.k8s.io/yaml v1.5.0
 )
 
diff --git a/go.sum b/go.sum
index 250a34ee0..9343941d0 100644
--- a/go.sum
+++ b/go.sum
@@ -536,8 +536,8 @@ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7np
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
 sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
-sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
-sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
+sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
+sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

From 8096f09370e9f7b78f8129f9afc8036987c0a257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <danilo.buerger@helsing.ai>
Date: Fri, 11 Jul 2025 13:11:33 +0200
Subject: [PATCH 072/211] Pass credentials when either chart repo or repo dont
 specify a port but it matches the default port of that scheme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Danilo Bürger <danilo.buerger@helsing.ai>
---
 pkg/action/install.go | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index 440f41baa..ae50327fe 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -746,6 +746,21 @@ OUTER:
 	return nil
 }
 
+func portOrDefault(u *url.URL) string {
+	if p := u.Port(); p != "" {
+		return p
+	}
+
+	switch u.Scheme {
+	case "http":
+		return "80"
+	case "https":
+		return "443"
+	default:
+		return ""
+	}
+}
+
 // LocateChart looks for a chart directory in known places, and returns either the full path or an error.
 //
 // This does not ensure that the chart is well-formed; only that the requested filename exists.
@@ -833,7 +848,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 		// Host on URL (returned from url.Parse) contains the port if present.
 		// This check ensures credentials are not passed between different
 		// services on different ports.
-		if c.PassCredentialsAll || (u1.Scheme == u2.Scheme && u1.Host == u2.Host) {
+		if c.PassCredentialsAll || (u1.Scheme == u2.Scheme && u1.Hostname() == u2.Hostname() && portOrDefault(u1) == portOrDefault(u2)) {
 			dl.Options = append(dl.Options, getter.WithBasicAuth(c.Username, c.Password))
 		} else {
 			dl.Options = append(dl.Options, getter.WithBasicAuth("", ""))

From d50d22c9704f6cceca25b0b0f43aae681d87438b Mon Sep 17 00:00:00 2001
From: Khwaja Faraz Ahmed <khwaja.ahmed@securiti.ai>
Date: Fri, 11 Jul 2025 17:09:23 +0500
Subject: [PATCH 073/211] Add test coverage for get_values/metadata.go

Signed-off-by: Khwaja Faraz Ahmed <khwaja.ahmed@securiti.ai>
Signed-off-by: Khwaja Faraz Ahmed <khwajafarazahmed@gmail.com>
---
 pkg/action/get_metadata_test.go | 435 ++++++++++++++++++++++++++++++++
 pkg/action/get_values_test.go   | 228 +++++++++++++++++
 2 files changed, 663 insertions(+)
 create mode 100644 pkg/action/get_metadata_test.go
 create mode 100644 pkg/action/get_values_test.go

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
new file mode 100644
index 000000000..bde71265d
--- /dev/null
+++ b/pkg/action/get_metadata_test.go
@@ -0,0 +1,435 @@
+/*
+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 action
+
+import (
+	"errors"
+	"io"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	kubefake "helm.sh/helm/v4/pkg/kube/fake"
+	release "helm.sh/helm/v4/pkg/release/v1"
+	helmtime "helm.sh/helm/v4/pkg/time"
+)
+
+// unreachableKubeClient is a test client that always returns an error for IsReachable
+type unreachableKubeClientForMetadata struct {
+	kubefake.PrintingKubeClient
+}
+
+func (u *unreachableKubeClientForMetadata) IsReachable() error {
+	return errors.New("connection refused")
+}
+
+func TestNewGetMetadata(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	assert.NotNil(t, client)
+	assert.Equal(t, cfg, client.cfg)
+	assert.Equal(t, 0, client.Version)
+}
+
+func TestGetMetadata_Run_BasicMetadata(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "test-chart",
+				Version:    "1.0.0",
+				AppVersion: "v1.2.3",
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, "1.0.0", result.Version)
+	assert.Equal(t, "v1.2.3", result.AppVersion)
+	assert.Equal(t, "default", result.Namespace)
+	assert.Equal(t, 1, result.Revision)
+	assert.Equal(t, "deployed", result.Status)
+	assert.Equal(t, deployedTime.Format(time.RFC3339), result.DeployedAt)
+	assert.Empty(t, result.Dependencies)
+	assert.Empty(t, result.Annotations)
+}
+
+func TestGetMetadata_Run_WithDependencies(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	dependencies := []*chart.Dependency{
+		{
+			Name:       "mysql",
+			Version:    "8.0.25",
+			Repository: "https://charts.bitnami.com/bitnami",
+		},
+		{
+			Name:       "redis",
+			Version:    "6.2.4",
+			Repository: "https://charts.bitnami.com/bitnami",
+		},
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:         "test-chart",
+				Version:      "1.0.0",
+				AppVersion:   "v1.2.3",
+				Dependencies: dependencies,
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, "1.0.0", result.Version)
+	assert.Equal(t, dependencies, result.Dependencies)
+	assert.Len(t, result.Dependencies, 2)
+	assert.Equal(t, "mysql", result.Dependencies[0].Name)
+	assert.Equal(t, "redis", result.Dependencies[1].Name)
+}
+
+func TestGetMetadata_Run_WithAnnotations(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	annotations := map[string]string{
+		"helm.sh/hook":        "pre-install",
+		"helm.sh/hook-weight": "5",
+		"custom.annotation":   "test-value",
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:        "test-chart",
+				Version:     "1.0.0",
+				AppVersion:  "v1.2.3",
+				Annotations: annotations,
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, annotations, result.Annotations)
+	assert.Equal(t, "pre-install", result.Annotations["helm.sh/hook"])
+	assert.Equal(t, "5", result.Annotations["helm.sh/hook-weight"])
+	assert.Equal(t, "test-value", result.Annotations["custom.annotation"])
+}
+
+func TestGetMetadata_Run_SpecificVersion(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+	client.Version = 2
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	rel1 := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusSuperseded,
+			LastDeployed: helmtime.Time{Time: deployedTime.Time.Add(-time.Hour)},
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "test-chart",
+				Version:    "1.0.0",
+				AppVersion: "v1.0.0",
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	rel2 := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "test-chart",
+				Version:    "1.1.0",
+				AppVersion: "v1.1.0",
+			},
+		},
+		Version:   2,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel1)
+	cfg.Releases.Create(rel2)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, "1.1.0", result.Version)
+	assert.Equal(t, "v1.1.0", result.AppVersion)
+	assert.Equal(t, 2, result.Revision)
+	assert.Equal(t, "deployed", result.Status)
+}
+
+func TestGetMetadata_Run_DifferentStatuses(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	testCases := []struct {
+		name     string
+		status   release.Status
+		expected string
+	}{
+		{"deployed", release.StatusDeployed, "deployed"},
+		{"failed", release.StatusFailed, "failed"},
+		{"uninstalled", release.StatusUninstalled, "uninstalled"},
+		{"pending-install", release.StatusPendingInstall, "pending-install"},
+		{"pending-upgrade", release.StatusPendingUpgrade, "pending-upgrade"},
+		{"pending-rollback", release.StatusPendingRollback, "pending-rollback"},
+		{"superseded", release.StatusSuperseded, "superseded"},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			releaseName := "test-release-" + tc.name
+			deployedTime := helmtime.Now()
+
+			rel := &release.Release{
+				Name: releaseName,
+				Info: &release.Info{
+					Status:       tc.status,
+					LastDeployed: deployedTime,
+				},
+				Chart: &chart.Chart{
+					Metadata: &chart.Metadata{
+						Name:       "test-chart",
+						Version:    "1.0.0",
+						AppVersion: "v1.0.0",
+					},
+				},
+				Version:   1,
+				Namespace: "default",
+			}
+
+			cfg.Releases.Create(rel)
+
+			result, err := client.Run(releaseName)
+			require.NoError(t, err)
+
+			assert.Equal(t, tc.expected, result.Status)
+		})
+	}
+}
+
+func TestGetMetadata_Run_UnreachableKubeClient(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	cfg.KubeClient = &unreachableKubeClientForMetadata{
+		PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard},
+	}
+
+	client := NewGetMetadata(cfg)
+
+	_, err := client.Run("test-release")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "connection refused")
+}
+
+func TestGetMetadata_Run_ReleaseNotFound(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	_, err := client.Run("non-existent-release")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "not found")
+}
+
+func TestGetMetadata_Run_EmptyAppVersion(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "test-chart",
+				Version:    "1.0.0",
+				AppVersion: "", // Empty app version
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, "", result.AppVersion)
+}
+
+func TestMetadata_FormattedDepNames(t *testing.T) {
+	testCases := []struct {
+		name         string
+		dependencies []*chart.Dependency
+		expected     string
+	}{
+		{
+			name:         "no dependencies",
+			dependencies: []*chart.Dependency{},
+			expected:     "",
+		},
+		{
+			name: "single dependency",
+			dependencies: []*chart.Dependency{
+				{Name: "mysql"},
+			},
+			expected: "mysql",
+		},
+		{
+			name: "multiple dependencies sorted",
+			dependencies: []*chart.Dependency{
+				{Name: "redis"},
+				{Name: "mysql"},
+				{Name: "nginx"},
+			},
+			expected: "mysql,nginx,redis",
+		},
+		{
+			name: "already sorted dependencies",
+			dependencies: []*chart.Dependency{
+				{Name: "apache"},
+				{Name: "mysql"},
+				{Name: "zookeeper"},
+			},
+			expected: "apache,mysql,zookeeper",
+		},
+		{
+			name: "duplicate names",
+			dependencies: []*chart.Dependency{
+				{Name: "mysql"},
+				{Name: "redis"},
+				{Name: "mysql"},
+			},
+			expected: "mysql,mysql,redis",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			metadata := &Metadata{
+				Dependencies: tc.dependencies,
+			}
+
+			result := metadata.FormattedDepNames()
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}
+
+func TestMetadata_FormattedDepNames_WithComplexDependencies(t *testing.T) {
+	dependencies := []*chart.Dependency{
+		{
+			Name:       "zookeeper",
+			Version:    "10.0.0",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Condition:  "zookeeper.enabled",
+		},
+		{
+			Name:       "apache",
+			Version:    "9.0.0",
+			Repository: "https://charts.bitnami.com/bitnami",
+		},
+		{
+			Name:       "mysql",
+			Version:    "8.0.25",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Condition:  "mysql.enabled",
+		},
+	}
+
+	metadata := &Metadata{
+		Dependencies: dependencies,
+	}
+
+	result := metadata.FormattedDepNames()
+	assert.Equal(t, "apache,mysql,zookeeper", result)
+}
diff --git a/pkg/action/get_values_test.go b/pkg/action/get_values_test.go
new file mode 100644
index 000000000..30ee7ecee
--- /dev/null
+++ b/pkg/action/get_values_test.go
@@ -0,0 +1,228 @@
+/*
+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 action
+
+import (
+	"errors"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+	kubefake "helm.sh/helm/v4/pkg/kube/fake"
+	release "helm.sh/helm/v4/pkg/release/v1"
+)
+
+// unreachableKubeClient is a test client that always returns an error for IsReachable
+type unreachableKubeClient struct {
+	kubefake.PrintingKubeClient
+}
+
+func (u *unreachableKubeClient) IsReachable() error {
+	return errors.New("connection refused")
+}
+
+func TestNewGetValues(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+
+	assert.NotNil(t, client)
+	assert.Equal(t, cfg, client.cfg)
+	assert.Equal(t, 0, client.Version)
+	assert.Equal(t, false, client.AllValues)
+}
+
+func TestGetValues_Run_UserConfigOnly(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+
+	releaseName := "test-release"
+	userConfig := map[string]interface{}{
+		"database": map[string]interface{}{
+			"host": "localhost",
+			"port": 5432,
+		},
+		"app": map[string]interface{}{
+			"name":     "my-app",
+			"replicas": 3,
+		},
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status: release.StatusDeployed,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:    "test-chart",
+				Version: "1.0.0",
+			},
+			Values: map[string]interface{}{
+				"defaultKey": "defaultValue",
+				"app": map[string]interface{}{
+					"name":    "default-app",
+					"timeout": 30,
+				},
+			},
+		},
+		Config:    userConfig,
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+	assert.Equal(t, userConfig, result)
+}
+
+func TestGetValues_Run_AllValues(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+	client.AllValues = true
+
+	releaseName := "test-release"
+	userConfig := map[string]interface{}{
+		"database": map[string]interface{}{
+			"host": "localhost",
+			"port": 5432,
+		},
+		"app": map[string]interface{}{
+			"name": "my-app",
+		},
+	}
+
+	chartDefaultValues := map[string]interface{}{
+		"defaultKey": "defaultValue",
+		"app": map[string]interface{}{
+			"name":    "default-app",
+			"timeout": 30,
+		},
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status: release.StatusDeployed,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:    "test-chart",
+				Version: "1.0.0",
+			},
+			Values: chartDefaultValues,
+		},
+		Config:    userConfig,
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, "my-app", result["app"].(map[string]interface{})["name"])
+	assert.Equal(t, 30, result["app"].(map[string]interface{})["timeout"])
+	assert.Equal(t, "defaultValue", result["defaultKey"])
+	assert.Equal(t, "localhost", result["database"].(map[string]interface{})["host"])
+	assert.Equal(t, 5432, result["database"].(map[string]interface{})["port"])
+}
+
+func TestGetValues_Run_EmptyValues(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+
+	releaseName := "test-release"
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status: release.StatusDeployed,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:    "test-chart",
+				Version: "1.0.0",
+			},
+		},
+		Config:    map[string]interface{}{},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+	assert.Equal(t, map[string]interface{}{}, result)
+}
+
+func TestGetValues_Run_UnreachableKubeClient(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	cfg.KubeClient = &unreachableKubeClient{
+		PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard},
+	}
+
+	client := NewGetValues(cfg)
+
+	_, err := client.Run("test-release")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "connection refused")
+}
+
+func TestGetValues_Run_ReleaseNotFound(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+
+	_, err := client.Run("non-existent-release")
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "not found")
+}
+
+func TestGetValues_Run_NilConfig(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetValues(cfg)
+
+	releaseName := "test-release"
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status: release.StatusDeployed,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:    "test-chart",
+				Version: "1.0.0",
+			},
+		},
+		Config:    nil,
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+	assert.Nil(t, result)
+}

From 96c54a2963ad71bc6627fbe3f7992ab1dd418cbc Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Fri, 11 Jul 2025 20:27:05 +0100
Subject: [PATCH 074/211] refactor color output functions to simplify noColor
 checks

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/output/color.go | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkg/cli/output/color.go b/pkg/cli/output/color.go
index 9d20f770d..93bbbe56e 100644
--- a/pkg/cli/output/color.go
+++ b/pkg/cli/output/color.go
@@ -17,18 +17,15 @@ limitations under the License.
 package output
 
 import (
-	"os"
-
 	"github.com/fatih/color"
-	"golang.org/x/term"
 
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
 
 // ColorizeStatus returns a colorized version of the status string based on the status value
 func ColorizeStatus(status release.Status, noColor bool) string {
-	// Disable color if requested or if not in a terminal
-	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+	// Disable color if requested
+	if noColor {
 		return status.String()
 	}
 
@@ -49,8 +46,8 @@ func ColorizeStatus(status release.Status, noColor bool) string {
 
 // ColorizeHeader returns a colorized version of a header string
 func ColorizeHeader(header string, noColor bool) string {
-	// Disable color if requested or if not in a terminal
-	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+	// Disable color if requested
+	if noColor {
 		return header
 	}
 
@@ -60,8 +57,8 @@ func ColorizeHeader(header string, noColor bool) string {
 
 // ColorizeNamespace returns a colorized version of a namespace string
 func ColorizeNamespace(namespace string, noColor bool) string {
-	// Disable color if requested or if not in a terminal
-	if noColor || os.Getenv("NO_COLOR") != "" || !term.IsTerminal(int(os.Stdout.Fd())) {
+	// Disable color if requested
+	if noColor {
 		return namespace
 	}
 

From b72db06c4925e1f4e0a986aa44da2b643117dacf Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Fri, 11 Jul 2025 20:52:40 +0100
Subject: [PATCH 075/211] refactor: replace NoColor with ColorMode for improved
 color output control

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/environment.go     | 48 ++++++++++++++++++++++++++++++++++----
 pkg/cmd/get_all.go         |  2 +-
 pkg/cmd/install.go         |  2 +-
 pkg/cmd/list.go            |  2 +-
 pkg/cmd/release_testing.go |  2 +-
 pkg/cmd/root.go            | 38 ++++++++++++++++++++++++++++++
 pkg/cmd/status.go          |  2 +-
 pkg/cmd/upgrade.go         |  4 ++--
 8 files changed, 89 insertions(+), 11 deletions(-)

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 113eef243..223a7cb15 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -89,8 +89,8 @@ type EnvSettings struct {
 	BurstLimit int
 	// QPS is queries per second which may be used to avoid throttling.
 	QPS float32
-	// NoColor disables colorized output
-	NoColor bool
+	// ColorMode controls colorized output (never, auto, always)
+	ColorMode string
 }
 
 func New() *EnvSettings {
@@ -111,7 +111,7 @@ func New() *EnvSettings {
 		RepositoryCache:           envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
 		BurstLimit:                envIntOr("HELM_BURST_LIMIT", defaultBurstLimit),
 		QPS:                       envFloat32Or("HELM_QPS", defaultQPS),
-		NoColor:                   envBoolOr("NO_COLOR", false),
+		ColorMode:                 envColorMode(),
 	}
 	env.Debug, _ = strconv.ParseBool(os.Getenv("HELM_DEBUG"))
 
@@ -163,7 +163,8 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.RepositoryCache, "repository-cache", s.RepositoryCache, "path to the directory containing cached repository indexes")
 	fs.IntVar(&s.BurstLimit, "burst-limit", s.BurstLimit, "client-side default throttling limit")
 	fs.Float32Var(&s.QPS, "qps", s.QPS, "queries per second used when communicating with the Kubernetes API, not including bursting")
-	fs.BoolVar(&s.NoColor, "no-color", s.NoColor, "disable colorized output")
+	fs.StringVar(&s.ColorMode, "color", s.ColorMode, "use colored output (never, auto, always)")
+	fs.StringVar(&s.ColorMode, "colour", s.ColorMode, "use colored output (never, auto, always)")
 }
 
 func envOr(name, def string) string {
@@ -217,6 +218,23 @@ func envCSV(name string) (ls []string) {
 	return
 }
 
+func envColorMode() string {
+	// Check NO_COLOR environment variable first (standard)
+	if v, ok := os.LookupEnv("NO_COLOR"); ok && v != "" {
+		return "never"
+	}
+	// Check HELM_COLOR environment variable
+	if v, ok := os.LookupEnv("HELM_COLOR"); ok {
+		v = strings.ToLower(v)
+		switch v {
+		case "never", "auto", "always":
+			return v
+		}
+	}
+	// Default to auto
+	return "auto"
+}
+
 func (s *EnvSettings) EnvVars() map[string]string {
 	envvars := map[string]string{
 		"HELM_BIN":               os.Args[0],
@@ -269,3 +287,25 @@ func (s *EnvSettings) SetNamespace(namespace string) {
 func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter {
 	return s.config
 }
+
+// ColorEnabled returns true if color output should be enabled based on the ColorMode setting
+func (s *EnvSettings) ColorEnabled() bool {
+	switch s.ColorMode {
+	case "never":
+		return false
+	case "always":
+		return true
+	case "auto":
+		// Auto mode is handled by fatih/color's built-in terminal detection
+		// We just need to not override it
+		return true
+	default:
+		return true
+	}
+}
+
+// ShouldDisableColor returns true if color output should be disabled
+// This is the inverse of ColorEnabled for backward compatibility with noColor parameters
+func (s *EnvSettings) ShouldDisableColor() bool {
+	return s.ColorMode == "never"
+}
diff --git a/pkg/cmd/get_all.go b/pkg/cmd/get_all.go
index 9ada32318..32744796c 100644
--- a/pkg/cmd/get_all.go
+++ b/pkg/cmd/get_all.go
@@ -63,7 +63,7 @@ func newGetAllCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        true,
 				showMetadata: true,
 				hideNotes:    false,
-				noColor:      settings.NoColor,
+				noColor:      settings.ShouldDisableColor(),
 			})
 		},
 	}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 78f62aa2e..f1a7b18c8 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -168,7 +168,7 @@ func newInstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
-				noColor:      settings.NoColor,
+				noColor:      settings.ShouldDisableColor(),
 			})
 		},
 	}
diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index a1f31459f..016d7663a 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -106,7 +106,7 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				}
 			}
 
-			return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat, client.NoHeaders, settings.NoColor))
+			return outfmt.Write(out, newReleaseListWriter(results, client.TimeFormat, client.NoHeaders, settings.ShouldDisableColor()))
 		},
 	}
 
diff --git a/pkg/cmd/release_testing.go b/pkg/cmd/release_testing.go
index e43c58145..b43b67ca0 100644
--- a/pkg/cmd/release_testing.go
+++ b/pkg/cmd/release_testing.go
@@ -78,7 +78,7 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
-				noColor:      settings.NoColor,
+				noColor:      settings.ShouldDisableColor(),
 			}); err != nil {
 				return err
 			}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 4eb5da494..8451821b6 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"
 
@@ -80,6 +81,8 @@ Environment variables:
 | $HELM_KUBETLS_SERVER_NAME          | set the server name used to validate the Kubernetes API server certificate                                 |
 | $HELM_BURST_LIMIT                  | set the default burst limit in the case the server contains many CRDs (default 100, -1 to disable)         |
 | $HELM_QPS                          | set the Queries Per Second in cases where a high number of calls exceed the option for higher burst values |
+| $HELM_COLOR                        | set color output mode. Allowed values: never, always, auto (default: auto)                                 |
+| $NO_COLOR                          | set to any non-empty value to disable all colored output (overrides $HELM_COLOR)                           |
 
 Helm stores cache, configuration, and data based on the following configuration order:
 
@@ -129,6 +132,20 @@ func SetupLogging(debug bool) {
 	slog.SetDefault(logger)
 }
 
+// configureColorOutput configures the color output based on the ColorMode setting
+func configureColorOutput(settings *cli.EnvSettings) {
+	switch settings.ColorMode {
+	case "never":
+		color.NoColor = true
+	case "always":
+		color.NoColor = false
+	case "auto":
+		// Let fatih/color handle automatic detection
+		// It will check if output is a terminal and NO_COLOR env var
+		// We don't need to do anything here
+	}
+}
+
 func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, args []string, logSetup func(bool)) (*cobra.Command, error) {
 	cmd := &cobra.Command{
 		Use:          "helm",
@@ -160,6 +177,27 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	flags.Parse(args)
 
 	logSetup(settings.Debug)
+	
+	// Validate color mode setting
+	switch settings.ColorMode {
+	case "never", "auto", "always":
+		// Valid color mode
+	default:
+		return nil, fmt.Errorf("invalid color mode %q: must be one of: never, auto, always", settings.ColorMode)
+	}
+	
+	// Configure color output based on ColorMode setting
+	configureColorOutput(settings)
+
+	// Setup shell completion for the color flag
+	_ = cmd.RegisterFlagCompletionFunc("color", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
+		return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp
+	})
+	
+	// Setup shell completion for the colour flag
+	_ = cmd.RegisterFlagCompletionFunc("colour", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
+		return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp
+	})
 
 	// Setup shell completion for the namespace flag
 	err := cmd.RegisterFlagCompletionFunc("namespace", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go
index c2960f823..2177df922 100644
--- a/pkg/cmd/status.go
+++ b/pkg/cmd/status.go
@@ -84,7 +84,7 @@ func newStatusCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        false,
 				showMetadata: false,
 				hideNotes:    false,
-				noColor:      settings.NoColor,
+				noColor:      settings.ShouldDisableColor(),
 			})
 		},
 	}
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index 32d4f230b..50e18299d 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -166,7 +166,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 						debug:        settings.Debug,
 						showMetadata: false,
 						hideNotes:    instClient.HideNotes,
-						noColor:      settings.NoColor,
+						noColor:      settings.ShouldDisableColor(),
 					})
 				} else if err != nil {
 					return err
@@ -258,7 +258,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				debug:        settings.Debug,
 				showMetadata: false,
 				hideNotes:    client.HideNotes,
-				noColor:      settings.NoColor,
+				noColor:      settings.ShouldDisableColor(),
 			})
 		},
 	}

From ba8f70ae0b63198868495f510768747b25ddf042 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Fri, 11 Jul 2025 21:04:27 +0100
Subject: [PATCH 076/211] refactor: move color package to internal/cli/output

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 {pkg => internal}/cli/output/color.go      |  0
 {pkg => internal}/cli/output/color_test.go |  0
 pkg/cmd/list.go                            | 17 +++++++++--------
 pkg/cmd/status.go                          |  5 +++--
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename {pkg => internal}/cli/output/color.go (100%)
 rename {pkg => internal}/cli/output/color_test.go (100%)

diff --git a/pkg/cli/output/color.go b/internal/cli/output/color.go
similarity index 100%
rename from pkg/cli/output/color.go
rename to internal/cli/output/color.go
diff --git a/pkg/cli/output/color_test.go b/internal/cli/output/color_test.go
similarity index 100%
rename from pkg/cli/output/color_test.go
rename to internal/cli/output/color_test.go
diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index 016d7663a..a0041d16c 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -28,6 +28,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/action"
 	"helm.sh/helm/v4/pkg/cli/output"
+	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
@@ -181,13 +182,13 @@ func (w *releaseListWriter) WriteTable(out io.Writer) error {
 	table := uitable.New()
 	if !w.noHeaders {
 		table.AddRow(
-			output.ColorizeHeader("NAME", w.noColor),
-			output.ColorizeHeader("NAMESPACE", w.noColor),
-			output.ColorizeHeader("REVISION", w.noColor),
-			output.ColorizeHeader("UPDATED", w.noColor),
-			output.ColorizeHeader("STATUS", w.noColor),
-			output.ColorizeHeader("CHART", w.noColor),
-			output.ColorizeHeader("APP VERSION", w.noColor),
+			coloroutput.ColorizeHeader("NAME", w.noColor),
+			coloroutput.ColorizeHeader("NAMESPACE", w.noColor),
+			coloroutput.ColorizeHeader("REVISION", w.noColor),
+			coloroutput.ColorizeHeader("UPDATED", w.noColor),
+			coloroutput.ColorizeHeader("STATUS", w.noColor),
+			coloroutput.ColorizeHeader("CHART", w.noColor),
+			coloroutput.ColorizeHeader("APP VERSION", w.noColor),
 		)
 	}
 	for _, r := range w.releases {
@@ -215,7 +216,7 @@ func (w *releaseListWriter) WriteTable(out io.Writer) error {
 		default:
 			status = release.Status(r.Status)
 		}
-		table.AddRow(r.Name, output.ColorizeNamespace(r.Namespace, w.noColor), r.Revision, r.Updated, output.ColorizeStatus(status, w.noColor), r.Chart, r.AppVersion)
+		table.AddRow(r.Name, coloroutput.ColorizeNamespace(r.Namespace, w.noColor), r.Revision, r.Updated, coloroutput.ColorizeStatus(status, w.noColor), r.Chart, r.AppVersion)
 	}
 	return output.EncodeTable(out, table)
 }
diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go
index 2177df922..3198d468f 100644
--- a/pkg/cmd/status.go
+++ b/pkg/cmd/status.go
@@ -31,6 +31,7 @@ import (
 	"helm.sh/helm/v4/pkg/action"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/cli/output"
+	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
@@ -132,8 +133,8 @@ func (s statusPrinter) WriteTable(out io.Writer) error {
 	if !s.release.Info.LastDeployed.IsZero() {
 		_, _ = fmt.Fprintf(out, "LAST DEPLOYED: %s\n", s.release.Info.LastDeployed.Format(time.ANSIC))
 	}
-	_, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", output.ColorizeNamespace(s.release.Namespace, s.noColor))
-	_, _ = fmt.Fprintf(out, "STATUS: %s\n", output.ColorizeStatus(s.release.Info.Status, s.noColor))
+	_, _ = fmt.Fprintf(out, "NAMESPACE: %s\n", coloroutput.ColorizeNamespace(s.release.Namespace, s.noColor))
+	_, _ = fmt.Fprintf(out, "STATUS: %s\n", coloroutput.ColorizeStatus(s.release.Info.Status, s.noColor))
 	_, _ = fmt.Fprintf(out, "REVISION: %d\n", s.release.Version)
 	if s.showMetadata {
 		_, _ = fmt.Fprintf(out, "CHART: %s\n", s.release.Chart.Metadata.Name)

From d28343550ffecab72bbf35563312934f27f79231 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Fri, 11 Jul 2025 21:08:32 +0100
Subject: [PATCH 077/211] feat: make color output opt-in by default

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/environment.go | 4 ++--
 pkg/cmd/root.go        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 223a7cb15..111338e8a 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -231,8 +231,8 @@ func envColorMode() string {
 			return v
 		}
 	}
-	// Default to auto
-	return "auto"
+	// Default to never (disabled) until more commands support color
+	return "never"
 }
 
 func (s *EnvSettings) EnvVars() map[string]string {
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 8451821b6..3d0180d86 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -81,7 +81,7 @@ Environment variables:
 | $HELM_KUBETLS_SERVER_NAME          | set the server name used to validate the Kubernetes API server certificate                                 |
 | $HELM_BURST_LIMIT                  | set the default burst limit in the case the server contains many CRDs (default 100, -1 to disable)         |
 | $HELM_QPS                          | set the Queries Per Second in cases where a high number of calls exceed the option for higher burst values |
-| $HELM_COLOR                        | set color output mode. Allowed values: never, always, auto (default: auto)                                 |
+| $HELM_COLOR                        | set color output mode. Allowed values: never, always, auto (default: never)                                |
 | $NO_COLOR                          | set to any non-empty value to disable all colored output (overrides $HELM_COLOR)                           |
 
 Helm stores cache, configuration, and data based on the following configuration order:

From c1b3a835141ae404f3ecafd856ba63c307d18688 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Fri, 11 Jul 2025 21:19:16 +0100
Subject: [PATCH 078/211] refactor: clean up color output imports in list,
 root, and status files

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cmd/list.go   | 2 +-
 pkg/cmd/root.go   | 6 +++---
 pkg/cmd/status.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index a0041d16c..55d828036 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -26,9 +26,9 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
+	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/action"
 	"helm.sh/helm/v4/pkg/cli/output"
-	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 3d0180d86..f43ce7abe 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -177,7 +177,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	flags.Parse(args)
 
 	logSetup(settings.Debug)
-	
+
 	// Validate color mode setting
 	switch settings.ColorMode {
 	case "never", "auto", "always":
@@ -185,7 +185,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	default:
 		return nil, fmt.Errorf("invalid color mode %q: must be one of: never, auto, always", settings.ColorMode)
 	}
-	
+
 	// Configure color output based on ColorMode setting
 	configureColorOutput(settings)
 
@@ -193,7 +193,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	_ = cmd.RegisterFlagCompletionFunc("color", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp
 	})
-	
+
 	// Setup shell completion for the colour flag
 	_ = cmd.RegisterFlagCompletionFunc("colour", func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 		return []string{"never", "auto", "always"}, cobra.ShellCompDirectiveNoFileComp
diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go
index 3198d468f..aa836f9f3 100644
--- a/pkg/cmd/status.go
+++ b/pkg/cmd/status.go
@@ -28,10 +28,10 @@ import (
 
 	"k8s.io/kubectl/pkg/cmd/get"
 
+	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/action"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/cli/output"
-	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
 )

From 055c4e2bec10895a50a9a0d8e3692120217835e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <info@danilobuerger.de>
Date: Sun, 13 Jul 2025 15:38:54 +0200
Subject: [PATCH 079/211] Moved url comparison to own function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Danilo Bürger <info@danilobuerger.de>
---
 pkg/action/install.go      |  6 +++-
 pkg/action/install_test.go | 66 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index ae50327fe..d9da2f14f 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -761,6 +761,10 @@ func portOrDefault(u *url.URL) string {
 	}
 }
 
+func urlEqual(u1, u2 *url.URL) bool {
+	return u1.Scheme == u2.Scheme && u1.Hostname() == u2.Hostname() && portOrDefault(u1) == portOrDefault(u2)
+}
+
 // LocateChart looks for a chart directory in known places, and returns either the full path or an error.
 //
 // This does not ensure that the chart is well-formed; only that the requested filename exists.
@@ -848,7 +852,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 		// Host on URL (returned from url.Parse) contains the port if present.
 		// This check ensures credentials are not passed between different
 		// services on different ports.
-		if c.PassCredentialsAll || (u1.Scheme == u2.Scheme && u1.Hostname() == u2.Hostname() && portOrDefault(u1) == portOrDefault(u2)) {
+		if c.PassCredentialsAll || urlEqual(u1, u2) {
 			dl.Options = append(dl.Options, getter.WithBasicAuth(c.Username, c.Password))
 		} else {
 			dl.Options = append(dl.Options, getter.WithBasicAuth("", ""))
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 6c2c91d0a..1882f19e7 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -24,6 +24,7 @@ import (
 	"io"
 	"io/fs"
 	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -933,3 +934,68 @@ func TestInstallWithSystemLabels(t *testing.T) {
 
 	is.Equal(fmt.Errorf("user supplied labels contains system reserved label name. System labels: %+v", driver.GetSystemLabels()), err)
 }
+
+func TestUrlEqual(t *testing.T) {
+	is := assert.New(t)
+
+	tests := []struct {
+		name     string
+		url1     string
+		url2     string
+		expected bool
+	}{
+		{
+			name:     "identical URLs",
+			url1:     "https://example.com:443",
+			url2:     "https://example.com:443",
+			expected: true,
+		},
+		{
+			name:     "same host, scheme, default HTTPS port vs explicit",
+			url1:     "https://example.com",
+			url2:     "https://example.com:443",
+			expected: true,
+		},
+		{
+			name:     "same host, scheme, default HTTP port vs explicit",
+			url1:     "http://example.com",
+			url2:     "http://example.com:80",
+			expected: true,
+		},
+		{
+			name:     "different schemes",
+			url1:     "http://example.com",
+			url2:     "https://example.com",
+			expected: false,
+		},
+		{
+			name:     "different hosts",
+			url1:     "https://example.com",
+			url2:     "https://www.example.com",
+			expected: false,
+		},
+		{
+			name:     "different ports",
+			url1:     "https://example.com:8080",
+			url2:     "https://example.com:9090",
+			expected: false,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			u1, err := url.Parse(tc.url1)
+			if err != nil {
+				t.Fatalf("Failed to parse URL1 %s: %v", tc.url1, err)
+			}
+			u2, err := url.Parse(tc.url2)
+			if err != nil {
+				t.Fatalf("Failed to parse URL2 %s: %v", tc.url2, err)
+			}
+
+			is.Equal(tc.expected, urlEqual(u1, u2))
+		})
+	}
+}

From 8650f28250a4a9648d3cb36b9ce144a26530e13b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jul 2025 02:05:03 +0000
Subject: [PATCH 080/211] chore(deps): bump github.com/fluxcd/cli-utils

Bumps [github.com/fluxcd/cli-utils](https://github.com/fluxcd/cli-utils) from 0.36.0-flux.13 to 0.36.0-flux.14.
- [Commits](https://github.com/fluxcd/cli-utils/compare/v0.36.0-flux.13...v0.36.0-flux.14)

---
updated-dependencies:
- dependency-name: github.com/fluxcd/cli-utils
  dependency-version: 0.36.0-flux.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 44 ++++++++++++++--------------
 go.sum | 92 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/go.mod b/go.mod
index 0633a3897..e19d71e77 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
-	github.com/fluxcd/cli-utils v0.36.0-flux.13
+	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3
 	github.com/gofrs/flock v0.12.1
@@ -57,6 +57,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
+	github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
@@ -68,23 +69,22 @@ require (
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/btree v1.1.3 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/handlers v1.5.2 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
@@ -120,9 +120,9 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.22.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.65.0 // indirect
+	github.com/prometheus/procfs v0.17.0 // indirect
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect
 	github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 // indirect
 	github.com/redis/go-redis/v9 v9.7.3 // indirect
@@ -136,7 +136,7 @@ require (
 	go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 // indirect
 	go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
@@ -149,33 +149,33 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
 	go.opentelemetry.io/otel/log v0.8.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	go.yaml.in/yaml/v3 v3.0.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/mod v0.25.0 // indirect
 	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/oauth2 v0.29.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.68.1 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	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
 	k8s.io/component-base v0.33.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
-	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
+	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
-	sigs.k8s.io/kustomize/api v0.19.0 // indirect
+	sigs.k8s.io/kustomize/api v0.20.0 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 )
diff --git a/go.sum b/go.sum
index a08c1a672..4fff82bcc 100644
--- a/go.sum
+++ b/go.sum
@@ -42,6 +42,8 @@ github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdb
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
+github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -75,8 +77,8 @@ github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
-github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
-github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
+github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
@@ -85,14 +87,14 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fluxcd/cli-utils v0.36.0-flux.13 h1:2X5yjz/rk9mg7+bMFBDZKGKzeZpAmY2s6iwbNZz7OzM=
-github.com/fluxcd/cli-utils v0.36.0-flux.13/go.mod h1:b2iSoIeDTtjfCB0IKtGgqlhhvWa1oux3e90CjOf81oA=
+github.com/fluxcd/cli-utils v0.36.0-flux.14 h1:I//AMVUXTc+M04UtIXArMXQZCazGMwfemodV1j/yG8c=
+github.com/fluxcd/cli-utils v0.36.0-flux.14/go.mod h1:uDo7BYOfbdmk/asnHuI0IQPl6u0FCgcN54AHDu3Y5As=
 github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI=
 github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
-github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
+github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
@@ -101,18 +103,18 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
 github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
+github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
 github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
 github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
+github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -133,17 +135,15 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
 github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
-github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
+github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
+github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
-github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE=
@@ -266,17 +266,17 @@ github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/
 github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
+github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
+github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
 github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
 github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc=
@@ -330,8 +330,8 @@ go.opentelemetry.io/contrib/exporters/autoexport v0.57.0 h1:jmTVJ86dP60C01K3slFQ
 go.opentelemetry.io/contrib/exporters/autoexport v0.57.0/go.mod h1:EJBheUMttD/lABFyLXhce47Wr6DPWYReCzaZiXadH7g=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q=
-go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
-go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 h1:WzNab7hOOLzdDF/EoWCt4glhrbMPVMOO5JYTmpz36Ls=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0/go.mod h1:hKvJwTzJdp90Vh7p6q/9PAOd55dI6WA6sWj62a/JvSs=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 h1:S+LdBGiQXtJdowoJoQPEtI52syEP/JYBUpjO49EQhV8=
@@ -356,16 +356,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsu
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s=
 go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk=
 go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8=
-go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
-go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
 go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
 go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
 go.opentelemetry.io/otel/sdk/log v0.8.0 h1:zg7GUYXqxk1jnGF/dTdLPrK06xJdrXgqgFLnI4Crxvs=
 go.opentelemetry.io/otel/sdk/log v0.8.0/go.mod h1:50iXr0UVwQrYS45KbruFrEt4LvAdCaWWgIrsN3ZQggo=
 go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
 go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
-go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
-go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
 go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
 go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
@@ -378,8 +378,8 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
-go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
-go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -413,8 +413,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
 golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
-golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
-golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -468,8 +468,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
 golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -490,8 +490,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
 google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -522,27 +522,27 @@ k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
 k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
-k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 h1:gAXU86Fmbr/ktY17lkHwSjw5aoThQvhnstGGIYKlKYc=
+k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
 k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
 k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
-k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
-k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
+k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
 oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
 sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
 sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
-sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=
+sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
+sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
 sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
 sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
-sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
+sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
 sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=

From 8c22fbfe4a06b86eaf5296b93487aabcc83659fb Mon Sep 17 00:00:00 2001
From: yumeiyin <yin.yumei@qq.com>
Date: Mon, 14 Jul 2025 16:21:15 +0800
Subject: [PATCH 081/211] refactor: replace Split in loops with more efficient
 SplitSeq

Signed-off-by: yumeiyin <yin.yumei@qq.com>
---
 pkg/chart/v2/util/dependencies.go   | 2 +-
 pkg/cmd/load_plugins.go             | 2 +-
 pkg/release/util/manifest_sorter.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/chart/v2/util/dependencies.go b/pkg/chart/v2/util/dependencies.go
index e2cce6f2f..f34144526 100644
--- a/pkg/chart/v2/util/dependencies.go
+++ b/pkg/chart/v2/util/dependencies.go
@@ -38,7 +38,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
 		return
 	}
 	for _, r := range reqs {
-		for _, c := range strings.Split(strings.TrimSpace(r.Condition), ",") {
+		for c := range strings.SplitSeq(strings.TrimSpace(r.Condition), ",") {
 			if len(c) > 0 {
 				// retrieve value
 				vv, err := cvals.PathValue(cpath + c)
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index 385990d82..5c7f618eb 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -350,7 +350,7 @@ func pluginDynamicComp(plug *plugin.Plugin, cmd *cobra.Command, args []string, t
 	}
 
 	var completions []string
-	for _, comp := range strings.Split(buf.String(), "\n") {
+	for comp := range strings.SplitSeq(buf.String(), "\n") {
 		// Remove any empty lines
 		if len(comp) > 0 {
 			completions = append(completions, comp)
diff --git a/pkg/release/util/manifest_sorter.go b/pkg/release/util/manifest_sorter.go
index be93ad1ed..21fdec7c6 100644
--- a/pkg/release/util/manifest_sorter.go
+++ b/pkg/release/util/manifest_sorter.go
@@ -185,7 +185,7 @@ func (file *manifestFile) sort(result *result) error {
 		}
 
 		isUnknownHook := false
-		for _, hookType := range strings.Split(hookTypes, ",") {
+		for hookType := range strings.SplitSeq(hookTypes, ",") {
 			hookType = strings.ToLower(strings.TrimSpace(hookType))
 			e, ok := events[hookType]
 			if !ok {
@@ -236,7 +236,7 @@ func calculateHookWeight(entry SimpleHead) int {
 // operateAnnotationValues finds the given annotation and runs the operate function with the value of that annotation
 func operateAnnotationValues(entry SimpleHead, annotation string, operate func(p string)) {
 	if dps, ok := entry.Metadata.Annotations[annotation]; ok {
-		for _, dp := range strings.Split(dps, ",") {
+		for dp := range strings.SplitSeq(dps, ",") {
 			dp = strings.ToLower(strings.TrimSpace(dp))
 			operate(dp)
 		}

From 74f2805f01de5e5dd5f449fcccb81b7a391cf641 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Sun, 15 Jun 2025 11:31:48 -0700
Subject: [PATCH 082/211] Rename 'force' to 'force-replace'

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/install.go  | 13 ++++++++-----
 pkg/action/rollback.go | 19 +++++++++++--------
 pkg/action/upgrade.go  |  8 ++++----
 pkg/action/validate.go |  6 +++---
 pkg/cmd/install.go     |  4 +++-
 pkg/cmd/rollback.go    |  4 +++-
 pkg/cmd/upgrade.go     |  6 ++++--
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index 440f41baa..2904965de 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -71,8 +71,11 @@ type Install struct {
 
 	ChartPathOptions
 
-	ClientOnly      bool
-	Force           bool
+	ClientOnly bool
+	// ForceReplace will, if set to `true`, ignore certain warnings and perform the install anyway.
+	//
+	// This should be used with caution.
+	ForceReplace    bool
 	CreateNamespace bool
 	DryRun          bool
 	DryRunOption    string
@@ -346,7 +349,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		return nil, fmt.Errorf("unable to build kubernetes objects from release manifest: %w", err)
 	}
 
-	// It is safe to use "force" here because these are resources currently rendered by the chart.
+	// It is safe to use "forceOwnership" here because these are resources currently rendered by the chart.
 	err = resources.Visit(setMetadataVisitor(rel.Name, rel.Namespace, true))
 	if err != nil {
 		return nil, err
@@ -468,9 +471,9 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 		_, err = i.cfg.KubeClient.Create(resources)
 	} else if len(resources) > 0 {
 		if i.TakeOwnership {
-			_, err = i.cfg.KubeClient.(kube.InterfaceThreeWayMerge).UpdateThreeWayMerge(toBeAdopted, resources, i.Force)
+			_, err = i.cfg.KubeClient.(kube.InterfaceThreeWayMerge).UpdateThreeWayMerge(toBeAdopted, resources, i.ForceReplace)
 		} else {
-			_, err = i.cfg.KubeClient.Update(toBeAdopted, resources, i.Force)
+			_, err = i.cfg.KubeClient.Update(toBeAdopted, resources, i.ForceReplace)
 		}
 	}
 	if err != nil {
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index 1dc0c7f84..f529fa422 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -35,13 +35,16 @@ import (
 type Rollback struct {
 	cfg *Configuration
 
-	Version       int
-	Timeout       time.Duration
-	WaitStrategy  kube.WaitStrategy
-	WaitForJobs   bool
-	DisableHooks  bool
-	DryRun        bool
-	Force         bool // will (if true) force resource upgrade through uninstall/recreate if needed
+	Version      int
+	Timeout      time.Duration
+	WaitStrategy kube.WaitStrategy
+	WaitForJobs  bool
+	DisableHooks bool
+	DryRun       bool
+	// ForceReplace will, if set to `true`, ignore certain warnings and perform the rollback anyway.
+	//
+	// This should be used with caution.
+	ForceReplace  bool
 	CleanupOnFail bool
 	MaxHistory    int // MaxHistory limits the maximum number of revisions saved per release
 }
@@ -187,7 +190,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 	if err != nil {
 		return targetRelease, fmt.Errorf("unable to set metadata visitor from target release: %w", err)
 	}
-	results, err := r.cfg.KubeClient.Update(current, target, r.Force)
+	results, err := r.cfg.KubeClient.Update(current, target, r.ForceReplace)
 
 	if err != nil {
 		msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 271bc8aa9..0567c8de2 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -77,10 +77,10 @@ type Upgrade struct {
 	// HideSecret can be set to true when DryRun is enabled in order to hide
 	// Kubernetes Secrets in the output. It cannot be used outside of DryRun.
 	HideSecret bool
-	// Force will, if set to `true`, ignore certain warnings and perform the upgrade anyway.
+	// ForceReplace will, if set to `true`, ignore certain warnings and perform the upgrade anyway.
 	//
 	// This should be used with caution.
-	Force bool
+	ForceReplace bool
 	// ResetValues will reset the values to the chart's built-ins rather than merging with existing.
 	ResetValues bool
 	// ReuseValues will reuse the user's last supplied values.
@@ -426,7 +426,7 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 		slog.Debug("upgrade hooks disabled", "name", upgradedRelease.Name)
 	}
 
-	results, err := u.cfg.KubeClient.Update(current, target, u.Force)
+	results, err := u.cfg.KubeClient.Update(current, target, u.ForceReplace)
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
 		u.reportToPerformUpgrade(c, upgradedRelease, results.Created, err)
@@ -525,7 +525,7 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 		}
 		rollin.WaitForJobs = u.WaitForJobs
 		rollin.DisableHooks = u.DisableHooks
-		rollin.Force = u.Force
+		rollin.ForceReplace = u.ForceReplace
 		rollin.Timeout = u.Timeout
 		if rollErr := rollin.Run(rel.Name); rollErr != nil {
 			return rel, fmt.Errorf("an error occurred while rolling back the release. original upgrade error: %w: %w", err, rollErr)
diff --git a/pkg/action/validate.go b/pkg/action/validate.go
index e1021860f..761ccba47 100644
--- a/pkg/action/validate.go
+++ b/pkg/action/validate.go
@@ -130,16 +130,16 @@ func requireValue(meta map[string]string, k, v string) error {
 	return nil
 }
 
-// setMetadataVisitor adds release tracking metadata to all resources. If force is enabled, existing
+// setMetadataVisitor adds release tracking metadata to all resources. If forceOwnership is enabled, existing
 // ownership metadata will be overwritten. Otherwise an error will be returned if any resource has an
 // existing and conflicting value for the managed by label or Helm release/namespace annotations.
-func setMetadataVisitor(releaseName, releaseNamespace string, force bool) resource.VisitorFunc {
+func setMetadataVisitor(releaseName, releaseNamespace string, forceOwnership bool) resource.VisitorFunc {
 	return func(info *resource.Info, err error) error {
 		if err != nil {
 			return err
 		}
 
-		if !force {
+		if !forceOwnership {
 			if err := checkOwnership(info.Object, releaseName, releaseNamespace); err != nil {
 				return fmt.Errorf("%s cannot be owned: %s", resourceString(info), err)
 			}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 3496a4bbd..7fca8585a 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -192,7 +192,9 @@ func addInstallFlags(cmd *cobra.Command, f *pflag.FlagSet, client *action.Instal
 	// The true/false part is meant to reflect some legacy behavior while none is equal to "".
 	f.StringVar(&client.DryRunOption, "dry-run", "", "simulate an install. If --dry-run is set with no option being specified or as '--dry-run=client', it will not attempt cluster connections. Setting '--dry-run=server' allows attempting cluster connections.")
 	f.Lookup("dry-run").NoOptDefVal = "client"
-	f.BoolVar(&client.Force, "force", false, "force resource updates through a replacement strategy")
+	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
+	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
+	f.MarkDeprecated("force", "use --force-replace instead")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during install")
 	f.BoolVar(&client.Replace, "replace", false, "reuse the given name, only if that name is a deleted release which remains in the history. This is unsafe in production")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
diff --git a/pkg/cmd/rollback.go b/pkg/cmd/rollback.go
index 6658d3fd6..4b7f3016d 100644
--- a/pkg/cmd/rollback.go
+++ b/pkg/cmd/rollback.go
@@ -77,7 +77,9 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 
 	f := cmd.Flags()
 	f.BoolVar(&client.DryRun, "dry-run", false, "simulate a rollback")
-	f.BoolVar(&client.Force, "force", false, "force resource update through delete/recreate if needed")
+	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
+	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
+	f.MarkDeprecated("force", "use --force-replace instead")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during rollback")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
 	f.BoolVar(&client.WaitForJobs, "wait-for-jobs", false, "if set and --wait enabled, will wait until all Jobs have been completed before marking the release as successful. It will wait for as long as --timeout")
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index d4e7b4852..ced4bb526 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -130,7 +130,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 					instClient := action.NewInstall(cfg)
 					instClient.CreateNamespace = createNamespace
 					instClient.ChartPathOptions = client.ChartPathOptions
-					instClient.Force = client.Force
+					instClient.ForceReplace = client.ForceReplace
 					instClient.DryRun = client.DryRun
 					instClient.DryRunOption = client.DryRunOption
 					instClient.DisableHooks = client.DisableHooks
@@ -268,7 +268,9 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.StringVar(&client.DryRunOption, "dry-run", "", "simulate an install. If --dry-run is set with no option being specified or as '--dry-run=client', it will not attempt cluster connections. Setting '--dry-run=server' allows attempting cluster connections.")
 	f.BoolVar(&client.HideSecret, "hide-secret", false, "hide Kubernetes Secrets when also using the --dry-run flag")
 	f.Lookup("dry-run").NoOptDefVal = "client"
-	f.BoolVar(&client.Force, "force", false, "force resource updates through a replacement strategy")
+	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
+	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
+	f.MarkDeprecated("force", "use --force-replace instead")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "disable pre/post upgrade hooks")
 	f.BoolVar(&client.DisableOpenAPIValidation, "disable-openapi-validation", false, "if set, the upgrade process will not validate rendered templates against the Kubernetes OpenAPI Schema")
 	f.BoolVar(&client.SkipCRDs, "skip-crds", false, "if set, no CRDs will be installed when an upgrade is performed with install flag enabled. By default, CRDs are installed if not already present, when an upgrade is performed with install flag enabled")

From 250ce7b5dc95356753bf76a73cbbcf23c9f32042 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Tue, 15 Jul 2025 09:50:00 -0600
Subject: [PATCH 083/211] chore: improve OCI debug logging

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/transport.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/registry/transport.go b/pkg/registry/transport.go
index 7b9c6744b..a82229e2f 100644
--- a/pkg/registry/transport.go
+++ b/pkg/registry/transport.go
@@ -81,14 +81,14 @@ func NewTransport(debug bool) *retry.Transport {
 func (t *LoggingTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
 	id := atomic.AddUint64(&requestCount, 1) - 1
 
-	slog.Debug("Request", "id", id, "url", req.URL, "method", req.Method, "header", logHeader(req.Header))
+	slog.Debug(req.Method, "id", id, "url", req.URL, "header", logHeader(req.Header))
 	resp, err = t.RoundTripper.RoundTrip(req)
 	if err != nil {
-		slog.Debug("Response", "id", id, "error", err)
+		slog.Debug("Response"[:len(req.Method)], "id", id, "error", err)
 	} else if resp != nil {
-		slog.Debug("Response", "id", id, "status", resp.Status, "header", logHeader(resp.Header), "body", logResponseBody(resp))
+		slog.Debug("Response"[:len(req.Method)], "id", id, "status", resp.Status, "header", logHeader(resp.Header), "body", logResponseBody(resp))
 	} else {
-		slog.Debug("Response", "id", id, "response", "nil")
+		slog.Debug("Response"[:len(req.Method)], "id", id, "response", "nil")
 	}
 
 	return resp, err

From 57e84877d226f3c929993ad4b808755ec478a10b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:07:31 +0000
Subject: [PATCH 084/211] chore(deps): bump the k8s-io group with 7 updates

Bumps the k8s-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.33.2` | `0.33.3` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.2` | `0.33.3` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.2` | `0.33.3` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.33.2` | `0.33.3` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.2` | `0.33.3` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.2` | `0.33.3` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.33.2` | `0.33.3` |


Updates `k8s.io/api` from 0.33.2 to 0.33.3
- [Commits](https://github.com/kubernetes/api/compare/v0.33.2...v0.33.3)

Updates `k8s.io/apiextensions-apiserver` from 0.33.2 to 0.33.3
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.33.2...v0.33.3)

Updates `k8s.io/apimachinery` from 0.33.2 to 0.33.3
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.33.2...v0.33.3)

Updates `k8s.io/apiserver` from 0.33.2 to 0.33.3
- [Commits](https://github.com/kubernetes/apiserver/compare/v0.33.2...v0.33.3)

Updates `k8s.io/cli-runtime` from 0.33.2 to 0.33.3
- [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.33.2...v0.33.3)

Updates `k8s.io/client-go` from 0.33.2 to 0.33.3
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.33.2...v0.33.3)

Updates `k8s.io/kubectl` from 0.33.2 to 0.33.3
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.33.2...v0.33.3)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiserver
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-version: 0.33.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 16 ++++++++--------
 go.sum | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index e19d71e77..f04a9767c 100644
--- a/go.mod
+++ b/go.mod
@@ -35,14 +35,14 @@ require (
 	golang.org/x/term v0.33.0
 	golang.org/x/text v0.27.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.33.2
-	k8s.io/apiextensions-apiserver v0.33.2
-	k8s.io/apimachinery v0.33.2
-	k8s.io/apiserver v0.33.2
-	k8s.io/cli-runtime v0.33.2
-	k8s.io/client-go v0.33.2
+	k8s.io/api v0.33.3
+	k8s.io/apiextensions-apiserver v0.33.3
+	k8s.io/apimachinery v0.33.3
+	k8s.io/apiserver v0.33.3
+	k8s.io/cli-runtime v0.33.3
+	k8s.io/client-go v0.33.3
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubectl v0.33.2
+	k8s.io/kubectl v0.33.3
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/kustomize/kyaml v0.20.0
@@ -171,7 +171,7 @@ 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
-	k8s.io/component-base v0.33.2 // indirect
+	k8s.io/component-base v0.33.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
diff --git a/go.sum b/go.sum
index 4fff82bcc..63da08b70 100644
--- a/go.sum
+++ b/go.sum
@@ -506,26 +506,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
-k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
-k8s.io/apiextensions-apiserver v0.33.2 h1:6gnkIbngnaUflR3XwE1mCefN3YS8yTD631JXQhsU6M8=
-k8s.io/apiextensions-apiserver v0.33.2/go.mod h1:IvVanieYsEHJImTKXGP6XCOjTwv2LUMos0YWc9O+QP8=
-k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
-k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.2 h1:KGTRbxn2wJagJowo29kKBp4TchpO1DRO3g+dB/KOJN4=
-k8s.io/apiserver v0.33.2/go.mod h1:9qday04wEAMLPWWo9AwqCZSiIn3OYSZacDyu/AcoM/M=
-k8s.io/cli-runtime v0.33.2 h1:koNYQKSDdq5AExa/RDudXMhhtFasEg48KLS2KSAU74Y=
-k8s.io/cli-runtime v0.33.2/go.mod h1:gnhsAWpovqf1Zj5YRRBBU7PFsRc6NkEkwYNQE+mXL88=
-k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
-k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
-k8s.io/component-base v0.33.2 h1:sCCsn9s/dG3ZrQTX/Us0/Sx2R0G5kwa0wbZFYoVp/+0=
-k8s.io/component-base v0.33.2/go.mod h1:/41uw9wKzuelhN+u+/C59ixxf4tYQKW7p32ddkYNe2k=
+k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
+k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
+k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
+k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
+k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
+k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA=
+k8s.io/cli-runtime v0.33.3/go.mod h1:yklhLklD4vLS8HNGgC9wGiuHWze4g7x6XQZ+8edsKEo=
+k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
+k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
+k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
+k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 h1:gAXU86Fmbr/ktY17lkHwSjw5aoThQvhnstGGIYKlKYc=
 k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
-k8s.io/kubectl v0.33.2 h1:7XKZ6DYCklu5MZQzJe+CkCjoGZwD1wWl7t/FxzhMz7Y=
-k8s.io/kubectl v0.33.2/go.mod h1:8rC67FB8tVTYraovAGNi/idWIK90z2CHFNMmGJZJ3KI=
+k8s.io/kubectl v0.33.3 h1:r/phHvH1iU7gO/l7tTjQk2K01ER7/OAJi8uFHHyWSac=
+k8s.io/kubectl v0.33.3/go.mod h1:euj2bG56L6kUGOE/ckZbCoudPwuj4Kud7BR0GzyNiT0=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

From 846bb53f721343a53f6a8482ed39a330c2568521 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 22:07:35 +0000
Subject: [PATCH 085/211] chore(deps): bump github.com/spf13/pflag from 1.0.6
 to 1.0.7

Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](https://github.com/spf13/pflag/compare/v1.0.6...v1.0.7)

---
updated-dependencies:
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index e19d71e77..7d40d29a6 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.40.0
 	golang.org/x/term v0.33.0
diff --git a/go.sum b/go.sum
index 4fff82bcc..6ba9f4b69 100644
--- a/go.sum
+++ b/go.sum
@@ -303,8 +303,9 @@ github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
 github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=

From 7f4eb407c69efd00a4a345a75e826260aa2f70d1 Mon Sep 17 00:00:00 2001
From: Joe Julian <me@joejulian.name>
Date: Thu, 17 Jul 2025 13:04:25 -0700
Subject: [PATCH 086/211] add missing template directory to badcrdfile testdata

Signed-off-by: Joe Julian <me@joejulian.name>
---
 pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep

diff --git a/pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep b/pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From cf06c6d418c109dcbfd23e4e9ebda2c3655210b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Grom?= <gasper.grom@gmail.com>
Date: Sat, 19 Jul 2025 08:17:54 +0200
Subject: [PATCH 087/211] fix: LFX health score badge link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gašper Grom <gasper.grom@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef994e742..66fdab041 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/helm.sh/helm/v4)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3131/badge)](https://bestpractices.coreinfrastructure.org/projects/3131)
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/helm/helm/badge)](https://scorecard.dev/viewer/?uri=github.com/helm/helm)
-[![LFX Health Score](https://img.shields.io/static/v1?label=Health%20Score&message=Healthy&color=A7F3D0&logo=linuxfoundation&logoColor=white&style=flat)](https://insights.linuxfoundation.org/project/helm)
+[![LFX Health Score](https://insights.production.lfx.dev/api/badge/health-score?project=helm)](https://insights.linuxfoundation.org/project/helm)
 
 Helm is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources.
 

From 1031b67fffc8ecd5e6a280bfef2e73ebad32bb54 Mon Sep 17 00:00:00 2001
From: Luna Stadler <luc@spreadshirt.net>
Date: Thu, 10 Jul 2025 14:56:11 +0200
Subject: [PATCH 088/211] Fix `helm pull` untar dir check with repo urls

The existing check worked for `helm pull downloaded-repo/chart-name`,
but often does not work when using `--repo-url`, depending on the urls
used by the charts.

Signed-off-by: Luna Stadler <luc@spreadshirt.net>
---
 pkg/action/pull.go   |  5 +++--
 pkg/cmd/pull_test.go | 12 ++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index a2f53af0d..b4779f8d2 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -114,6 +114,7 @@ func (p *Pull) Run(chartRef string) (string, error) {
 		defer os.RemoveAll(dest)
 	}
 
+	downloadSourceRef := chartRef
 	if p.RepoURL != "" {
 		chartURL, err := repo.FindChartInRepoURL(
 			p.RepoURL,
@@ -128,10 +129,10 @@ func (p *Pull) Run(chartRef string) (string, error) {
 		if err != nil {
 			return out.String(), err
 		}
-		chartRef = chartURL
+		downloadSourceRef = chartURL
 	}
 
-	saved, v, err := c.DownloadTo(chartRef, p.Version, dest)
+	saved, v, err := c.DownloadTo(downloadSourceRef, p.Version, dest)
 	if err != nil {
 		return out.String(), err
 	}
diff --git a/pkg/cmd/pull_test.go b/pkg/cmd/pull_test.go
index c30c94b49..58e1862ae 100644
--- a/pkg/cmd/pull_test.go
+++ b/pkg/cmd/pull_test.go
@@ -147,6 +147,18 @@ func TestPullCmd(t *testing.T) {
 			failExpect: "Failed to fetch chart version",
 			wantError:  true,
 		},
+		{
+			name:       "Chart fetch using repo URL with untardir",
+			args:       "signtest --version=0.1.0 --untar --untardir repo-url-test --repo " + srv.URL(),
+			expectFile: "./signtest",
+			expectDir:  true,
+		},
+		{
+			name:       "Chart fetch using repo URL with untardir and previous pull",
+			args:       "signtest --version=0.1.0 --untar --untardir repo-url-test --repo " + srv.URL(),
+			failExpect: "failed to untar",
+			wantError:  true,
+		},
 		{
 			name:       "Fetch OCI Chart",
 			args:       fmt.Sprintf("oci://%s/u/ocitestuser/oci-dependent-chart --version 0.1.0", ociSrv.RegistryURL),

From 9f6beaad48cd74218c7bef20522a500873d90d2c Mon Sep 17 00:00:00 2001
From: Borys Hulii <borys.hulii@bitvavo.com>
Date: Mon, 21 Jul 2025 09:36:57 +0200
Subject: [PATCH 089/211] fix: k8s version parsing to match original

Signed-off-by: Borys Hulii <borys.hulii@bitvavo.com>
---
 pkg/chart/v2/util/capabilities.go      | 10 ++++++----
 pkg/chart/v2/util/capabilities_test.go | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkg/chart/v2/util/capabilities.go b/pkg/chart/v2/util/capabilities.go
index 23b6d46fa..19d62c5e3 100644
--- a/pkg/chart/v2/util/capabilities.go
+++ b/pkg/chart/v2/util/capabilities.go
@@ -20,11 +20,11 @@ import (
 	"slices"
 	"strconv"
 
-	"github.com/Masterminds/semver/v3"
 	"k8s.io/client-go/kubernetes/scheme"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	k8sversion "k8s.io/apimachinery/pkg/util/version"
 
 	helmversion "helm.sh/helm/v4/internal/version"
 )
@@ -85,14 +85,16 @@ func (kv *KubeVersion) GitVersion() string { return kv.Version }
 
 // ParseKubeVersion parses kubernetes version from string
 func ParseKubeVersion(version string) (*KubeVersion, error) {
-	sv, err := semver.NewVersion(version)
+	// Based on the original k8s version parser.
+	// https://github.com/kubernetes/kubernetes/blob/b266ac2c3e42c2c4843f81e20213d2b2f43e450a/staging/src/k8s.io/apimachinery/pkg/util/version/version.go#L137
+	sv, err := k8sversion.ParseGeneric(version)
 	if err != nil {
 		return nil, err
 	}
 	return &KubeVersion{
 		Version: "v" + sv.String(),
-		Major:   strconv.FormatUint(sv.Major(), 10),
-		Minor:   strconv.FormatUint(sv.Minor(), 10),
+		Major:   strconv.FormatUint(uint64(sv.Major()), 10),
+		Minor:   strconv.FormatUint(uint64(sv.Minor()), 10),
 	}, nil
 }
 
diff --git a/pkg/chart/v2/util/capabilities_test.go b/pkg/chart/v2/util/capabilities_test.go
index aa9be9db8..e5513b3fd 100644
--- a/pkg/chart/v2/util/capabilities_test.go
+++ b/pkg/chart/v2/util/capabilities_test.go
@@ -82,3 +82,19 @@ func TestParseKubeVersion(t *testing.T) {
 		t.Errorf("Expected parsed KubeVersion.Minor to be 16, got %q", kv.Minor)
 	}
 }
+
+func TestParseKubeVersionSuffix(t *testing.T) {
+	kv, err := ParseKubeVersion("v1.28+")
+	if err != nil {
+		t.Errorf("Expected v1.28+ to parse successfully")
+	}
+	if kv.Version != "v1.28" {
+		t.Errorf("Expected parsed KubeVersion.Version to be v1.28, got %q", kv.String())
+	}
+	if kv.Major != "1" {
+		t.Errorf("Expected parsed KubeVersion.Major to be 1, got %q", kv.Major)
+	}
+	if kv.Minor != "28" {
+		t.Errorf("Expected parsed KubeVersion.Minor to be 28, got %q", kv.Minor)
+	}
+}

From 08840f042c3555904720d947af3dbce524a31db0 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Sun, 12 Jan 2025 18:23:43 -0800
Subject: [PATCH 090/211] Rename 'atomic' -> 'rollback-on-failure'

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/install.go      | 41 +++++++++++++++++++-------------------
 pkg/action/install_test.go | 18 ++++++++---------
 pkg/action/upgrade.go      | 19 +++++++++---------
 pkg/action/upgrade_test.go | 19 +++++++++---------
 pkg/cmd/install.go         |  3 ++-
 pkg/cmd/upgrade.go         |  6 ++++--
 6 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index d9da2f14f..717247afd 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -78,21 +78,22 @@ type Install struct {
 	DryRunOption    string
 	// HideSecret can be set to true when DryRun is enabled in order to hide
 	// Kubernetes Secrets in the output. It cannot be used outside of DryRun.
-	HideSecret               bool
-	DisableHooks             bool
-	Replace                  bool
-	WaitStrategy             kube.WaitStrategy
-	WaitForJobs              bool
-	Devel                    bool
-	DependencyUpdate         bool
-	Timeout                  time.Duration
-	Namespace                string
-	ReleaseName              string
-	GenerateName             bool
-	NameTemplate             string
-	Description              string
-	OutputDir                string
-	Atomic                   bool
+	HideSecret       bool
+	DisableHooks     bool
+	Replace          bool
+	WaitStrategy     kube.WaitStrategy
+	WaitForJobs      bool
+	Devel            bool
+	DependencyUpdate bool
+	Timeout          time.Duration
+	Namespace        string
+	ReleaseName      string
+	GenerateName     bool
+	NameTemplate     string
+	Description      string
+	OutputDir        string
+	// RollbackOnFailure enables rolling back (uninstalling) the release on failure if set
+	RollbackOnFailure        bool
 	SkipCRDs                 bool
 	SubNotes                 bool
 	HideNotes                bool
@@ -293,9 +294,9 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		slog.Debug("API Version list given outside of client only mode, this list will be ignored")
 	}
 
-	// Make sure if Atomic is set, that wait is set as well. This makes it so
+	// Make sure if RollbackOnFailure is set, that wait is set as well. This makes it so
 	// the user doesn't have to specify both
-	if i.WaitStrategy == kube.HookOnlyStrategy && i.Atomic {
+	if i.WaitStrategy == kube.HookOnlyStrategy && i.RollbackOnFailure {
 		i.WaitStrategy = kube.StatusWatcherStrategy
 	}
 
@@ -519,8 +520,8 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 
 func (i *Install) failRelease(rel *release.Release, err error) (*release.Release, error) {
 	rel.SetStatus(release.StatusFailed, fmt.Sprintf("Release %q failed: %s", i.ReleaseName, err.Error()))
-	if i.Atomic {
-		slog.Debug("install failed, uninstalling release", "release", i.ReleaseName)
+	if i.RollbackOnFailure {
+		slog.Debug("install failed and rollback-on-failure is set, uninstalling release", "release", i.ReleaseName)
 		uninstall := NewUninstall(i.cfg)
 		uninstall.DisableHooks = i.DisableHooks
 		uninstall.KeepHistory = false
@@ -528,7 +529,7 @@ func (i *Install) failRelease(rel *release.Release, err error) (*release.Release
 		if _, uninstallErr := uninstall.Run(i.ReleaseName); uninstallErr != nil {
 			return rel, fmt.Errorf("an error occurred while uninstalling the release. original install error: %w: %w", err, uninstallErr)
 		}
-		return rel, fmt.Errorf("release %s failed, and has been uninstalled due to atomic being set: %w", i.ReleaseName, err)
+		return rel, fmt.Errorf("release %s failed, and has been uninstalled due to rollback-on-failure being set: %w", i.ReleaseName, err)
 	}
 	i.recordRelease(rel) // Ignore the error, since we have another error to deal with.
 	return rel, err
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 1882f19e7..51baac7ab 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -590,16 +590,16 @@ func TestInstallRelease_WaitForJobs(t *testing.T) {
 	is.Equal(res.Info.Status, release.StatusFailed)
 }
 
-func TestInstallRelease_Atomic(t *testing.T) {
+func TestInstallRelease_RollbackOnFailure(t *testing.T) {
 	is := assert.New(t)
 
-	t.Run("atomic uninstall succeeds", func(t *testing.T) {
+	t.Run("rollback-on-failure uninstall succeeds", func(t *testing.T) {
 		instAction := installAction(t)
 		instAction.ReleaseName = "come-fail-away"
 		failer := instAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
 		failer.WaitError = fmt.Errorf("I timed out")
 		instAction.cfg.KubeClient = failer
-		instAction.Atomic = true
+		instAction.RollbackOnFailure = true
 		// disabling hooks to avoid an early fail when
 		// WaitForDelete is called on the pre-delete hook execution
 		instAction.DisableHooks = true
@@ -608,7 +608,7 @@ func TestInstallRelease_Atomic(t *testing.T) {
 		res, err := instAction.Run(buildChart(), vals)
 		is.Error(err)
 		is.Contains(err.Error(), "I timed out")
-		is.Contains(err.Error(), "atomic")
+		is.Contains(err.Error(), "rollback-on-failure")
 
 		// Now make sure it isn't in storage anymore
 		_, err = instAction.cfg.Releases.Get(res.Name, res.Version)
@@ -616,14 +616,14 @@ func TestInstallRelease_Atomic(t *testing.T) {
 		is.Equal(err, driver.ErrReleaseNotFound)
 	})
 
-	t.Run("atomic uninstall fails", func(t *testing.T) {
+	t.Run("rollback-on-failure uninstall fails", func(t *testing.T) {
 		instAction := installAction(t)
 		instAction.ReleaseName = "come-fail-away-with-me"
 		failer := instAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
 		failer.WaitError = fmt.Errorf("I timed out")
 		failer.DeleteError = fmt.Errorf("uninstall fail")
 		instAction.cfg.KubeClient = failer
-		instAction.Atomic = true
+		instAction.RollbackOnFailure = true
 		vals := map[string]interface{}{}
 
 		_, err := instAction.Run(buildChart(), vals)
@@ -633,7 +633,7 @@ func TestInstallRelease_Atomic(t *testing.T) {
 		is.Contains(err.Error(), "an error occurred while uninstalling the release")
 	})
 }
-func TestInstallRelease_Atomic_Interrupted(t *testing.T) {
+func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) {
 
 	is := assert.New(t)
 	instAction := installAction(t)
@@ -641,7 +641,7 @@ func TestInstallRelease_Atomic_Interrupted(t *testing.T) {
 	failer := instAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
 	failer.WaitDuration = 10 * time.Second
 	instAction.cfg.KubeClient = failer
-	instAction.Atomic = true
+	instAction.RollbackOnFailure = true
 	vals := map[string]interface{}{}
 
 	ctx, cancel := context.WithCancel(t.Context())
@@ -652,7 +652,7 @@ func TestInstallRelease_Atomic_Interrupted(t *testing.T) {
 	res, err := instAction.RunWithContext(ctx, buildChart(), vals)
 	is.Error(err)
 	is.Contains(err.Error(), "context canceled")
-	is.Contains(err.Error(), "atomic")
+	is.Contains(err.Error(), "rollback-on-failure")
 	is.Contains(err.Error(), "uninstalled")
 
 	// Now make sure it isn't in storage anymore
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 271bc8aa9..566d42ab4 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -89,8 +89,8 @@ type Upgrade struct {
 	ResetThenReuseValues bool
 	// MaxHistory limits the maximum number of revisions saved per release
 	MaxHistory int
-	// Atomic, if true, will roll back on failure.
-	Atomic bool
+	// RollbackOnFailure enables rolling back the upgraded release on failure
+	RollbackOnFailure bool
 	// CleanupOnFail will, if true, cause the upgrade to delete newly-created resources on a failed update.
 	CleanupOnFail bool
 	// SubNotes determines whether sub-notes are rendered in the chart.
@@ -151,9 +151,9 @@ func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart.
 		return nil, err
 	}
 
-	// Make sure if Atomic is set, that wait is set as well. This makes it so
+	// Make sure wait is set if RollbackOnFailure. This makes it so
 	// the user doesn't have to specify both
-	if u.WaitStrategy == kube.HookOnlyStrategy && u.Atomic {
+	if u.WaitStrategy == kube.HookOnlyStrategy && u.RollbackOnFailure {
 		u.WaitStrategy = kube.StatusWatcherStrategy
 	}
 
@@ -390,7 +390,7 @@ func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedR
 	}
 }
 
-// Function used to lock the Mutex, this is important for the case when the atomic flag is set.
+// Function used to lock the Mutex, this is important for the case when RollbackOnFailure is set.
 // In that case the upgrade will finish before the rollback is finished so it is necessary to wait for the rollback to finish.
 // The rollback will be trigger by the function failRelease
 func (u *Upgrade) reportToPerformUpgrade(c chan<- resultMessage, rel *release.Release, created kube.ResourceList, err error) {
@@ -408,7 +408,7 @@ func (u *Upgrade) handleContext(ctx context.Context, done chan interface{}, c ch
 	case <-ctx.Done():
 		err := ctx.Err()
 
-		// when the atomic flag is set the ongoing release finish first and doesn't give time for the rollback happens.
+		// when RollbackOnFailure is set, the ongoing release finish first and doesn't give time for the rollback happens.
 		u.reportToPerformUpgrade(c, upgradedRelease, kube.ResourceList{}, err)
 	case <-done:
 		return
@@ -495,8 +495,9 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 		}
 		slog.Debug("resource cleanup complete")
 	}
-	if u.Atomic {
-		slog.Debug("upgrade failed and atomic is set, rolling back to last successful release")
+
+	if u.RollbackOnFailure {
+		slog.Debug("Upgrade failed and rollback-on-failure is set, rolling back to previous successful release")
 
 		// As a protection, get the last successful release before rollback.
 		// If there are no successful releases, bail out
@@ -530,7 +531,7 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 		if rollErr := rollin.Run(rel.Name); rollErr != nil {
 			return rel, fmt.Errorf("an error occurred while rolling back the release. original upgrade error: %w: %w", err, rollErr)
 		}
-		return rel, fmt.Errorf("release %s failed, and has been rolled back due to atomic being set: %w", rel.Name, err)
+		return rel, fmt.Errorf("release %s failed, and has been rolled back due to rollback-on-failure being set: %w", rel.Name, err)
 	}
 
 	return rel, err
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index e20955560..8ec727671 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -141,11 +141,11 @@ func TestUpgradeRelease_CleanupOnFail(t *testing.T) {
 	is.Equal(res.Info.Status, release.StatusFailed)
 }
 
-func TestUpgradeRelease_Atomic(t *testing.T) {
+func TestUpgradeRelease_RollbackOnFailure(t *testing.T) {
 	is := assert.New(t)
 	req := require.New(t)
 
-	t.Run("atomic rollback succeeds", func(t *testing.T) {
+	t.Run("rollback-on-failure rollback succeeds", func(t *testing.T) {
 		upAction := upgradeAction(t)
 
 		rel := releaseStub()
@@ -157,13 +157,13 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 		// We can't make Update error because then the rollback won't work
 		failer.WatchUntilReadyError = fmt.Errorf("arming key removed")
 		upAction.cfg.KubeClient = failer
-		upAction.Atomic = true
+		upAction.RollbackOnFailure = true
 		vals := map[string]interface{}{}
 
 		res, err := upAction.Run(rel.Name, buildChart(), vals)
 		req.Error(err)
 		is.Contains(err.Error(), "arming key removed")
-		is.Contains(err.Error(), "atomic")
+		is.Contains(err.Error(), "rollback-on-failure")
 
 		// Now make sure it is actually upgraded
 		updatedRes, err := upAction.cfg.Releases.Get(res.Name, 3)
@@ -172,7 +172,7 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 		is.Equal(updatedRes.Info.Status, release.StatusDeployed)
 	})
 
-	t.Run("atomic uninstall fails", func(t *testing.T) {
+	t.Run("rollback-on-failure uninstall fails", func(t *testing.T) {
 		upAction := upgradeAction(t)
 		rel := releaseStub()
 		rel.Name = "fallout"
@@ -182,7 +182,7 @@ func TestUpgradeRelease_Atomic(t *testing.T) {
 		failer := upAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
 		failer.UpdateError = fmt.Errorf("update fail")
 		upAction.cfg.KubeClient = failer
-		upAction.Atomic = true
+		upAction.RollbackOnFailure = true
 		vals := map[string]interface{}{}
 
 		_, err := upAction.Run(rel.Name, buildChart(), vals)
@@ -409,7 +409,8 @@ func TestUpgradeRelease_Interrupted_Wait(t *testing.T) {
 	is.Equal(res.Info.Status, release.StatusFailed)
 }
 
-func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) {
+func TestUpgradeRelease_Interrupted_RollbackOnFailure(t *testing.T) {
+
 	is := assert.New(t)
 	req := require.New(t)
 
@@ -422,7 +423,7 @@ func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) {
 	failer := upAction.cfg.KubeClient.(*kubefake.FailingKubeClient)
 	failer.WaitDuration = 5 * time.Second
 	upAction.cfg.KubeClient = failer
-	upAction.Atomic = true
+	upAction.RollbackOnFailure = true
 	vals := map[string]interface{}{}
 
 	ctx, cancel := context.WithCancel(t.Context())
@@ -431,7 +432,7 @@ func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) {
 	res, err := upAction.RunWithContext(ctx, rel.Name, buildChart(), vals)
 
 	req.Error(err)
-	is.Contains(err.Error(), "release interrupted-release failed, and has been rolled back due to atomic being set: context canceled")
+	is.Contains(err.Error(), "release interrupted-release failed, and has been rolled back due to rollback-on-failure being set: context canceled")
 
 	// Now make sure it is actually upgraded
 	updatedRes, err := upAction.cfg.Releases.Get(res.Name, 3)
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 3496a4bbd..33fc51584 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -203,7 +203,8 @@ func addInstallFlags(cmd *cobra.Command, f *pflag.FlagSet, client *action.Instal
 	f.BoolVar(&client.Devel, "devel", false, "use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored")
 	f.BoolVar(&client.DependencyUpdate, "dependency-update", false, "update dependencies if they are missing before installing the chart")
 	f.BoolVar(&client.DisableOpenAPIValidation, "disable-openapi-validation", false, "if set, the installation process will not validate rendered templates against the Kubernetes OpenAPI Schema")
-	f.BoolVar(&client.Atomic, "atomic", false, "if set, the installation process deletes the installation on failure. The --wait flag will be set automatically to \"watcher\" if --atomic is used")
+	f.BoolVar(&client.RollbackOnFailure, "rollback-on-failure", false, "if set, Helm will rollback (uninstall) the installation upon failure. The --wait flag will be default to \"watcher\" if --rollback-on-failure is set")
+	f.MarkDeprecated("atomic", "use --rollback-on-failure instead")
 	f.BoolVar(&client.SkipCRDs, "skip-crds", false, "if set, no CRDs will be installed. By default, CRDs are installed if not already present")
 	f.BoolVar(&client.SubNotes, "render-subchart-notes", false, "if set, render subchart notes along with the parent")
 	f.BoolVar(&client.SkipSchemaValidation, "skip-schema-validation", false, "if set, disables JSON schema validation")
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index d4e7b4852..34d96626a 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -140,7 +140,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 					instClient.WaitForJobs = client.WaitForJobs
 					instClient.Devel = client.Devel
 					instClient.Namespace = client.Namespace
-					instClient.Atomic = client.Atomic
+					instClient.RollbackOnFailure = client.RollbackOnFailure
 					instClient.PostRenderer = client.PostRenderer
 					instClient.DisableOpenAPIValidation = client.DisableOpenAPIValidation
 					instClient.SubNotes = client.SubNotes
@@ -277,7 +277,9 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&client.ReuseValues, "reuse-values", false, "when upgrading, reuse the last release's values and merge in any overrides from the command line via --set and -f. If '--reset-values' is specified, this is ignored")
 	f.BoolVar(&client.ResetThenReuseValues, "reset-then-reuse-values", false, "when upgrading, reset the values to the ones built into the chart, apply the last release's values and merge in any overrides from the command line via --set and -f. If '--reset-values' or '--reuse-values' is specified, this is ignored")
 	f.BoolVar(&client.WaitForJobs, "wait-for-jobs", false, "if set and --wait enabled, will wait until all Jobs have been completed before marking the release as successful. It will wait for as long as --timeout")
-	f.BoolVar(&client.Atomic, "atomic", false, "if set, upgrade process rolls back changes made in case of failed upgrade. The --wait flag will be set automatically to \"watcher\" if --atomic is used")
+	f.BoolVar(&client.RollbackOnFailure, "rollback-on-failure", false, "if set, Helm will rollback the upgrade to previous success release upon failure. The --wait flag will be defaulted to \"watcher\" if --rollback-on-failure is set")
+	f.BoolVar(&client.RollbackOnFailure, "atomic", false, "deprecated")
+	f.MarkDeprecated("atomic", "use --rollback-on-failure instead")
 	f.IntVar(&client.MaxHistory, "history-max", settings.MaxHistory, "limit the maximum number of revisions saved per release. Use 0 for no limit")
 	f.BoolVar(&client.CleanupOnFail, "cleanup-on-fail", false, "allow deletion of new resources created in this upgrade when upgrade fails")
 	f.BoolVar(&client.SubNotes, "render-subchart-notes", false, "if set, render subchart notes along with the parent")

From f3065ff1ba131a84bee61ef54e4d5c81a2ed3763 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 21 Jul 2025 18:03:16 -0700
Subject: [PATCH 091/211] Remove plugin deprecated 'UseTunnelDeprecated'

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/plugin/plugin.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
index 9d79ab4fc..930bf3664 100644
--- a/pkg/plugin/plugin.go
+++ b/pkg/plugin/plugin.go
@@ -132,12 +132,6 @@ type Metadata struct {
 	// Downloaders field is used if the plugin supply downloader mechanism
 	// for special protocols.
 	Downloaders []Downloaders `json:"downloaders"`
-
-	// UseTunnelDeprecated indicates that this command needs a tunnel.
-	// Setting this will cause a number of side effects, such as the
-	// automatic setting of HELM_HOST.
-	// DEPRECATED and unused, but retained for backwards compatibility with Helm 2 plugins. Remove in Helm 4
-	UseTunnelDeprecated bool `json:"useTunnel,omitempty"`
 }
 
 // Plugin represents a plugin.

From d46857fb3e5ab120733231b5833b5357eadd4799 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Jul 2025 21:52:43 +0000
Subject: [PATCH 092/211] chore(deps): bump sigs.k8s.io/kustomize/kyaml from
 0.20.0 to 0.20.1

Bumps [sigs.k8s.io/kustomize/kyaml](https://github.com/kubernetes-sigs/kustomize) from 0.20.0 to 0.20.1.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](https://github.com/kubernetes-sigs/kustomize/compare/api/v0.20.0...api/v0.20.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/kyaml
  dependency-version: 0.20.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ed63d9a53..2b6f3153b 100644
--- a/go.mod
+++ b/go.mod
@@ -45,7 +45,7 @@ require (
 	k8s.io/kubectl v0.33.3
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
-	sigs.k8s.io/kustomize/kyaml v0.20.0
+	sigs.k8s.io/kustomize/kyaml v0.20.1
 	sigs.k8s.io/yaml v1.5.0
 )
 
diff --git a/go.sum b/go.sum
index 4742a54e7..1ae78d67d 100644
--- a/go.sum
+++ b/go.sum
@@ -537,8 +537,8 @@ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7np
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
 sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
-sigs.k8s.io/kustomize/kyaml v0.20.0 h1:tT8KMKi4R3hCJ1+9HDdek2VoXpkerP92ZfF6fDgGw14=
-sigs.k8s.io/kustomize/kyaml v0.20.0/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
+sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=
+sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

From 0865d703048dfbc2e949e34a681fecb34aacba32 Mon Sep 17 00:00:00 2001
From: Mohammadreza Asadollahifard <mazafard@gmail.com>
Date: Wed, 23 Jul 2025 23:05:18 +0100
Subject: [PATCH 093/211] refactor: change default color output setting to auto
 and remove ColorEnabled method

Signed-off-by: Mohammadreza Asadollahifard <mazafard@gmail.com>
---
 pkg/cli/environment.go | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 111338e8a..c5f87cf24 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -231,8 +231,8 @@ func envColorMode() string {
 			return v
 		}
 	}
-	// Default to never (disabled) until more commands support color
-	return "never"
+	// Default to auto
+	return "auto"
 }
 
 func (s *EnvSettings) EnvVars() map[string]string {
@@ -288,24 +288,7 @@ func (s *EnvSettings) RESTClientGetter() genericclioptions.RESTClientGetter {
 	return s.config
 }
 
-// ColorEnabled returns true if color output should be enabled based on the ColorMode setting
-func (s *EnvSettings) ColorEnabled() bool {
-	switch s.ColorMode {
-	case "never":
-		return false
-	case "always":
-		return true
-	case "auto":
-		// Auto mode is handled by fatih/color's built-in terminal detection
-		// We just need to not override it
-		return true
-	default:
-		return true
-	}
-}
-
 // ShouldDisableColor returns true if color output should be disabled
-// This is the inverse of ColorEnabled for backward compatibility with noColor parameters
 func (s *EnvSettings) ShouldDisableColor() bool {
 	return s.ColorMode == "never"
 }

From 1674fb6797ae3e5cb924f5d47b24112e9cc58274 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:11:26 +0000
Subject: [PATCH 094/211] chore(deps): bump sigs.k8s.io/yaml from 1.5.0 to
 1.6.0

Bumps [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](https://github.com/kubernetes-sigs/yaml/compare/v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 2b6f3153b..e7978c530 100644
--- a/go.mod
+++ b/go.mod
@@ -46,7 +46,7 @@ require (
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/kustomize/kyaml v0.20.1
-	sigs.k8s.io/yaml v1.5.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 1ae78d67d..464ad8590 100644
--- a/go.sum
+++ b/go.sum
@@ -545,5 +545,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
-sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
-sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

From 802e09038cf8360f7a7f758cb62063dc01acca6e Mon Sep 17 00:00:00 2001
From: Matheus Pimenta <matheuscscp@gmail.com>
Date: Fri, 18 Jul 2025 13:06:06 +0100
Subject: [PATCH 095/211] pkg/registry: Login option for passing TLS config in
 memory

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
---
 pkg/registry/client.go          | 22 ++++++++++++++++++----
 pkg/registry/client_tls_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 3ea68f181..0c9f256d3 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -268,7 +268,7 @@ func LoginOptPlainText(isPlainText bool) LoginOption {
 	}
 }
 
-func ensureTLSConfig(client *auth.Client) (*tls.Config, error) {
+func ensureTLSConfig(client *auth.Client, setConfig *tls.Config) (*tls.Config, error) {
 	var transport *http.Transport
 
 	switch t := client.Client.Transport.(type) {
@@ -292,7 +292,10 @@ func ensureTLSConfig(client *auth.Client) (*tls.Config, error) {
 		return nil, fmt.Errorf("unable to access TLS client configuration, the provided HTTP Transport is not supported, given: %T", client.Client.Transport)
 	}
 
-	if transport.TLSClientConfig == nil {
+	switch {
+	case setConfig != nil:
+		transport.TLSClientConfig = setConfig
+	case transport.TLSClientConfig == nil:
 		transport.TLSClientConfig = &tls.Config{}
 	}
 
@@ -302,7 +305,7 @@ func ensureTLSConfig(client *auth.Client) (*tls.Config, error) {
 // LoginOptInsecure returns a function that sets the insecure setting on login
 func LoginOptInsecure(insecure bool) LoginOption {
 	return func(o *loginOperation) {
-		tlsConfig, err := ensureTLSConfig(o.client.authorizer)
+		tlsConfig, err := ensureTLSConfig(o.client.authorizer, nil)
 
 		if err != nil {
 			panic(err)
@@ -318,7 +321,7 @@ func LoginOptTLSClientConfig(certFile, keyFile, caFile string) LoginOption {
 		if (certFile == "" || keyFile == "") && caFile == "" {
 			return
 		}
-		tlsConfig, err := ensureTLSConfig(o.client.authorizer)
+		tlsConfig, err := ensureTLSConfig(o.client.authorizer, nil)
 		if err != nil {
 			panic(err)
 		}
@@ -345,6 +348,17 @@ func LoginOptTLSClientConfig(certFile, keyFile, caFile string) LoginOption {
 	}
 }
 
+// LoginOptTLSClientConfigFromConfig returns a function that sets the TLS settings on login
+// receiving the configuration in memory rather than from files.
+func LoginOptTLSClientConfigFromConfig(conf *tls.Config) LoginOption {
+	return func(o *loginOperation) {
+		_, err := ensureTLSConfig(o.client.authorizer, conf)
+		if err != nil {
+			panic(err)
+		}
+	}
+}
+
 type (
 	// LogoutOption allows specifying various settings on logout
 	LogoutOption func(*logoutOperation)
diff --git a/pkg/registry/client_tls_test.go b/pkg/registry/client_tls_test.go
index 156ae4816..0897858b5 100644
--- a/pkg/registry/client_tls_test.go
+++ b/pkg/registry/client_tls_test.go
@@ -17,6 +17,8 @@ limitations under the License.
 package registry
 
 import (
+	"crypto/tls"
+	"crypto/x509"
 	"os"
 	"testing"
 
@@ -52,6 +54,30 @@ func (suite *TLSRegistryClientTestSuite) Test_0_Login() {
 	suite.Nil(err, "no error logging into registry with good credentials")
 }
 
+func (suite *TLSRegistryClientTestSuite) Test_1_Login() {
+	err := suite.RegistryClient.Login(suite.DockerRegistryHost,
+		LoginOptBasicAuth("badverybad", "ohsobad"),
+		LoginOptTLSClientConfigFromConfig(&tls.Config{}))
+	suite.NotNil(err, "error logging into registry with bad credentials")
+
+	// Create a *tls.Config from tlsCert, tlsKey, and tlsCA.
+	cert, err := tls.LoadX509KeyPair(tlsCert, tlsKey)
+	suite.Nil(err, "error loading x509 key pair")
+	rootCAs := x509.NewCertPool()
+	caCert, err := os.ReadFile(tlsCA)
+	suite.Nil(err, "error reading CA certificate")
+	rootCAs.AppendCertsFromPEM(caCert)
+	conf := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		RootCAs:      rootCAs,
+	}
+
+	err = suite.RegistryClient.Login(suite.DockerRegistryHost,
+		LoginOptBasicAuth(testUsername, testPassword),
+		LoginOptTLSClientConfigFromConfig(conf))
+	suite.Nil(err, "no error logging into registry with good credentials")
+}
+
 func (suite *TLSRegistryClientTestSuite) Test_1_Push() {
 	testPush(&suite.TestSuite)
 }

From 2d2d4a868da0b1ee8bf0878134e31c44af067843 Mon Sep 17 00:00:00 2001
From: Faraz Khawaja <khwajafarazahmed@yahoo.com>
Date: Sun, 20 Jul 2025 17:34:09 +0500
Subject: [PATCH 096/211] Fix struct declaration

Signed-off-by: Faraz Khawaja <khwajafarazahmed@yahoo.com>
Signed-off-by: Khwaja Faraz Ahmed <khwaja.ahmed@securiti.ai>
---
 pkg/action/get_metadata_test.go |  6 +++---
 pkg/action/get_values_test.go   | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index f6c6346ec..1197a4635 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -32,11 +32,11 @@ import (
 )
 
 // unreachableKubeClient is a test client that always returns an error for IsReachable
-type unreachableKubeClientForMetadata struct {
+type unreachableKubeClient struct {
 	kubefake.PrintingKubeClient
 }
 
-func (u *unreachableKubeClientForMetadata) IsReachable() error {
+func (u *unreachableKubeClient) IsReachable() error {
 	return errors.New("connection refused")
 }
 
@@ -294,7 +294,7 @@ func TestGetMetadata_Run_DifferentStatuses(t *testing.T) {
 
 func TestGetMetadata_Run_UnreachableKubeClient(t *testing.T) {
 	cfg := actionConfigFixture(t)
-	cfg.KubeClient = &unreachableKubeClientForMetadata{
+	cfg.KubeClient = &unreachableKubeClient{
 		PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard},
 	}
 
diff --git a/pkg/action/get_values_test.go b/pkg/action/get_values_test.go
index 30ee7ecee..ec785b5c7 100644
--- a/pkg/action/get_values_test.go
+++ b/pkg/action/get_values_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package action
 
 import (
-	"errors"
 	"io"
 	"testing"
 
@@ -29,15 +28,6 @@ import (
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
 
-// unreachableKubeClient is a test client that always returns an error for IsReachable
-type unreachableKubeClient struct {
-	kubefake.PrintingKubeClient
-}
-
-func (u *unreachableKubeClient) IsReachable() error {
-	return errors.New("connection refused")
-}
-
 func TestNewGetValues(t *testing.T) {
 	cfg := actionConfigFixture(t)
 	client := NewGetValues(cfg)

From a37934a89210f9facc9ccb30c024266674bf9b57 Mon Sep 17 00:00:00 2001
From: Khwaja Faraz Ahmed <khwaja.ahmed@securiti.ai>
Date: Fri, 25 Jul 2025 20:27:47 +0500
Subject: [PATCH 097/211] fix linting issue

Signed-off-by: Khwaja Faraz Ahmed <khwaja.ahmed@securiti.ai>
---
 pkg/action/get_metadata_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index 1197a4635..c8e77fc0b 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -434,7 +434,6 @@ func TestMetadata_FormattedDepNames_WithComplexDependencies(t *testing.T) {
 	assert.Equal(t, "apache,mysql,zookeeper", result)
 }
 
-
 func TestGetMetadata_Labels(t *testing.T) {
 	rel := releaseStub()
 	rel.Info.Status = release.StatusDeployed

From 70257f5cd646140119bc59467b8600588b42d169 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Tue, 22 Jul 2025 13:00:01 -0400
Subject: [PATCH 098/211] Initial addition of v3 charts

This change adds v3 charts. The code for the chart, including a
loader, is present. It is based on v2 charts as a starting point.

Note, this change does not make the charts available for use with
Helm CLI commands or the action package. That will be in follow-up
changes.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 internal/chart/v3/chart.go                    | 172 ++++
 internal/chart/v3/chart_test.go               | 211 +++++
 internal/chart/v3/dependency.go               |  82 ++
 internal/chart/v3/dependency_test.go          |  44 +
 internal/chart/v3/doc.go                      |  21 +
 internal/chart/v3/errors.go                   |  30 +
 internal/chart/v3/file.go                     |  27 +
 internal/chart/v3/fuzz_test.go                |  48 +
 internal/chart/v3/loader/archive.go           | 234 +++++
 internal/chart/v3/loader/archive_test.go      |  92 ++
 internal/chart/v3/loader/directory.go         | 121 +++
 internal/chart/v3/loader/load.go              | 219 +++++
 internal/chart/v3/loader/load_test.go         | 711 +++++++++++++++
 internal/chart/v3/loader/testdata/LICENSE     |   1 +
 .../v3/loader/testdata/albatross/Chart.yaml   |   4 +
 .../v3/loader/testdata/albatross/values.yaml  |   4 +
 .../v3/loader/testdata/frobnitz-1.2.3.tgz     | Bin 0 -> 3420 bytes
 .../testdata/frobnitz.v3.reqs/.helmignore     |   1 +
 .../testdata/frobnitz.v3.reqs/Chart.yaml      |  27 +
 .../testdata/frobnitz.v3.reqs/INSTALL.txt     |   1 +
 .../loader/testdata/frobnitz.v3.reqs/LICENSE  |   1 +
 .../testdata/frobnitz.v3.reqs/README.md       |  11 +
 .../frobnitz.v3.reqs/charts/_ignore_me        |   1 +
 .../frobnitz.v3.reqs/charts/alpine/Chart.yaml |   5 +
 .../frobnitz.v3.reqs/charts/alpine/README.md  |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../frobnitz.v3.reqs/charts/mariner-4.3.2.tgz | Bin 0 -> 967 bytes
 .../testdata/frobnitz.v3.reqs/docs/README.md  |   1 +
 .../loader/testdata/frobnitz.v3.reqs/icon.svg |   8 +
 .../testdata/frobnitz.v3.reqs/ignore/me.txt   |   0
 .../frobnitz.v3.reqs/templates/template.tpl   |   1 +
 .../testdata/frobnitz.v3.reqs/values.yaml     |   6 +
 .../v3/loader/testdata/frobnitz/.helmignore   |   1 +
 .../v3/loader/testdata/frobnitz/Chart.lock    |   8 +
 .../v3/loader/testdata/frobnitz/Chart.yaml    |  27 +
 .../v3/loader/testdata/frobnitz/INSTALL.txt   |   1 +
 .../chart/v3/loader/testdata/frobnitz/LICENSE |   1 +
 .../v3/loader/testdata/frobnitz/README.md     |  11 +
 .../testdata/frobnitz/charts/_ignore_me       |   1 +
 .../frobnitz/charts/alpine/Chart.yaml         |   5 +
 .../testdata/frobnitz/charts/alpine/README.md |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../frobnitz/charts/alpine/values.yaml        |   2 +
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 0 -> 910 bytes
 .../loader/testdata/frobnitz/docs/README.md   |   1 +
 .../v3/loader/testdata/frobnitz/icon.svg      |   8 +
 .../v3/loader/testdata/frobnitz/ignore/me.txt |   0
 .../testdata/frobnitz/templates/template.tpl  |   1 +
 .../v3/loader/testdata/frobnitz/values.yaml   |   6 +
 .../testdata/frobnitz_backslash-1.2.3.tgz     | Bin 0 -> 3434 bytes
 .../testdata/frobnitz_backslash/.helmignore   |   1 +
 .../testdata/frobnitz_backslash/Chart.lock    |   8 +
 .../testdata/frobnitz_backslash/Chart.yaml    |  27 +
 .../testdata/frobnitz_backslash/INSTALL.txt   |   1 +
 .../testdata/frobnitz_backslash/LICENSE       |   1 +
 .../testdata/frobnitz_backslash/README.md     |  11 +
 .../frobnitz_backslash/charts/_ignore_me      |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 910 bytes
 .../frobnitz_backslash/docs/README.md         |   1 +
 .../testdata/frobnitz_backslash/icon.svg      |   8 +
 .../testdata/frobnitz_backslash/ignore/me.txt |   0
 .../frobnitz_backslash/templates/template.tpl |   1 +
 .../testdata/frobnitz_backslash/values.yaml   |   6 +
 .../v3/loader/testdata/frobnitz_with_bom.tgz  | Bin 0 -> 3453 bytes
 .../testdata/frobnitz_with_bom/.helmignore    |   1 +
 .../testdata/frobnitz_with_bom/Chart.lock     |   8 +
 .../testdata/frobnitz_with_bom/Chart.yaml     |  27 +
 .../testdata/frobnitz_with_bom/INSTALL.txt    |   1 +
 .../loader/testdata/frobnitz_with_bom/LICENSE |   1 +
 .../testdata/frobnitz_with_bom/README.md      |  11 +
 .../frobnitz_with_bom/charts/_ignore_me       |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../frobnitz_with_bom/charts/alpine/README.md |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 910 bytes
 .../testdata/frobnitz_with_bom/docs/README.md |   1 +
 .../testdata/frobnitz_with_bom/icon.svg       |   8 +
 .../testdata/frobnitz_with_bom/ignore/me.txt  |   0
 .../frobnitz_with_bom/templates/template.tpl  |   1 +
 .../testdata/frobnitz_with_bom/values.yaml    |   6 +
 .../frobnitz_with_dev_null/.helmignore        |   1 +
 .../frobnitz_with_dev_null/Chart.lock         |   8 +
 .../frobnitz_with_dev_null/Chart.yaml         |  27 +
 .../frobnitz_with_dev_null/INSTALL.txt        |   1 +
 .../testdata/frobnitz_with_dev_null/LICENSE   |   1 +
 .../testdata/frobnitz_with_dev_null/README.md |  11 +
 .../frobnitz_with_dev_null/charts/_ignore_me  |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 910 bytes
 .../frobnitz_with_dev_null/docs/README.md     |   1 +
 .../testdata/frobnitz_with_dev_null/icon.svg  |   8 +
 .../frobnitz_with_dev_null/ignore/me.txt      |   0
 .../testdata/frobnitz_with_dev_null/null      |   1 +
 .../templates/template.tpl                    |   1 +
 .../frobnitz_with_dev_null/values.yaml        |   6 +
 .../frobnitz_with_symlink/.helmignore         |   1 +
 .../testdata/frobnitz_with_symlink/Chart.lock |   8 +
 .../testdata/frobnitz_with_symlink/Chart.yaml |  27 +
 .../frobnitz_with_symlink/INSTALL.txt         |   1 +
 .../testdata/frobnitz_with_symlink/README.md  |  11 +
 .../frobnitz_with_symlink/charts/_ignore_me   |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 910 bytes
 .../frobnitz_with_symlink/docs/README.md      |   1 +
 .../testdata/frobnitz_with_symlink/icon.svg   |   8 +
 .../frobnitz_with_symlink/ignore/me.txt       |   0
 .../templates/template.tpl                    |   1 +
 .../frobnitz_with_symlink/values.yaml         |   6 +
 internal/chart/v3/loader/testdata/genfrob.sh  |  18 +
 .../v3/loader/testdata/mariner/Chart.yaml     |   9 +
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 0 -> 282 bytes
 .../mariner/templates/placeholder.tpl         |   1 +
 .../v3/loader/testdata/mariner/values.yaml    |   7 +
 internal/chart/v3/metadata.go                 | 178 ++++
 internal/chart/v3/metadata_test.go            | 201 +++++
 internal/chart/v3/util/capabilities.go        | 122 +++
 internal/chart/v3/util/capabilities_test.go   |  84 ++
 internal/chart/v3/util/chartfile.go           |  96 ++
 internal/chart/v3/util/chartfile_test.go      | 117 +++
 internal/chart/v3/util/coalesce.go            | 308 +++++++
 internal/chart/v3/util/coalesce_test.go       | 723 +++++++++++++++
 internal/chart/v3/util/compatible.go          |  34 +
 internal/chart/v3/util/compatible_test.go     |  43 +
 internal/chart/v3/util/create.go              | 832 ++++++++++++++++++
 internal/chart/v3/util/create_test.go         | 172 ++++
 internal/chart/v3/util/dependencies.go        | 366 ++++++++
 internal/chart/v3/util/dependencies_test.go   | 569 ++++++++++++
 internal/chart/v3/util/doc.go                 |  45 +
 internal/chart/v3/util/errors.go              |  43 +
 internal/chart/v3/util/errors_test.go         |  37 +
 internal/chart/v3/util/expand.go              |  94 ++
 internal/chart/v3/util/expand_test.go         | 124 +++
 internal/chart/v3/util/jsonschema.go          | 113 +++
 internal/chart/v3/util/jsonschema_test.go     | 247 ++++++
 internal/chart/v3/util/save.go                | 253 ++++++
 internal/chart/v3/util/save_test.go           | 261 ++++++
 .../Chart.yaml                                |  14 +
 .../charts/child/Chart.yaml                   |   6 +
 .../charts/child/charts/grandchild/Chart.yaml |   6 +
 .../charts/grandchild/templates/dummy.yaml    |   7 +
 .../charts/child/templates/dummy.yaml         |   7 +
 .../values.yaml                               |   7 +
 .../Chart.yaml                                |  20 +
 .../charts/child/Chart.yaml                   |  12 +
 .../charts/child/charts/grandchild/Chart.yaml |   6 +
 .../child/charts/grandchild/values.yaml       |   2 +
 .../charts/child/templates/dummy.yaml         |   7 +
 .../templates/dummy.yaml                      |   7 +
 .../chart/v3/util/testdata/chartfiletest.yaml |  20 +
 .../chart/v3/util/testdata/coleridge.yaml     |  12 +
 .../dependent-chart-alias/.helmignore         |   1 +
 .../testdata/dependent-chart-alias/Chart.lock |   8 +
 .../testdata/dependent-chart-alias/Chart.yaml |  29 +
 .../dependent-chart-alias/INSTALL.txt         |   1 +
 .../testdata/dependent-chart-alias/LICENSE    |   1 +
 .../testdata/dependent-chart-alias/README.md  |  11 +
 .../dependent-chart-alias/charts/_ignore_me   |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 967 bytes
 .../dependent-chart-alias/docs/README.md      |   1 +
 .../testdata/dependent-chart-alias/icon.svg   |   8 +
 .../dependent-chart-alias/ignore/me.txt       |   0
 .../templates/template.tpl                    |   1 +
 .../dependent-chart-alias/values.yaml         |   6 +
 .../dependent-chart-helmignore/.helmignore    |   2 +
 .../dependent-chart-helmignore/Chart.yaml     |  17 +
 .../charts/.ignore_me                         |   0
 .../charts/_ignore_me                         |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../templates/template.tpl                    |   1 +
 .../dependent-chart-helmignore/values.yaml    |   6 +
 .../.helmignore                               |   1 +
 .../Chart.yaml                                |  17 +
 .../INSTALL.txt                               |   1 +
 .../LICENSE                                   |   1 +
 .../README.md                                 |  11 +
 .../charts/_ignore_me                         |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 967 bytes
 .../docs/README.md                            |   1 +
 .../icon.svg                                  |   8 +
 .../ignore/me.txt                             |   0
 .../templates/template.tpl                    |   1 +
 .../values.yaml                               |   6 +
 .../.helmignore                               |   1 +
 .../Chart.yaml                                |  24 +
 .../INSTALL.txt                               |   1 +
 .../LICENSE                                   |   1 +
 .../README.md                                 |  11 +
 .../charts/_ignore_me                         |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 967 bytes
 .../docs/README.md                            |   1 +
 .../icon.svg                                  |   8 +
 .../ignore/me.txt                             |   0
 .../templates/template.tpl                    |   1 +
 .../values.yaml                               |   6 +
 .../.helmignore                               |   1 +
 .../Chart.yaml                                |  21 +
 .../INSTALL.txt                               |   1 +
 .../LICENSE                                   |   1 +
 .../README.md                                 |  11 +
 .../charts/_ignore_me                         |   1 +
 .../charts/alpine/Chart.yaml                  |   5 +
 .../charts/alpine/README.md                   |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../charts/alpine/values.yaml                 |   2 +
 .../charts/mariner-4.3.2.tgz                  | Bin 0 -> 967 bytes
 .../docs/README.md                            |   1 +
 .../icon.svg                                  |   8 +
 .../ignore/me.txt                             |   0
 .../templates/template.tpl                    |   1 +
 .../values.yaml                               |   6 +
 .../chart/v3/util/testdata/frobnitz-1.2.3.tgz | Bin 0 -> 3485 bytes
 .../v3/util/testdata/frobnitz/.helmignore     |   1 +
 .../v3/util/testdata/frobnitz/Chart.lock      |   8 +
 .../v3/util/testdata/frobnitz/Chart.yaml      |  27 +
 .../v3/util/testdata/frobnitz/INSTALL.txt     |   1 +
 .../chart/v3/util/testdata/frobnitz/LICENSE   |   1 +
 .../chart/v3/util/testdata/frobnitz/README.md |  11 +
 .../util/testdata/frobnitz/charts/_ignore_me  |   1 +
 .../frobnitz/charts/alpine/Chart.yaml         |   5 +
 .../testdata/frobnitz/charts/alpine/README.md |   9 +
 .../charts/alpine/charts/mast1/Chart.yaml     |   5 +
 .../charts/alpine/charts/mast1/values.yaml    |   4 +
 .../charts/alpine/charts/mast2-0.1.0.tgz      | Bin 0 -> 252 bytes
 .../charts/alpine/templates/alpine-pod.yaml   |  14 +
 .../frobnitz/charts/alpine/values.yaml        |   2 +
 .../frobnitz/charts/mariner/Chart.yaml        |   9 +
 .../mariner/charts/albatross/Chart.yaml       |   5 +
 .../mariner/charts/albatross/values.yaml      |   4 +
 .../charts/mariner/templates/placeholder.tpl  |   1 +
 .../frobnitz/charts/mariner/values.yaml       |   7 +
 .../v3/util/testdata/frobnitz/docs/README.md  |   1 +
 .../chart/v3/util/testdata/frobnitz/icon.svg  |   8 +
 .../v3/util/testdata/frobnitz/ignore/me.txt   |   0
 .../testdata/frobnitz/templates/template.tpl  |   1 +
 .../v3/util/testdata/frobnitz/values.yaml     |   6 +
 .../testdata/frobnitz_backslash-1.2.3.tgz     | Bin 0 -> 3496 bytes
 internal/chart/v3/util/testdata/genfrob.sh    |  14 +
 .../parent-chart/Chart.lock                   |   9 +
 .../parent-chart/Chart.yaml                   |  22 +
 .../parent-chart/charts/dev-v0.1.0.tgz        | Bin 0 -> 333 bytes
 .../parent-chart/charts/prod-v0.1.0.tgz       | Bin 0 -> 336 bytes
 .../parent-chart/envs/dev/Chart.yaml          |   4 +
 .../parent-chart/envs/dev/values.yaml         |   9 +
 .../parent-chart/envs/prod/Chart.yaml         |   4 +
 .../parent-chart/envs/prod/values.yaml        |   9 +
 .../parent-chart/templates/autoscaler.yaml    |  16 +
 .../parent-chart/values.yaml                  |  10 +
 .../chart/v3/util/testdata/joonix/Chart.yaml  |   4 +
 .../v3/util/testdata/joonix/charts/.gitkeep   |   0
 .../chart/v3/util/testdata/subpop/Chart.yaml  |  41 +
 .../chart/v3/util/testdata/subpop/README.md   |  18 +
 .../subpop/charts/subchart1/Chart.yaml        |  36 +
 .../subchart1/charts/subchartA/Chart.yaml     |   4 +
 .../charts/subchartA/templates/service.yaml   |  15 +
 .../subchart1/charts/subchartA/values.yaml    |  17 +
 .../subchart1/charts/subchartB/Chart.yaml     |   4 +
 .../charts/subchartB/templates/service.yaml   |  15 +
 .../subchart1/charts/subchartB/values.yaml    |  35 +
 .../subpop/charts/subchart1/crds/crdA.yaml    |  13 +
 .../charts/subchart1/templates/NOTES.txt      |   1 +
 .../charts/subchart1/templates/service.yaml   |  22 +
 .../subchart1/templates/subdir/role.yaml      |   7 +
 .../templates/subdir/rolebinding.yaml         |  12 +
 .../templates/subdir/serviceaccount.yaml      |   4 +
 .../subpop/charts/subchart1/values.yaml       |  55 ++
 .../subpop/charts/subchart2/Chart.yaml        |  19 +
 .../subchart2/charts/subchartB/Chart.yaml     |   4 +
 .../charts/subchartB/templates/service.yaml   |  15 +
 .../subchart2/charts/subchartB/values.yaml    |  21 +
 .../subchart2/charts/subchartC/Chart.yaml     |   4 +
 .../charts/subchartC/templates/service.yaml   |  15 +
 .../subchart2/charts/subchartC/values.yaml    |  21 +
 .../charts/subchart2/templates/service.yaml   |  15 +
 .../subpop/charts/subchart2/values.yaml       |  21 +
 .../v3/util/testdata/subpop/noreqs/Chart.yaml |   4 +
 .../subpop/noreqs/templates/service.yaml      |  15 +
 .../util/testdata/subpop/noreqs/values.yaml   |  26 +
 .../chart/v3/util/testdata/subpop/values.yaml |  45 +
 .../testdata/test-values-invalid.schema.json  |   1 +
 .../util/testdata/test-values-negative.yaml   |  14 +
 .../v3/util/testdata/test-values.schema.json  |  67 ++
 .../chart/v3/util/testdata/test-values.yaml   |  17 +
 .../three-level-dependent-chart/README.md     |  16 +
 .../umbrella/Chart.yaml                       |  19 +
 .../umbrella/charts/app1/Chart.yaml           |  11 +
 .../charts/app1/charts/library/Chart.yaml     |   5 +
 .../charts/library/templates/service.yaml     |   9 +
 .../charts/app1/charts/library/values.yaml    |   5 +
 .../charts/app1/templates/service.yaml        |   1 +
 .../umbrella/charts/app1/values.yaml          |   3 +
 .../umbrella/charts/app2/Chart.yaml           |  11 +
 .../charts/app2/charts/library/Chart.yaml     |   5 +
 .../charts/library/templates/service.yaml     |   9 +
 .../charts/app2/charts/library/values.yaml    |   5 +
 .../charts/app2/templates/service.yaml        |   1 +
 .../umbrella/charts/app2/values.yaml          |   3 +
 .../umbrella/charts/app3/Chart.yaml           |  11 +
 .../charts/app3/charts/library/Chart.yaml     |   5 +
 .../charts/library/templates/service.yaml     |   9 +
 .../charts/app3/charts/library/values.yaml    |   5 +
 .../charts/app3/templates/service.yaml        |   1 +
 .../umbrella/charts/app3/values.yaml          |   2 +
 .../umbrella/charts/app4/Chart.yaml           |   9 +
 .../charts/app4/charts/library/Chart.yaml     |   5 +
 .../charts/library/templates/service.yaml     |   9 +
 .../charts/app4/charts/library/values.yaml    |   5 +
 .../charts/app4/templates/service.yaml        |   1 +
 .../umbrella/charts/app4/values.yaml          |   3 +
 .../umbrella/values.yaml                      |  14 +
 internal/chart/v3/util/validate_name.go       | 111 +++
 internal/chart/v3/util/validate_name_test.go  |  91 ++
 internal/chart/v3/util/values.go              | 220 +++++
 internal/chart/v3/util/values_test.go         | 293 ++++++
 373 files changed, 10070 insertions(+)
 create mode 100644 internal/chart/v3/chart.go
 create mode 100644 internal/chart/v3/chart_test.go
 create mode 100644 internal/chart/v3/dependency.go
 create mode 100644 internal/chart/v3/dependency_test.go
 create mode 100644 internal/chart/v3/doc.go
 create mode 100644 internal/chart/v3/errors.go
 create mode 100644 internal/chart/v3/file.go
 create mode 100644 internal/chart/v3/fuzz_test.go
 create mode 100644 internal/chart/v3/loader/archive.go
 create mode 100644 internal/chart/v3/loader/archive_test.go
 create mode 100644 internal/chart/v3/loader/directory.go
 create mode 100644 internal/chart/v3/loader/load.go
 create mode 100644 internal/chart/v3/loader/load_test.go
 create mode 100644 internal/chart/v3/loader/testdata/LICENSE
 create mode 100644 internal/chart/v3/loader/testdata/albatross/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/albatross/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz-1.2.3.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/.helmignore
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/INSTALL.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/LICENSE
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/_ignore_me
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/docs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/icon.svg
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/ignore/me.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/templates/template.tpl
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz.v3.reqs/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/.helmignore
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/Chart.lock
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/INSTALL.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/LICENSE
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/_ignore_me
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/docs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/icon.svg
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/ignore/me.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/templates/template.tpl
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_backslash-1.2.3.tgz
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/.helmignore
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.lock
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/INSTALL.txt
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/LICENSE
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/README.md
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/_ignore_me
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/README.md
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/docs/README.md
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/icon.svg
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/ignore/me.txt
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/templates/template.tpl
 create mode 100755 internal/chart/v3/loader/testdata/frobnitz_backslash/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/.helmignore
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.lock
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/INSTALL.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/LICENSE
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/_ignore_me
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/docs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/icon.svg
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/ignore/me.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/templates/template.tpl
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_bom/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/.helmignore
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.lock
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/LICENSE
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/docs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/icon.svg
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/ignore/me.txt
 create mode 120000 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/null
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_dev_null/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/.helmignore
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.lock
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/INSTALL.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/docs/README.md
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/icon.svg
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/ignore/me.txt
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/templates/template.tpl
 create mode 100644 internal/chart/v3/loader/testdata/frobnitz_with_symlink/values.yaml
 create mode 100755 internal/chart/v3/loader/testdata/genfrob.sh
 create mode 100644 internal/chart/v3/loader/testdata/mariner/Chart.yaml
 create mode 100644 internal/chart/v3/loader/testdata/mariner/charts/albatross-0.1.0.tgz
 create mode 100644 internal/chart/v3/loader/testdata/mariner/templates/placeholder.tpl
 create mode 100644 internal/chart/v3/loader/testdata/mariner/values.yaml
 create mode 100644 internal/chart/v3/metadata.go
 create mode 100644 internal/chart/v3/metadata_test.go
 create mode 100644 internal/chart/v3/util/capabilities.go
 create mode 100644 internal/chart/v3/util/capabilities_test.go
 create mode 100644 internal/chart/v3/util/chartfile.go
 create mode 100644 internal/chart/v3/util/chartfile_test.go
 create mode 100644 internal/chart/v3/util/coalesce.go
 create mode 100644 internal/chart/v3/util/coalesce_test.go
 create mode 100644 internal/chart/v3/util/compatible.go
 create mode 100644 internal/chart/v3/util/compatible_test.go
 create mode 100644 internal/chart/v3/util/create.go
 create mode 100644 internal/chart/v3/util/create_test.go
 create mode 100644 internal/chart/v3/util/dependencies.go
 create mode 100644 internal/chart/v3/util/dependencies_test.go
 create mode 100644 internal/chart/v3/util/doc.go
 create mode 100644 internal/chart/v3/util/errors.go
 create mode 100644 internal/chart/v3/util/errors_test.go
 create mode 100644 internal/chart/v3/util/expand.go
 create mode 100644 internal/chart/v3/util/expand_test.go
 create mode 100644 internal/chart/v3/util/jsonschema.go
 create mode 100644 internal/chart/v3/util/jsonschema_test.go
 create mode 100644 internal/chart/v3/util/save.go
 create mode 100644 internal/chart/v3/util/save_test.go
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/templates/dummy.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/templates/dummy.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/templates/dummy.yaml
 create mode 100644 internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/templates/dummy.yaml
 create mode 100644 internal/chart/v3/util/testdata/chartfiletest.yaml
 create mode 100644 internal/chart/v3/util/testdata/coleridge.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/Chart.lock
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/INSTALL.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/LICENSE
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/docs/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/icon.svg
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/ignore/me.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-alias/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/.ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-helmignore/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz-1.2.3.tgz
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/.helmignore
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/Chart.lock
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/INSTALL.txt
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/LICENSE
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/README.md
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/_ignore_me
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/README.md
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/alpine/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/mariner/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/charts/mariner/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/docs/README.md
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/icon.svg
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/ignore/me.txt
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/templates/template.tpl
 create mode 100644 internal/chart/v3/util/testdata/frobnitz/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/frobnitz_backslash-1.2.3.tgz
 create mode 100755 internal/chart/v3/util/testdata/genfrob.sh
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
 create mode 100644 internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/joonix/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/joonix/charts/.gitkeep
 create mode 100644 internal/chart/v3/util/testdata/subpop/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/README.md
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/charts/subchart2/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/noreqs/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/noreqs/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/noreqs/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/subpop/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/test-values-invalid.schema.json
 create mode 100644 internal/chart/v3/util/testdata/test-values-negative.yaml
 create mode 100644 internal/chart/v3/util/testdata/test-values.schema.json
 create mode 100644 internal/chart/v3/util/testdata/test-values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/README.md
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
 create mode 100644 internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/values.yaml
 create mode 100644 internal/chart/v3/util/validate_name.go
 create mode 100644 internal/chart/v3/util/validate_name_test.go
 create mode 100644 internal/chart/v3/util/values.go
 create mode 100644 internal/chart/v3/util/values_test.go

diff --git a/internal/chart/v3/chart.go b/internal/chart/v3/chart.go
new file mode 100644
index 000000000..4d59fa5ec
--- /dev/null
+++ b/internal/chart/v3/chart.go
@@ -0,0 +1,172 @@
+/*
+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 v3
+
+import (
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+// APIVersionV3 is the API version number for version 3.
+const APIVersionV3 = "v3"
+
+// aliasNameFormat defines the characters that are legal in an alias name.
+var aliasNameFormat = regexp.MustCompile("^[a-zA-Z0-9_-]+$")
+
+// Chart is a helm package that contains metadata, a default config, zero or more
+// optionally parameterizable templates, and zero or more charts (dependencies).
+type Chart struct {
+	// Raw contains the raw contents of the files originally contained in the chart archive.
+	//
+	// This should not be used except in special cases like `helm show values`,
+	// where we want to display the raw values, comments and all.
+	Raw []*File `json:"-"`
+	// Metadata is the contents of the Chartfile.
+	Metadata *Metadata `json:"metadata"`
+	// Lock is the contents of Chart.lock.
+	Lock *Lock `json:"lock"`
+	// Templates for this chart.
+	Templates []*File `json:"templates"`
+	// Values are default config for this chart.
+	Values map[string]interface{} `json:"values"`
+	// Schema is an optional JSON schema for imposing structure on Values
+	Schema []byte `json:"schema"`
+	// Files are miscellaneous files in a chart archive,
+	// e.g. README, LICENSE, etc.
+	Files []*File `json:"files"`
+
+	parent       *Chart
+	dependencies []*Chart
+}
+
+type CRD struct {
+	// Name is the File.Name for the crd file
+	Name string
+	// Filename is the File obj Name including (sub-)chart.ChartFullPath
+	Filename string
+	// File is the File obj for the crd
+	File *File
+}
+
+// SetDependencies replaces the chart dependencies.
+func (ch *Chart) SetDependencies(charts ...*Chart) {
+	ch.dependencies = nil
+	ch.AddDependency(charts...)
+}
+
+// Name returns the name of the chart.
+func (ch *Chart) Name() string {
+	if ch.Metadata == nil {
+		return ""
+	}
+	return ch.Metadata.Name
+}
+
+// AddDependency determines if the chart is a subchart.
+func (ch *Chart) AddDependency(charts ...*Chart) {
+	for i, x := range charts {
+		charts[i].parent = ch
+		ch.dependencies = append(ch.dependencies, x)
+	}
+}
+
+// Root finds the root chart.
+func (ch *Chart) Root() *Chart {
+	if ch.IsRoot() {
+		return ch
+	}
+	return ch.Parent().Root()
+}
+
+// Dependencies are the charts that this chart depends on.
+func (ch *Chart) Dependencies() []*Chart { return ch.dependencies }
+
+// IsRoot determines if the chart is the root chart.
+func (ch *Chart) IsRoot() bool { return ch.parent == nil }
+
+// Parent returns a subchart's parent chart.
+func (ch *Chart) Parent() *Chart { return ch.parent }
+
+// ChartPath returns the full path to this chart in dot notation.
+func (ch *Chart) ChartPath() string {
+	if !ch.IsRoot() {
+		return ch.Parent().ChartPath() + "." + ch.Name()
+	}
+	return ch.Name()
+}
+
+// ChartFullPath returns the full path to this chart.
+// Note that the path may not correspond to the path where the file can be found on the file system if the path
+// points to an aliased subchart.
+func (ch *Chart) ChartFullPath() string {
+	if !ch.IsRoot() {
+		return ch.Parent().ChartFullPath() + "/charts/" + ch.Name()
+	}
+	return ch.Name()
+}
+
+// Validate validates the metadata.
+func (ch *Chart) Validate() error {
+	return ch.Metadata.Validate()
+}
+
+// AppVersion returns the appversion of the chart.
+func (ch *Chart) AppVersion() string {
+	if ch.Metadata == nil {
+		return ""
+	}
+	return ch.Metadata.AppVersion
+}
+
+// CRDs returns a list of File objects in the 'crds/' directory of a Helm chart.
+// Deprecated: use CRDObjects()
+func (ch *Chart) CRDs() []*File {
+	files := []*File{}
+	// Find all resources in the crds/ directory
+	for _, f := range ch.Files {
+		if strings.HasPrefix(f.Name, "crds/") && hasManifestExtension(f.Name) {
+			files = append(files, f)
+		}
+	}
+	// Get CRDs from dependencies, too.
+	for _, dep := range ch.Dependencies() {
+		files = append(files, dep.CRDs()...)
+	}
+	return files
+}
+
+// CRDObjects returns a list of CRD objects in the 'crds/' directory of a Helm chart & subcharts
+func (ch *Chart) CRDObjects() []CRD {
+	crds := []CRD{}
+	// Find all resources in the crds/ directory
+	for _, f := range ch.Files {
+		if strings.HasPrefix(f.Name, "crds/") && hasManifestExtension(f.Name) {
+			mycrd := CRD{Name: f.Name, Filename: filepath.Join(ch.ChartFullPath(), f.Name), File: f}
+			crds = append(crds, mycrd)
+		}
+	}
+	// Get CRDs from dependencies, too.
+	for _, dep := range ch.Dependencies() {
+		crds = append(crds, dep.CRDObjects()...)
+	}
+	return crds
+}
+
+func hasManifestExtension(fname string) bool {
+	ext := filepath.Ext(fname)
+	return strings.EqualFold(ext, ".yaml") || strings.EqualFold(ext, ".yml") || strings.EqualFold(ext, ".json")
+}
diff --git a/internal/chart/v3/chart_test.go b/internal/chart/v3/chart_test.go
new file mode 100644
index 000000000..f93b3356b
--- /dev/null
+++ b/internal/chart/v3/chart_test.go
@@ -0,0 +1,211 @@
+/*
+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 v3
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCRDs(t *testing.T) {
+	chrt := Chart{
+		Files: []*File{
+			{
+				Name: "crds/foo.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "bar.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crds/foo/bar/baz.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crdsfoo/bar/baz.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crds/README.md",
+				Data: []byte("# hello"),
+			},
+		},
+	}
+
+	is := assert.New(t)
+	crds := chrt.CRDs()
+	is.Equal(2, len(crds))
+	is.Equal("crds/foo.yaml", crds[0].Name)
+	is.Equal("crds/foo/bar/baz.yaml", crds[1].Name)
+}
+
+func TestSaveChartNoRawData(t *testing.T) {
+	chrt := Chart{
+		Raw: []*File{
+			{
+				Name: "fhqwhgads.yaml",
+				Data: []byte("Everybody to the Limit"),
+			},
+		},
+	}
+
+	is := assert.New(t)
+	data, err := json.Marshal(chrt)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	res := &Chart{}
+	if err := json.Unmarshal(data, res); err != nil {
+		t.Fatal(err)
+	}
+
+	is.Equal([]*File(nil), res.Raw)
+}
+
+func TestMetadata(t *testing.T) {
+	chrt := Chart{
+		Metadata: &Metadata{
+			Name:       "foo.yaml",
+			AppVersion: "1.0.0",
+			APIVersion: "v3",
+			Version:    "1.0.0",
+			Type:       "application",
+		},
+	}
+
+	is := assert.New(t)
+
+	is.Equal("foo.yaml", chrt.Name())
+	is.Equal("1.0.0", chrt.AppVersion())
+	is.Equal(nil, chrt.Validate())
+}
+
+func TestIsRoot(t *testing.T) {
+	chrt1 := Chart{
+		parent: &Chart{
+			Metadata: &Metadata{
+				Name: "foo",
+			},
+		},
+	}
+
+	chrt2 := Chart{
+		Metadata: &Metadata{
+			Name: "foo",
+		},
+	}
+
+	is := assert.New(t)
+
+	is.Equal(false, chrt1.IsRoot())
+	is.Equal(true, chrt2.IsRoot())
+}
+
+func TestChartPath(t *testing.T) {
+	chrt1 := Chart{
+		parent: &Chart{
+			Metadata: &Metadata{
+				Name: "foo",
+			},
+		},
+	}
+
+	chrt2 := Chart{
+		Metadata: &Metadata{
+			Name: "foo",
+		},
+	}
+
+	is := assert.New(t)
+
+	is.Equal("foo.", chrt1.ChartPath())
+	is.Equal("foo", chrt2.ChartPath())
+}
+
+func TestChartFullPath(t *testing.T) {
+	chrt1 := Chart{
+		parent: &Chart{
+			Metadata: &Metadata{
+				Name: "foo",
+			},
+		},
+	}
+
+	chrt2 := Chart{
+		Metadata: &Metadata{
+			Name: "foo",
+		},
+	}
+
+	is := assert.New(t)
+
+	is.Equal("foo/charts/", chrt1.ChartFullPath())
+	is.Equal("foo", chrt2.ChartFullPath())
+}
+
+func TestCRDObjects(t *testing.T) {
+	chrt := Chart{
+		Files: []*File{
+			{
+				Name: "crds/foo.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "bar.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crds/foo/bar/baz.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crdsfoo/bar/baz.yaml",
+				Data: []byte("hello"),
+			},
+			{
+				Name: "crds/README.md",
+				Data: []byte("# hello"),
+			},
+		},
+	}
+
+	expected := []CRD{
+		{
+			Name:     "crds/foo.yaml",
+			Filename: "crds/foo.yaml",
+			File: &File{
+				Name: "crds/foo.yaml",
+				Data: []byte("hello"),
+			},
+		},
+		{
+			Name:     "crds/foo/bar/baz.yaml",
+			Filename: "crds/foo/bar/baz.yaml",
+			File: &File{
+				Name: "crds/foo/bar/baz.yaml",
+				Data: []byte("hello"),
+			},
+		},
+	}
+
+	is := assert.New(t)
+	crds := chrt.CRDObjects()
+	is.Equal(expected, crds)
+}
diff --git a/internal/chart/v3/dependency.go b/internal/chart/v3/dependency.go
new file mode 100644
index 000000000..2d956b548
--- /dev/null
+++ b/internal/chart/v3/dependency.go
@@ -0,0 +1,82 @@
+/*
+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 v3
+
+import "time"
+
+// Dependency describes a chart upon which another chart depends.
+//
+// Dependencies can be used to express developer intent, or to capture the state
+// of a chart.
+type Dependency struct {
+	// Name is the name of the dependency.
+	//
+	// This must mach the name in the dependency's Chart.yaml.
+	Name string `json:"name" yaml:"name"`
+	// Version is the version (range) of this chart.
+	//
+	// A lock file will always produce a single version, while a dependency
+	// may contain a semantic version range.
+	Version string `json:"version,omitempty" yaml:"version,omitempty"`
+	// The URL to the repository.
+	//
+	// Appending `index.yaml` to this string should result in a URL that can be
+	// used to fetch the repository index.
+	Repository string `json:"repository" yaml:"repository"`
+	// A yaml path that resolves to a boolean, used for enabling/disabling charts (e.g. subchart1.enabled )
+	Condition string `json:"condition,omitempty" yaml:"condition,omitempty"`
+	// Tags can be used to group charts for enabling/disabling together
+	Tags []string `json:"tags,omitempty" yaml:"tags,omitempty"`
+	// Enabled bool determines if chart should be loaded
+	Enabled bool `json:"enabled,omitempty" yaml:"enabled,omitempty"`
+	// ImportValues holds the mapping of source values to parent key to be imported. Each item can be a
+	// string or pair of child/parent sublist items.
+	ImportValues []interface{} `json:"import-values,omitempty" yaml:"import-values,omitempty"`
+	// Alias usable alias to be used for the chart
+	Alias string `json:"alias,omitempty" yaml:"alias,omitempty"`
+}
+
+// Validate checks for common problems with the dependency datastructure in
+// the chart. This check must be done at load time before the dependency's charts are
+// loaded.
+func (d *Dependency) Validate() error {
+	if d == nil {
+		return ValidationError("dependencies must not contain empty or null nodes")
+	}
+	d.Name = sanitizeString(d.Name)
+	d.Version = sanitizeString(d.Version)
+	d.Repository = sanitizeString(d.Repository)
+	d.Condition = sanitizeString(d.Condition)
+	for i := range d.Tags {
+		d.Tags[i] = sanitizeString(d.Tags[i])
+	}
+	if d.Alias != "" && !aliasNameFormat.MatchString(d.Alias) {
+		return ValidationErrorf("dependency %q has disallowed characters in the alias", d.Name)
+	}
+	return nil
+}
+
+// Lock is a lock file for dependencies.
+//
+// It represents the state that the dependencies should be in.
+type Lock struct {
+	// Generated is the date the lock file was last generated.
+	Generated time.Time `json:"generated"`
+	// Digest is a hash of the dependencies in Chart.yaml.
+	Digest string `json:"digest"`
+	// Dependencies is the list of dependencies that this lock file has locked.
+	Dependencies []*Dependency `json:"dependencies"`
+}
diff --git a/internal/chart/v3/dependency_test.go b/internal/chart/v3/dependency_test.go
new file mode 100644
index 000000000..fcea19aea
--- /dev/null
+++ b/internal/chart/v3/dependency_test.go
@@ -0,0 +1,44 @@
+/*
+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 v3
+
+import (
+	"testing"
+)
+
+func TestValidateDependency(t *testing.T) {
+	dep := &Dependency{
+		Name: "example",
+	}
+	for value, shouldFail := range map[string]bool{
+		"abcdefghijklmenopQRSTUVWXYZ-0123456780_": false,
+		"-okay":      false,
+		"_okay":      false,
+		"- bad":      true,
+		" bad":       true,
+		"bad\nvalue": true,
+		"bad ":       true,
+		"bad$":       true,
+	} {
+		dep.Alias = value
+		res := dep.Validate()
+		if res != nil && !shouldFail {
+			t.Errorf("Failed on case %q", dep.Alias)
+		} else if res == nil && shouldFail {
+			t.Errorf("Expected failure for %q", dep.Alias)
+		}
+	}
+}
diff --git a/internal/chart/v3/doc.go b/internal/chart/v3/doc.go
new file mode 100644
index 000000000..e003833a0
--- /dev/null
+++ b/internal/chart/v3/doc.go
@@ -0,0 +1,21 @@
+/*
+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 v3 provides chart handling for apiVersion v3 charts
+
+This package and its sub-packages provide handling for apiVersion v3 charts.
+*/
+package v3
diff --git a/internal/chart/v3/errors.go b/internal/chart/v3/errors.go
new file mode 100644
index 000000000..059e43f07
--- /dev/null
+++ b/internal/chart/v3/errors.go
@@ -0,0 +1,30 @@
+/*
+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 v3
+
+import "fmt"
+
+// ValidationError represents a data validation error.
+type ValidationError string
+
+func (v ValidationError) Error() string {
+	return "validation: " + string(v)
+}
+
+// ValidationErrorf takes a message and formatting options and creates a ValidationError
+func ValidationErrorf(msg string, args ...interface{}) ValidationError {
+	return ValidationError(fmt.Sprintf(msg, args...))
+}
diff --git a/internal/chart/v3/file.go b/internal/chart/v3/file.go
new file mode 100644
index 000000000..ba04e106d
--- /dev/null
+++ b/internal/chart/v3/file.go
@@ -0,0 +1,27 @@
+/*
+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 v3
+
+// File represents a file as a name/value pair.
+//
+// By convention, name is a relative path within the scope of the chart's
+// base directory.
+type File struct {
+	// Name is the path-like name of the template.
+	Name string `json:"name"`
+	// Data is the template as byte data.
+	Data []byte `json:"data"`
+}
diff --git a/internal/chart/v3/fuzz_test.go b/internal/chart/v3/fuzz_test.go
new file mode 100644
index 000000000..982c26489
--- /dev/null
+++ b/internal/chart/v3/fuzz_test.go
@@ -0,0 +1,48 @@
+/*
+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 v3
+
+import (
+	"testing"
+
+	fuzz "github.com/AdaLogics/go-fuzz-headers"
+)
+
+func FuzzMetadataValidate(f *testing.F) {
+	f.Fuzz(func(t *testing.T, data []byte) {
+		fdp := fuzz.NewConsumer(data)
+		// Add random values to the metadata
+		md := &Metadata{}
+		err := fdp.GenerateStruct(md)
+		if err != nil {
+			t.Skip()
+		}
+		md.Validate()
+	})
+}
+
+func FuzzDependencyValidate(f *testing.F) {
+	f.Fuzz(func(t *testing.T, data []byte) {
+		f := fuzz.NewConsumer(data)
+		// Add random values to the dependenci
+		d := &Dependency{}
+		err := f.GenerateStruct(d)
+		if err != nil {
+			t.Skip()
+		}
+		d.Validate()
+	})
+}
diff --git a/internal/chart/v3/loader/archive.go b/internal/chart/v3/loader/archive.go
new file mode 100644
index 000000000..311959d56
--- /dev/null
+++ b/internal/chart/v3/loader/archive.go
@@ -0,0 +1,234 @@
+/*
+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 loader
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"regexp"
+	"strings"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// MaxDecompressedChartSize is the maximum size of a chart archive that will be
+// decompressed. This is the decompressed size of all the files.
+// The default value is 100 MiB.
+var MaxDecompressedChartSize int64 = 100 * 1024 * 1024 // Default 100 MiB
+
+// MaxDecompressedFileSize is the size of the largest file that Helm will attempt to load.
+// The size of the file is the decompressed version of it when it is stored in an archive.
+var MaxDecompressedFileSize int64 = 5 * 1024 * 1024 // Default 5 MiB
+
+var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)
+
+// FileLoader loads a chart from a file
+type FileLoader string
+
+// Load loads a chart
+func (l FileLoader) Load() (*chart.Chart, error) {
+	return LoadFile(string(l))
+}
+
+// LoadFile loads from an archive file.
+func LoadFile(name string) (*chart.Chart, error) {
+	if fi, err := os.Stat(name); err != nil {
+		return nil, err
+	} else if fi.IsDir() {
+		return nil, errors.New("cannot load a directory")
+	}
+
+	raw, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	defer raw.Close()
+
+	err = ensureArchive(name, raw)
+	if err != nil {
+		return nil, err
+	}
+
+	c, err := LoadArchive(raw)
+	if err != nil {
+		if err == gzip.ErrHeader {
+			return nil, fmt.Errorf("file '%s' does not appear to be a valid chart file (details: %s)", name, err)
+		}
+	}
+	return c, err
+}
+
+// ensureArchive's job is to return an informative error if the file does not appear to be a gzipped archive.
+//
+// Sometimes users will provide a values.yaml for an argument where a chart is expected. One common occurrence
+// of this is invoking `helm template values.yaml mychart` which would otherwise produce a confusing error
+// if we didn't check for this.
+func ensureArchive(name string, raw *os.File) error {
+	defer raw.Seek(0, 0) // reset read offset to allow archive loading to proceed.
+
+	// Check the file format to give us a chance to provide the user with more actionable feedback.
+	buffer := make([]byte, 512)
+	_, err := raw.Read(buffer)
+	if err != nil && err != io.EOF {
+		return fmt.Errorf("file '%s' cannot be read: %s", name, err)
+	}
+
+	// Helm may identify achieve of the application/x-gzip as application/vnd.ms-fontobject.
+	// Fix for: https://github.com/helm/helm/issues/12261
+	if contentType := http.DetectContentType(buffer); contentType != "application/x-gzip" && !isGZipApplication(buffer) {
+		// TODO: Is there a way to reliably test if a file content is YAML? ghodss/yaml accepts a wide
+		//       variety of content (Makefile, .zshrc) as valid YAML without errors.
+
+		// Wrong content type. Let's check if it's yaml and give an extra hint?
+		if strings.HasSuffix(name, ".yml") || strings.HasSuffix(name, ".yaml") {
+			return fmt.Errorf("file '%s' seems to be a YAML file, but expected a gzipped archive", name)
+		}
+		return fmt.Errorf("file '%s' does not appear to be a gzipped archive; got '%s'", name, contentType)
+	}
+	return nil
+}
+
+// isGZipApplication checks whether the archive is of the application/x-gzip type.
+func isGZipApplication(data []byte) bool {
+	sig := []byte("\x1F\x8B\x08")
+	return bytes.HasPrefix(data, sig)
+}
+
+// LoadArchiveFiles reads in files out of an archive into memory. This function
+// performs important path security checks and should always be used before
+// expanding a tarball
+func LoadArchiveFiles(in io.Reader) ([]*BufferedFile, error) {
+	unzipped, err := gzip.NewReader(in)
+	if err != nil {
+		return nil, err
+	}
+	defer unzipped.Close()
+
+	files := []*BufferedFile{}
+	tr := tar.NewReader(unzipped)
+	remainingSize := MaxDecompressedChartSize
+	for {
+		b := bytes.NewBuffer(nil)
+		hd, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		if hd.FileInfo().IsDir() {
+			// Use this instead of hd.Typeflag because we don't have to do any
+			// inference chasing.
+			continue
+		}
+
+		switch hd.Typeflag {
+		// We don't want to process these extension header files.
+		case tar.TypeXGlobalHeader, tar.TypeXHeader:
+			continue
+		}
+
+		// Archive could contain \ if generated on Windows
+		delimiter := "/"
+		if strings.ContainsRune(hd.Name, '\\') {
+			delimiter = "\\"
+		}
+
+		parts := strings.Split(hd.Name, delimiter)
+		n := strings.Join(parts[1:], delimiter)
+
+		// Normalize the path to the / delimiter
+		n = strings.ReplaceAll(n, delimiter, "/")
+
+		if path.IsAbs(n) {
+			return nil, errors.New("chart illegally contains absolute paths")
+		}
+
+		n = path.Clean(n)
+		if n == "." {
+			// In this case, the original path was relative when it should have been absolute.
+			return nil, fmt.Errorf("chart illegally contains content outside the base directory: %q", hd.Name)
+		}
+		if strings.HasPrefix(n, "..") {
+			return nil, errors.New("chart illegally references parent directory")
+		}
+
+		// In some particularly arcane acts of path creativity, it is possible to intermix
+		// UNIX and Windows style paths in such a way that you produce a result of the form
+		// c:/foo even after all the built-in absolute path checks. So we explicitly check
+		// for this condition.
+		if drivePathPattern.MatchString(n) {
+			return nil, errors.New("chart contains illegally named files")
+		}
+
+		if parts[0] == "Chart.yaml" {
+			return nil, errors.New("chart yaml not in base directory")
+		}
+
+		if hd.Size > remainingSize {
+			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
+		}
+
+		if hd.Size > MaxDecompressedFileSize {
+			return nil, fmt.Errorf("decompressed chart file %q is larger than the maximum file size %d", hd.Name, MaxDecompressedFileSize)
+		}
+
+		limitedReader := io.LimitReader(tr, remainingSize)
+
+		bytesWritten, err := io.Copy(b, limitedReader)
+		if err != nil {
+			return nil, err
+		}
+
+		remainingSize -= bytesWritten
+		// When the bytesWritten are less than the file size it means the limit reader ended
+		// copying early. Here we report that error. This is important if the last file extracted
+		// is the one that goes over the limit. It assumes the Size stored in the tar header
+		// is correct, something many applications do.
+		if bytesWritten < hd.Size || remainingSize <= 0 {
+			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
+		}
+
+		data := bytes.TrimPrefix(b.Bytes(), utf8bom)
+
+		files = append(files, &BufferedFile{Name: n, Data: data})
+		b.Reset()
+	}
+
+	if len(files) == 0 {
+		return nil, errors.New("no files in chart archive")
+	}
+	return files, nil
+}
+
+// LoadArchive loads from a reader containing a compressed tar archive.
+func LoadArchive(in io.Reader) (*chart.Chart, error) {
+	files, err := LoadArchiveFiles(in)
+	if err != nil {
+		return nil, err
+	}
+
+	return LoadFiles(files)
+}
diff --git a/internal/chart/v3/loader/archive_test.go b/internal/chart/v3/loader/archive_test.go
new file mode 100644
index 000000000..d16c47563
--- /dev/null
+++ b/internal/chart/v3/loader/archive_test.go
@@ -0,0 +1,92 @@
+/*
+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 loader
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"testing"
+)
+
+func TestLoadArchiveFiles(t *testing.T) {
+	tcs := []struct {
+		name     string
+		generate func(w *tar.Writer)
+		check    func(t *testing.T, files []*BufferedFile, err error)
+	}{
+		{
+			name:     "empty input should return no files",
+			generate: func(_ *tar.Writer) {},
+			check: func(t *testing.T, _ []*BufferedFile, err error) {
+				t.Helper()
+				if err.Error() != "no files in chart archive" {
+					t.Fatalf(`expected "no files in chart archive", got [%#v]`, err)
+				}
+			},
+		},
+		{
+			name: "should ignore files with XGlobalHeader type",
+			generate: func(w *tar.Writer) {
+				// simulate the presence of a `pax_global_header` file like you would get when
+				// processing a GitHub release archive.
+				err := w.WriteHeader(&tar.Header{
+					Typeflag: tar.TypeXGlobalHeader,
+					Name:     "pax_global_header",
+				})
+				if err != nil {
+					t.Fatal(err)
+				}
+
+				// we need to have at least one file, otherwise we'll get the "no files in chart archive" error
+				err = w.WriteHeader(&tar.Header{
+					Typeflag: tar.TypeReg,
+					Name:     "dir/empty",
+				})
+				if err != nil {
+					t.Fatal(err)
+				}
+			},
+			check: func(t *testing.T, files []*BufferedFile, err error) {
+				t.Helper()
+				if err != nil {
+					t.Fatalf(`got unwanted error [%#v] for tar file with pax_global_header content`, err)
+				}
+
+				if len(files) != 1 {
+					t.Fatalf(`expected to get one file but got [%v]`, files)
+				}
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			buf := &bytes.Buffer{}
+			gzw := gzip.NewWriter(buf)
+			tw := tar.NewWriter(gzw)
+
+			tc.generate(tw)
+
+			_ = tw.Close()
+			_ = gzw.Close()
+
+			files, err := LoadArchiveFiles(buf)
+			tc.check(t, files, err)
+		})
+	}
+}
diff --git a/internal/chart/v3/loader/directory.go b/internal/chart/v3/loader/directory.go
new file mode 100644
index 000000000..947051604
--- /dev/null
+++ b/internal/chart/v3/loader/directory.go
@@ -0,0 +1,121 @@
+/*
+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 loader
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/sympath"
+	"helm.sh/helm/v4/pkg/ignore"
+)
+
+var utf8bom = []byte{0xEF, 0xBB, 0xBF}
+
+// DirLoader loads a chart from a directory
+type DirLoader string
+
+// Load loads the chart
+func (l DirLoader) Load() (*chart.Chart, error) {
+	return LoadDir(string(l))
+}
+
+// LoadDir loads from a directory.
+//
+// This loads charts only from directories.
+func LoadDir(dir string) (*chart.Chart, error) {
+	topdir, err := filepath.Abs(dir)
+	if err != nil {
+		return nil, err
+	}
+
+	// Just used for errors.
+	c := &chart.Chart{}
+
+	rules := ignore.Empty()
+	ifile := filepath.Join(topdir, ignore.HelmIgnore)
+	if _, err := os.Stat(ifile); err == nil {
+		r, err := ignore.ParseFile(ifile)
+		if err != nil {
+			return c, err
+		}
+		rules = r
+	}
+	rules.AddDefaults()
+
+	files := []*BufferedFile{}
+	topdir += string(filepath.Separator)
+
+	walk := func(name string, fi os.FileInfo, err error) error {
+		n := strings.TrimPrefix(name, topdir)
+		if n == "" {
+			// No need to process top level. Avoid bug with helmignore .* matching
+			// empty names. See issue 1779.
+			return nil
+		}
+
+		// Normalize to / since it will also work on Windows
+		n = filepath.ToSlash(n)
+
+		if err != nil {
+			return err
+		}
+		if fi.IsDir() {
+			// Directory-based ignore rules should involve skipping the entire
+			// contents of that directory.
+			if rules.Ignore(n, fi) {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+
+		// If a .helmignore file matches, skip this file.
+		if rules.Ignore(n, fi) {
+			return nil
+		}
+
+		// Irregular files include devices, sockets, and other uses of files that
+		// are not regular files. In Go they have a file mode type bit set.
+		// See https://golang.org/pkg/os/#FileMode for examples.
+		if !fi.Mode().IsRegular() {
+			return fmt.Errorf("cannot load irregular file %s as it has file mode type bits set", name)
+		}
+
+		if fi.Size() > MaxDecompressedFileSize {
+			return fmt.Errorf("chart file %q is larger than the maximum file size %d", fi.Name(), MaxDecompressedFileSize)
+		}
+
+		data, err := os.ReadFile(name)
+		if err != nil {
+			return fmt.Errorf("error reading %s: %w", n, err)
+		}
+
+		data = bytes.TrimPrefix(data, utf8bom)
+
+		files = append(files, &BufferedFile{Name: n, Data: data})
+		return nil
+	}
+	if err = sympath.Walk(topdir, walk); err != nil {
+		return c, err
+	}
+
+	return LoadFiles(files)
+}
diff --git a/internal/chart/v3/loader/load.go b/internal/chart/v3/loader/load.go
new file mode 100644
index 000000000..30bafdad4
--- /dev/null
+++ b/internal/chart/v3/loader/load.go
@@ -0,0 +1,219 @@
+/*
+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 loader
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"maps"
+	"os"
+	"path/filepath"
+	"strings"
+
+	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// ChartLoader loads a chart.
+type ChartLoader interface {
+	Load() (*chart.Chart, error)
+}
+
+// Loader returns a new ChartLoader appropriate for the given chart name
+func Loader(name string) (ChartLoader, error) {
+	fi, err := os.Stat(name)
+	if err != nil {
+		return nil, err
+	}
+	if fi.IsDir() {
+		return DirLoader(name), nil
+	}
+	return FileLoader(name), nil
+}
+
+// Load takes a string name, tries to resolve it to a file or directory, and then loads it.
+//
+// This is the preferred way to load a chart. It will discover the chart encoding
+// and hand off to the appropriate chart reader.
+//
+// If a .helmignore file is present, the directory loader will skip loading any files
+// matching it. But .helmignore is not evaluated when reading out of an archive.
+func Load(name string) (*chart.Chart, error) {
+	l, err := Loader(name)
+	if err != nil {
+		return nil, err
+	}
+	return l.Load()
+}
+
+// BufferedFile represents an archive file buffered for later processing.
+type BufferedFile struct {
+	Name string
+	Data []byte
+}
+
+// LoadFiles loads from in-memory files.
+func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
+	c := new(chart.Chart)
+	subcharts := make(map[string][]*BufferedFile)
+
+	// do not rely on assumed ordering of files in the chart and crash
+	// if Chart.yaml was not coming early enough to initialize metadata
+	for _, f := range files {
+		c.Raw = append(c.Raw, &chart.File{Name: f.Name, Data: f.Data})
+		if f.Name == "Chart.yaml" {
+			if c.Metadata == nil {
+				c.Metadata = new(chart.Metadata)
+			}
+			if err := yaml.Unmarshal(f.Data, c.Metadata); err != nil {
+				return c, fmt.Errorf("cannot load Chart.yaml: %w", err)
+			}
+			// While the documentation says the APIVersion is required, in practice there
+			// are cases where that's not enforced. Since this package set is for v3 charts,
+			// when this function is used v3 is automatically added when not present.
+			if c.Metadata.APIVersion == "" {
+				c.Metadata.APIVersion = chart.APIVersionV3
+			}
+		}
+	}
+	for _, f := range files {
+		switch {
+		case f.Name == "Chart.yaml":
+			// already processed
+			continue
+		case f.Name == "Chart.lock":
+			c.Lock = new(chart.Lock)
+			if err := yaml.Unmarshal(f.Data, &c.Lock); err != nil {
+				return c, fmt.Errorf("cannot load Chart.lock: %w", err)
+			}
+		case f.Name == "values.yaml":
+			values, err := LoadValues(bytes.NewReader(f.Data))
+			if err != nil {
+				return c, fmt.Errorf("cannot load values.yaml: %w", err)
+			}
+			c.Values = values
+		case f.Name == "values.schema.json":
+			c.Schema = f.Data
+
+		case strings.HasPrefix(f.Name, "templates/"):
+			c.Templates = append(c.Templates, &chart.File{Name: f.Name, Data: f.Data})
+		case strings.HasPrefix(f.Name, "charts/"):
+			if filepath.Ext(f.Name) == ".prov" {
+				c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+				continue
+			}
+
+			fname := strings.TrimPrefix(f.Name, "charts/")
+			cname := strings.SplitN(fname, "/", 2)[0]
+			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
+		default:
+			c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+		}
+	}
+
+	if c.Metadata == nil {
+		return c, errors.New("Chart.yaml file is missing") //nolint:staticcheck
+	}
+
+	if err := c.Validate(); err != nil {
+		return c, err
+	}
+
+	for n, files := range subcharts {
+		var sc *chart.Chart
+		var err error
+		switch {
+		case strings.IndexAny(n, "_.") == 0:
+			continue
+		case filepath.Ext(n) == ".tgz":
+			file := files[0]
+			if file.Name != n {
+				return c, fmt.Errorf("error unpacking subchart tar in %s: expected %s, got %s", c.Name(), n, file.Name)
+			}
+			// Untar the chart and add to c.Dependencies
+			sc, err = LoadArchive(bytes.NewBuffer(file.Data))
+		default:
+			// We have to trim the prefix off of every file, and ignore any file
+			// that is in charts/, but isn't actually a chart.
+			buff := make([]*BufferedFile, 0, len(files))
+			for _, f := range files {
+				parts := strings.SplitN(f.Name, "/", 2)
+				if len(parts) < 2 {
+					continue
+				}
+				f.Name = parts[1]
+				buff = append(buff, f)
+			}
+			sc, err = LoadFiles(buff)
+		}
+
+		if err != nil {
+			return c, fmt.Errorf("error unpacking subchart %s in %s: %w", n, c.Name(), err)
+		}
+		c.AddDependency(sc)
+	}
+
+	return c, nil
+}
+
+// LoadValues loads values from a reader.
+//
+// The reader is expected to contain one or more YAML documents, the values of which are merged.
+// And the values can be either a chart's default values or a user-supplied values.
+func LoadValues(data io.Reader) (map[string]interface{}, error) {
+	values := map[string]interface{}{}
+	reader := utilyaml.NewYAMLReader(bufio.NewReader(data))
+	for {
+		currentMap := map[string]interface{}{}
+		raw, err := reader.Read()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, fmt.Errorf("error reading yaml document: %w", err)
+		}
+		if err := yaml.Unmarshal(raw, &currentMap); err != nil {
+			return nil, fmt.Errorf("cannot unmarshal yaml document: %w", err)
+		}
+		values = MergeMaps(values, currentMap)
+	}
+	return values, nil
+}
+
+// MergeMaps merges two maps. If a key exists in both maps, the value from b will be used.
+// If the value is a map, the maps will be merged recursively.
+func MergeMaps(a, b map[string]interface{}) map[string]interface{} {
+	out := make(map[string]interface{}, len(a))
+	maps.Copy(out, a)
+	for k, v := range b {
+		if v, ok := v.(map[string]interface{}); ok {
+			if bv, ok := out[k]; ok {
+				if bv, ok := bv.(map[string]interface{}); ok {
+					out[k] = MergeMaps(bv, v)
+					continue
+				}
+			}
+		}
+		out[k] = v
+	}
+	return out
+}
diff --git a/internal/chart/v3/loader/load_test.go b/internal/chart/v3/loader/load_test.go
new file mode 100644
index 000000000..e770923ff
--- /dev/null
+++ b/internal/chart/v3/loader/load_test.go
@@ -0,0 +1,711 @@
+/*
+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 loader
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"reflect"
+	"runtime"
+	"strings"
+	"testing"
+	"time"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+func TestLoadDir(t *testing.T) {
+	l, err := Loader("testdata/frobnitz")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+}
+
+func TestLoadDirWithDevNull(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("test only works on unix systems with /dev/null present")
+	}
+
+	l, err := Loader("testdata/frobnitz_with_dev_null")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	if _, err := l.Load(); err == nil {
+		t.Errorf("packages with an irregular file (/dev/null) should not load")
+	}
+}
+
+func TestLoadDirWithSymlink(t *testing.T) {
+	sym := filepath.Join("..", "LICENSE")
+	link := filepath.Join("testdata", "frobnitz_with_symlink", "LICENSE")
+
+	if err := os.Symlink(sym, link); err != nil {
+		t.Fatal(err)
+	}
+
+	defer os.Remove(link)
+
+	l, err := Loader("testdata/frobnitz_with_symlink")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+}
+
+func TestBomTestData(t *testing.T) {
+	testFiles := []string{"frobnitz_with_bom/.helmignore", "frobnitz_with_bom/templates/template.tpl", "frobnitz_with_bom/Chart.yaml"}
+	for _, file := range testFiles {
+		data, err := os.ReadFile("testdata/" + file)
+		if err != nil || !bytes.HasPrefix(data, utf8bom) {
+			t.Errorf("Test file has no BOM or is invalid: testdata/%s", file)
+		}
+	}
+
+	archive, err := os.ReadFile("testdata/frobnitz_with_bom.tgz")
+	if err != nil {
+		t.Fatalf("Error reading archive frobnitz_with_bom.tgz: %s", err)
+	}
+	unzipped, err := gzip.NewReader(bytes.NewReader(archive))
+	if err != nil {
+		t.Fatalf("Error reading archive frobnitz_with_bom.tgz: %s", err)
+	}
+	defer unzipped.Close()
+	for _, testFile := range testFiles {
+		data := make([]byte, 3)
+		err := unzipped.Reset(bytes.NewReader(archive))
+		if err != nil {
+			t.Fatalf("Error reading archive frobnitz_with_bom.tgz: %s", err)
+		}
+		tr := tar.NewReader(unzipped)
+		for {
+			file, err := tr.Next()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				t.Fatalf("Error reading archive frobnitz_with_bom.tgz: %s", err)
+			}
+			if file != nil && strings.EqualFold(file.Name, testFile) {
+				_, err := tr.Read(data)
+				if err != nil {
+					t.Fatalf("Error reading archive frobnitz_with_bom.tgz: %s", err)
+				} else {
+					break
+				}
+			}
+		}
+		if !bytes.Equal(data, utf8bom) {
+			t.Fatalf("Test file has no BOM or is invalid: frobnitz_with_bom.tgz/%s", testFile)
+		}
+	}
+}
+
+func TestLoadDirWithUTFBOM(t *testing.T) {
+	l, err := Loader("testdata/frobnitz_with_bom")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+	verifyBomStripped(t, c.Files)
+}
+
+func TestLoadArchiveWithUTFBOM(t *testing.T) {
+	l, err := Loader("testdata/frobnitz_with_bom.tgz")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+	verifyBomStripped(t, c.Files)
+}
+
+func TestLoadFile(t *testing.T) {
+	l, err := Loader("testdata/frobnitz-1.2.3.tgz")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyFrobnitz(t, c)
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+}
+
+func TestLoadFiles(t *testing.T) {
+	goodFiles := []*BufferedFile{
+		{
+			Name: "Chart.yaml",
+			Data: []byte(`apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+`),
+		},
+		{
+			Name: "values.yaml",
+			Data: []byte("var: some values"),
+		},
+		{
+			Name: "values.schema.json",
+			Data: []byte("type: Values"),
+		},
+		{
+			Name: "templates/deployment.yaml",
+			Data: []byte("some deployment"),
+		},
+		{
+			Name: "templates/service.yaml",
+			Data: []byte("some service"),
+		},
+	}
+
+	c, err := LoadFiles(goodFiles)
+	if err != nil {
+		t.Errorf("Expected good files to be loaded, got %v", err)
+	}
+
+	if c.Name() != "frobnitz" {
+		t.Errorf("Expected chart name to be 'frobnitz', got %s", c.Name())
+	}
+
+	if c.Values["var"] != "some values" {
+		t.Error("Expected chart values to be populated with default values")
+	}
+
+	if len(c.Raw) != 5 {
+		t.Errorf("Expected %d files, got %d", 5, len(c.Raw))
+	}
+
+	if !bytes.Equal(c.Schema, []byte("type: Values")) {
+		t.Error("Expected chart schema to be populated with default values")
+	}
+
+	if len(c.Templates) != 2 {
+		t.Errorf("Expected number of templates == 2, got %d", len(c.Templates))
+	}
+
+	if _, err = LoadFiles([]*BufferedFile{}); err == nil {
+		t.Fatal("Expected err to be non-nil")
+	}
+	if err.Error() != "Chart.yaml file is missing" {
+		t.Errorf("Expected chart metadata missing error, got '%s'", err.Error())
+	}
+}
+
+// Test the order of file loading. The Chart.yaml file needs to come first for
+// later comparison checks. See https://github.com/helm/helm/pull/8948
+func TestLoadFilesOrder(t *testing.T) {
+	goodFiles := []*BufferedFile{
+		{
+			Name: "requirements.yaml",
+			Data: []byte("dependencies:"),
+		},
+		{
+			Name: "values.yaml",
+			Data: []byte("var: some values"),
+		},
+
+		{
+			Name: "templates/deployment.yaml",
+			Data: []byte("some deployment"),
+		},
+		{
+			Name: "templates/service.yaml",
+			Data: []byte("some service"),
+		},
+		{
+			Name: "Chart.yaml",
+			Data: []byte(`apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+`),
+		},
+	}
+
+	// Capture stderr to make sure message about Chart.yaml handle dependencies
+	// is not present
+	r, w, err := os.Pipe()
+	if err != nil {
+		t.Fatalf("Unable to create pipe: %s", err)
+	}
+	stderr := log.Writer()
+	log.SetOutput(w)
+	defer func() {
+		log.SetOutput(stderr)
+	}()
+
+	_, err = LoadFiles(goodFiles)
+	if err != nil {
+		t.Errorf("Expected good files to be loaded, got %v", err)
+	}
+	w.Close()
+
+	var text bytes.Buffer
+	io.Copy(&text, r)
+	if text.String() != "" {
+		t.Errorf("Expected no message to Stderr, got %s", text.String())
+	}
+
+}
+
+// Packaging the chart on a Windows machine will produce an
+// archive that has \\ as delimiters. Test that we support these archives
+func TestLoadFileBackslash(t *testing.T) {
+	c, err := Load("testdata/frobnitz_backslash-1.2.3.tgz")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyChartFileAndTemplate(t, c, "frobnitz_backslash")
+	verifyChart(t, c)
+	verifyDependencies(t, c)
+}
+
+func TestLoadV3WithReqs(t *testing.T) {
+	l, err := Loader("testdata/frobnitz.v3.reqs")
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	c, err := l.Load()
+	if err != nil {
+		t.Fatalf("Failed to load testdata: %s", err)
+	}
+	verifyDependencies(t, c)
+	verifyDependenciesLock(t, c)
+}
+
+func TestLoadInvalidArchive(t *testing.T) {
+	tmpdir := t.TempDir()
+
+	writeTar := func(filename, internalPath string, body []byte) {
+		dest, err := os.Create(filename)
+		if err != nil {
+			t.Fatal(err)
+		}
+		zipper := gzip.NewWriter(dest)
+		tw := tar.NewWriter(zipper)
+
+		h := &tar.Header{
+			Name:    internalPath,
+			Mode:    0755,
+			Size:    int64(len(body)),
+			ModTime: time.Now(),
+		}
+		if err := tw.WriteHeader(h); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := tw.Write(body); err != nil {
+			t.Fatal(err)
+		}
+		tw.Close()
+		zipper.Close()
+		dest.Close()
+	}
+
+	for _, tt := range []struct {
+		chartname   string
+		internal    string
+		expectError string
+	}{
+		{"illegal-dots.tgz", "../../malformed-helm-test", "chart illegally references parent directory"},
+		{"illegal-dots2.tgz", "/foo/../../malformed-helm-test", "chart illegally references parent directory"},
+		{"illegal-dots3.tgz", "/../../malformed-helm-test", "chart illegally references parent directory"},
+		{"illegal-dots4.tgz", "./../../malformed-helm-test", "chart illegally references parent directory"},
+		{"illegal-name.tgz", "./.", "chart illegally contains content outside the base directory"},
+		{"illegal-name2.tgz", "/./.", "chart illegally contains content outside the base directory"},
+		{"illegal-name3.tgz", "missing-leading-slash", "chart illegally contains content outside the base directory"},
+		{"illegal-name4.tgz", "/missing-leading-slash", "Chart.yaml file is missing"},
+		{"illegal-abspath.tgz", "//foo", "chart illegally contains absolute paths"},
+		{"illegal-abspath2.tgz", "///foo", "chart illegally contains absolute paths"},
+		{"illegal-abspath3.tgz", "\\\\foo", "chart illegally contains absolute paths"},
+		{"illegal-abspath3.tgz", "\\..\\..\\foo", "chart illegally references parent directory"},
+
+		// Under special circumstances, this can get normalized to things that look like absolute Windows paths
+		{"illegal-abspath4.tgz", "\\.\\c:\\\\foo", "chart contains illegally named files"},
+		{"illegal-abspath5.tgz", "/./c://foo", "chart contains illegally named files"},
+		{"illegal-abspath6.tgz", "\\\\?\\Some\\windows\\magic", "chart illegally contains absolute paths"},
+	} {
+		illegalChart := filepath.Join(tmpdir, tt.chartname)
+		writeTar(illegalChart, tt.internal, []byte("hello: world"))
+		_, err := Load(illegalChart)
+		if err == nil {
+			t.Fatal("expected error when unpacking illegal files")
+		}
+		if !strings.Contains(err.Error(), tt.expectError) {
+			t.Errorf("Expected error to contain %q, got %q for %s", tt.expectError, err.Error(), tt.chartname)
+		}
+	}
+
+	// Make sure that absolute path gets interpreted as relative
+	illegalChart := filepath.Join(tmpdir, "abs-path.tgz")
+	writeTar(illegalChart, "/Chart.yaml", []byte("hello: world"))
+	_, err := Load(illegalChart)
+	if err.Error() != "validation: chart.metadata.name is required" {
+		t.Error(err)
+	}
+
+	// And just to validate that the above was not spurious
+	illegalChart = filepath.Join(tmpdir, "abs-path2.tgz")
+	writeTar(illegalChart, "files/whatever.yaml", []byte("hello: world"))
+	_, err = Load(illegalChart)
+	if err.Error() != "Chart.yaml file is missing" {
+		t.Errorf("Unexpected error message: %s", err)
+	}
+
+	// Finally, test that drive letter gets stripped off on Windows
+	illegalChart = filepath.Join(tmpdir, "abs-winpath.tgz")
+	writeTar(illegalChart, "c:\\Chart.yaml", []byte("hello: world"))
+	_, err = Load(illegalChart)
+	if err.Error() != "validation: chart.metadata.name is required" {
+		t.Error(err)
+	}
+}
+
+func TestLoadValues(t *testing.T) {
+	testCases := map[string]struct {
+		data          []byte
+		expctedValues map[string]interface{}
+	}{
+		"It should load values correctly": {
+			data: []byte(`
+foo:
+  image: foo:v1
+bar:
+  version: v2
+`),
+			expctedValues: map[string]interface{}{
+				"foo": map[string]interface{}{
+					"image": "foo:v1",
+				},
+				"bar": map[string]interface{}{
+					"version": "v2",
+				},
+			},
+		},
+		"It should load values correctly with multiple documents in one file": {
+			data: []byte(`
+foo:
+  image: foo:v1
+bar:
+  version: v2
+---
+foo:
+  image: foo:v2
+`),
+			expctedValues: map[string]interface{}{
+				"foo": map[string]interface{}{
+					"image": "foo:v2",
+				},
+				"bar": map[string]interface{}{
+					"version": "v2",
+				},
+			},
+		},
+	}
+	for testName, testCase := range testCases {
+		t.Run(testName, func(tt *testing.T) {
+			values, err := LoadValues(bytes.NewReader(testCase.data))
+			if err != nil {
+				tt.Fatal(err)
+			}
+			if !reflect.DeepEqual(values, testCase.expctedValues) {
+				tt.Errorf("Expected values: %v, got %v", testCase.expctedValues, values)
+			}
+		})
+	}
+}
+
+func TestMergeValues(t *testing.T) {
+	nestedMap := map[string]interface{}{
+		"foo": "bar",
+		"baz": map[string]string{
+			"cool": "stuff",
+		},
+	}
+	anotherNestedMap := map[string]interface{}{
+		"foo": "bar",
+		"baz": map[string]string{
+			"cool":    "things",
+			"awesome": "stuff",
+		},
+	}
+	flatMap := map[string]interface{}{
+		"foo": "bar",
+		"baz": "stuff",
+	}
+	anotherFlatMap := map[string]interface{}{
+		"testing": "fun",
+	}
+
+	testMap := MergeMaps(flatMap, nestedMap)
+	equal := reflect.DeepEqual(testMap, nestedMap)
+	if !equal {
+		t.Errorf("Expected a nested map to overwrite a flat value. Expected: %v, got %v", nestedMap, testMap)
+	}
+
+	testMap = MergeMaps(nestedMap, flatMap)
+	equal = reflect.DeepEqual(testMap, flatMap)
+	if !equal {
+		t.Errorf("Expected a flat value to overwrite a map. Expected: %v, got %v", flatMap, testMap)
+	}
+
+	testMap = MergeMaps(nestedMap, anotherNestedMap)
+	equal = reflect.DeepEqual(testMap, anotherNestedMap)
+	if !equal {
+		t.Errorf("Expected a nested map to overwrite another nested map. Expected: %v, got %v", anotherNestedMap, testMap)
+	}
+
+	testMap = MergeMaps(anotherFlatMap, anotherNestedMap)
+	expectedMap := map[string]interface{}{
+		"testing": "fun",
+		"foo":     "bar",
+		"baz": map[string]string{
+			"cool":    "things",
+			"awesome": "stuff",
+		},
+	}
+	equal = reflect.DeepEqual(testMap, expectedMap)
+	if !equal {
+		t.Errorf("Expected a map with different keys to merge properly with another map. Expected: %v, got %v", expectedMap, testMap)
+	}
+}
+
+func verifyChart(t *testing.T, c *chart.Chart) {
+	t.Helper()
+	if c.Name() == "" {
+		t.Fatalf("No chart metadata found on %v", c)
+	}
+	t.Logf("Verifying chart %s", c.Name())
+	if len(c.Templates) != 1 {
+		t.Errorf("Expected 1 template, got %d", len(c.Templates))
+	}
+
+	numfiles := 6
+	if len(c.Files) != numfiles {
+		t.Errorf("Expected %d extra files, got %d", numfiles, len(c.Files))
+		for _, n := range c.Files {
+			t.Logf("\t%s", n.Name)
+		}
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Errorf("Expected 2 dependencies, got %d (%v)", len(c.Dependencies()), c.Dependencies())
+		for _, d := range c.Dependencies() {
+			t.Logf("\tSubchart: %s\n", d.Name())
+		}
+	}
+
+	expect := map[string]map[string]string{
+		"alpine": {
+			"version": "0.1.0",
+		},
+		"mariner": {
+			"version": "4.3.2",
+		},
+	}
+
+	for _, dep := range c.Dependencies() {
+		if dep.Metadata == nil {
+			t.Fatalf("expected metadata on dependency: %v", dep)
+		}
+		exp, ok := expect[dep.Name()]
+		if !ok {
+			t.Fatalf("Unknown dependency %s", dep.Name())
+		}
+		if exp["version"] != dep.Metadata.Version {
+			t.Errorf("Expected %s version %s, got %s", dep.Name(), exp["version"], dep.Metadata.Version)
+		}
+	}
+
+}
+
+func verifyDependencies(t *testing.T, c *chart.Chart) {
+	t.Helper()
+	if len(c.Metadata.Dependencies) != 2 {
+		t.Errorf("Expected 2 dependencies, got %d", len(c.Metadata.Dependencies))
+	}
+	tests := []*chart.Dependency{
+		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
+		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
+	}
+	for i, tt := range tests {
+		d := c.Metadata.Dependencies[i]
+		if d.Name != tt.Name {
+			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
+		}
+		if d.Version != tt.Version {
+			t.Errorf("Expected dependency named %q to have version %q, got %q", tt.Name, tt.Version, d.Version)
+		}
+		if d.Repository != tt.Repository {
+			t.Errorf("Expected dependency named %q to have repository %q, got %q", tt.Name, tt.Repository, d.Repository)
+		}
+	}
+}
+
+func verifyDependenciesLock(t *testing.T, c *chart.Chart) {
+	t.Helper()
+	if len(c.Metadata.Dependencies) != 2 {
+		t.Errorf("Expected 2 dependencies, got %d", len(c.Metadata.Dependencies))
+	}
+	tests := []*chart.Dependency{
+		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
+		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
+	}
+	for i, tt := range tests {
+		d := c.Metadata.Dependencies[i]
+		if d.Name != tt.Name {
+			t.Errorf("Expected dependency named %q, got %q", tt.Name, d.Name)
+		}
+		if d.Version != tt.Version {
+			t.Errorf("Expected dependency named %q to have version %q, got %q", tt.Name, tt.Version, d.Version)
+		}
+		if d.Repository != tt.Repository {
+			t.Errorf("Expected dependency named %q to have repository %q, got %q", tt.Name, tt.Repository, d.Repository)
+		}
+	}
+}
+
+func verifyFrobnitz(t *testing.T, c *chart.Chart) {
+	t.Helper()
+	verifyChartFileAndTemplate(t, c, "frobnitz")
+}
+
+func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
+	t.Helper()
+	if c.Metadata == nil {
+		t.Fatal("Metadata is nil")
+	}
+	if c.Name() != name {
+		t.Errorf("Expected %s, got %s", name, c.Name())
+	}
+	if len(c.Templates) != 1 {
+		t.Fatalf("Expected 1 template, got %d", len(c.Templates))
+	}
+	if c.Templates[0].Name != "templates/template.tpl" {
+		t.Errorf("Unexpected template: %s", c.Templates[0].Name)
+	}
+	if len(c.Templates[0].Data) == 0 {
+		t.Error("No template data.")
+	}
+	if len(c.Files) != 6 {
+		t.Fatalf("Expected 6 Files, got %d", len(c.Files))
+	}
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("Expected 2 Dependency, got %d", len(c.Dependencies()))
+	}
+	if len(c.Metadata.Dependencies) != 2 {
+		t.Fatalf("Expected 2 Dependencies.Dependency, got %d", len(c.Metadata.Dependencies))
+	}
+	if len(c.Lock.Dependencies) != 2 {
+		t.Fatalf("Expected 2 Lock.Dependency, got %d", len(c.Lock.Dependencies))
+	}
+
+	for _, dep := range c.Dependencies() {
+		switch dep.Name() {
+		case "mariner":
+		case "alpine":
+			if len(dep.Templates) != 1 {
+				t.Fatalf("Expected 1 template, got %d", len(dep.Templates))
+			}
+			if dep.Templates[0].Name != "templates/alpine-pod.yaml" {
+				t.Errorf("Unexpected template: %s", dep.Templates[0].Name)
+			}
+			if len(dep.Templates[0].Data) == 0 {
+				t.Error("No template data.")
+			}
+			if len(dep.Files) != 1 {
+				t.Fatalf("Expected 1 Files, got %d", len(dep.Files))
+			}
+			if len(dep.Dependencies()) != 2 {
+				t.Fatalf("Expected 2 Dependency, got %d", len(dep.Dependencies()))
+			}
+		default:
+			t.Errorf("Unexpected dependency %s", dep.Name())
+		}
+	}
+}
+
+func verifyBomStripped(t *testing.T, files []*chart.File) {
+	t.Helper()
+	for _, file := range files {
+		if bytes.HasPrefix(file.Data, utf8bom) {
+			t.Errorf("Byte Order Mark still present in processed file %s", file.Name)
+		}
+	}
+}
diff --git a/internal/chart/v3/loader/testdata/LICENSE b/internal/chart/v3/loader/testdata/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/albatross/Chart.yaml b/internal/chart/v3/loader/testdata/albatross/Chart.yaml
new file mode 100644
index 000000000..eeef737ff
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/albatross/Chart.yaml
@@ -0,0 +1,4 @@
+name: albatross
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/albatross/values.yaml b/internal/chart/v3/loader/testdata/albatross/values.yaml
new file mode 100644
index 000000000..3121cd7ce
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/albatross/values.yaml
@@ -0,0 +1,4 @@
+albatross: "true"
+
+global:
+  author: Coleridge
diff --git a/internal/chart/v3/loader/testdata/frobnitz-1.2.3.tgz b/internal/chart/v3/loader/testdata/frobnitz-1.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..de28e4120df739fc1e9a246cfce150ccb1bcea1e
GIT binary patch
literal 3420
zcmV-i4WsfOiwFP!000001MOT3coRh)51?=cc|Q(>gCXVPA?-HL4Xte<v;`_HukwD_
zZnBeP>1H?VZrX;Y&;t=T0r3+Qp`cQbhst+|p3tv&C+7)zB2)oI5d{kfViit#w7uEg
zByB@60%?l4zYn^bo!Ob${m<{e|Ns1F#?G-;h7xAPs_G9~1hdH`9(87uw&u|fmCmF!
z;3mCZi{mP-PH!?8Rlrn_Z3@7{3j_y%%4H`wiXm>AFI4*P6n4M-F(;&5l!IY8816bm
z0pmvF&E>BPmcJ24-34gF-H^KQ2baGr@mO_3w?je0Ai)1*C&39A&DwIpUPmbY8??G$
z{u_-th5wNN3Ehw(A!DN;AFl==1~7yR#sh+OQw&5G0LX<LPq9oq&}cCorqxInIp}72
zN?<u}Ja7tvn~#r;h53ZbO+(Dax?*i&cj9Xl=n`Ka<bp~xVg^iqOC^$&1M)&VpqN~O
zrbtC`-5G-T?<HJx*y{+vf1OUJ_wye|+?V)oQurSc5N>LmpN+W&wait2r%;oSw{etP
zkdntZDITDIL?9hgS2J0M=`n*woddmjEJyluNuVI{2k++4*98jF50WJbQtcurMj%AJ
zP)qrYaY8T@nWJC~BwUhmfG8)8^a8p#u!d5oaZe`ef-D0;D$T>1w=k@gCB3z7;#m)8
z^Q*hMRE?cwW32?IcCup0VvgDw)Rawp=DKdhjrq6{b2AP#!7!{qh_6nn3FZqNf!<EM
ze1?>lM{Fm7GC3h9CHT(eq~D!lZs?w@;C2wu|7pWB$5_(SF(F?FcO4=9KePS@`%kM^
z^nWA}Q0fe_sL-pRX{4HM9v5T;Owz+PnnLGDOLzfE@opL&1#}Ol@co`ZfdA=f$*IFL
zQ|qISko?!1g7|MR8E}RFk$_L^01?{;oh(g4PNDW62m$_&PPL?Dq+%{I{B?xlzus`e
z_z$uP6#hp7QDCs&M^o3Z1$_2BkZgNQt&WNUV|l^>>&k?IGyymX9=Te;BW9BGr@&lD
zvu@FnP^$;C93bTjkVBS+os9-OgvgXY|5<koEvD7*G!z{aAq4m@dvWy=2E6t7A2R>7
zO8hSp2$p}A91zNKg)s^kO8@J$c#!;Yt<j+9|42Ym=e(2k&?K-zAWI*edL`9Nvjj2-
zqk+{Udw^mN#zuQcl!amd;r~7~^iwFfT?F%A9$pOZXW-WLze#Ua^nXNf6ZwZV8Wd9h
z<A&<^53WP<H|upqMgK<vb;f^uF@{>vpA_h(SuaxgR)VK&z#?S<=@jG12X2<Ejs!`u
zh#H|2F<c<VZ7|*`9hHy8-GrO)Kdhqxq4;magUA1HlS$!!L?GFJes4byIq?q2K#mZQ
zf#=~V#vz%3HrC}L7!qWQ`~@}+qI92<$i~DW0SK}Mh>Aeh`PghgQXI62ZalhEitma+
zW27LwfTyI2kitODz8r@Id6eJ;gxbb>#3a@Z+ysZzkbo45zi=re%3}iSqO*aW5(g&y
z1&i$?p`Gy10+6!-JIjfe)!A|rV^D3<rz{)z8;Q!D$a;XSM$|*7`6A>;mmk-k0gDYh
zaYG9&jJOH^!#Wyp>-L|_f5rZ*fBd@qT?8-a?zk7+y8O+!R;S2668J6hzf)%*r2TI&
zR@?t(y-KS`4xlpsJ0hsl{+GmF+x)l46SAa!A$?$nd909Q&{vwT+w|9H?xoM<J&WJM
zf1mYr+X^6L{7+}7t^f7n2SDL}Bp}A=ZZMuDv196}8dE+eS~AjOP@0PnMBhNP!Nm+I
z&_)v+l%^8O{RCO>6o<@mRvavL6Fe^s6{DYCWbFqGa9+Gwya^-%jdY))E*b=(`LB<W
z)H)_OX53~Sq4;kw8-w_-HRH<spNOFQl0UVVPOAE<`Vm7%Yi&a_@N{pS$!Zv<B{NOb
zq|7*c#JF*I#&~)f!I0iDqu4~z6i}Tn-Ld7L+V)Mq`mc9!g5_f2@yY5hFl_$rncId$
z8(nFK<}bR44Hh;REE?11qc>l`lb>!<w#<}trtsLOZ!Q0R>GqWms0OZsI~sQy-=|_`
z#Z%usx;1)4&!V?Jm~gRR`UC5da*iK=LOb=1o@HBi^*yzI-}AH1Zo%HInj5$2v;99B
zyK;x)|8ZvgsfX03Qf<*4^uw2R!n%O5ec#<Z+1jdq*<7t>#GEb7zIv>3-kR%GeLuW1
zcR|IxpZ0gMojB78J!sW81*KW42OIds-zB&S|EouH!cfO;_<wql|BC-t{|G7npfR-D
zsUwvBM^0am{zpf}|BDD}`F}cf4#kl1U?fYbT~HuMLLkJoC$d*Kb0#(#(vaXGHXL1;
zJv#<nk;ew)-zX<dSRpN~R{?-<yRn>rmxxg;GA9_q0m&Gvw^nJHkjtfPashSS7N|a`
zG64K>C8_fwpED>=bpw6RID586&AXvZY#;|k$qOS{nzBjl@sA>FhC}4hY5?ZTk>!@M
zNLBiVorBgZ<q?$NTR}s)&=aDT$h3(!U~%#y8s89lJeaJBwNgwhPebU|L~G(u|JO`y
zINSFo{J&F|uNFe_Uuz7W|7kWF75gtDh>{k0i18S)EBnTOG%jz9+z}M7>>fuj|9z_g
zW2E(eci{8YL<s)taGgB=&ulhoag#xe|KKKt{}BQ5|KyV<7gkfwc9u>HqrQG)edS2Y
z=A*j#dH9<1_rEfJPoD|>N}E${Hl5vh?Cn*%S5Dj4JhlCpl=8jT8h5a4n^dtOe`JR?
zZ2Jxg<wM54zHa+Nt%O|Lqmx%?@HW%CHGX8x+O_QJyl>Z53@&)~#i#=p(|UBZbWAOK
zXnE?ZCrwZG2Hc*WO$%P=>3wV9^0NC|waz^DN>5#v<mRen<IXR=?>a30c3ss=&H<OY
zcV5uZeqck<u2~Nb$xdrM=am87ho1Y0e-X5+Sg^j2S9RpasaKw>nljh<@X8gi-@<N<
zVZuwvEf(xumiA8j9*<c2_R1|>Xu(IDT2Jq#?t@2b@o|fy|3Z)k_<pbZo^=$Ym%1mF
z&q!<1>(G+r-9|0{i&gc*ycE^uj)UmVyD}=9>>X4@^gH_c{$#Lt2ld4DImRy2iWVPT
zwBgE1zO=>K{EbQLSJ|3Gm%+;a^{?D&?Dlyn-K6AV)t>gJHdk#b=yml-Y<l7DS0_x-
zmwjY2mQ^+GE?iy(=S9s_eVp|)JXb~a;Jw#UHh4bVK4hcA@-zNg^Q62FqqA1e?5Vb2
zc=pe&;z~~LD&2D6P{!C+Wm(Tv?m00~s7Ni_cDQrp8`owmE$PQh+<C6WniA^|mHS<`
zUVY1-<IR_TE}rzh{?XxuY3{vme{%RS`_F$nb!kFwe&vF-ox2xyEi7j&M{>#wuB?6L
z?JX;NpPMnf|KA<UORj=;lS>9poEdlRWbfA#D~(@XsVvU;By+DWt$R5!%z1SCXD7EZ
zN5(QQe7ej2{ZqwHw0vjr5}SS8rTEj64L_WDeyYdpD31AM^zKvTM~}buuZQ(J=l8zw
zL6Z|d7Ckeoc;%{5*J8fo5`H@L?Uv17d{;5{N-Fisl$V7slQ!CO-fIT`-J-bM89nRL
zwl#Uz-)p&U&e`!_UtB(=s?&-K9iJ{vxPS8Ai`Po_wi~v-vaso#PYb7L`b^uL`XB3#
zV{Ok4<SR$CeZ1Gz1G7dJRTj3KQSjubeN9g_vm~EB+w5|cg{xR)F)ch_+EryNtXh&$
zk@eugizPb`c3C=TpSH-le03wnJ|LgW?T-{;{_!&#q7NVJQMB;A)4vRD(ZafP@xUE}
z^p~zaQ=Ib7#}hWJ*<nl0oc(a=u;XpNx$nu%2L~}%3s>jt{p(`bgnoR`Ci?T26H|M?
zd3x{%jW2(`qTPV$_OCoyKk3s8zKnCIUvAs75xuYV<!JSSK^sQ)Y41O5)SYP5=;*0z
zRiB37e?b3}tgU`#|KE=PZ!qFY{68Y7E&uvi1Qyc%H{G!Q%WP2Ae?<h<5uO?=K&2p%
ze;K&6g~dHJ=Se{|0{j=ZG{N{>M?KULivK1&c>Rx2ng1OjBn-%R(f)m35;fvBG6Ry-
z38*6gl)&)u=qyp=+X5#qFAvKzU@Yf|)g!sZqBM=1?N_r%17LD#`837k)RkEm7Z(>R
zrD|&KL?gEd<WZ#HOw{O2xCS^O<!}nV9~7CW5g;#UlF(fV;*6D~RNov<u|p@sN|(em
zaYm|?-A-{RKgdTVXn<Gx>nq-<tu7r$=XQ#w6EzHx>(#{8E`x`ta8fEnXOc=WhA4%D
zq*zFT_(GEIB4t|5e|aOw`l#d9?LQ;RpxA$rKtTRsjri5ZZOGqb&@1wf1nQ7~V3NGx
z4$oeIp~wG&_kS{Lab^Ffh+rtBX;zG_i4ij}E3lM8lgDy2shK_dF8Wp}2tNY+4{OA)
zHbU`VcSHQoXx1s~|09AZU<u6pthKHRo!BXdhx57r{>Y%X%_b0ag+{GLR<JZVJTOB*
yBPkJSV*p>85<gU+K!E}U3KS?%pg@5F1qu`>P@q780tE^h0RIOcqcM5_cmM#VXTU=M

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/.helmignore b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/Chart.yaml
new file mode 100644
index 000000000..1b63fc3e2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/LICENSE b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/README.md b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..21ae20aad
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/icon.svg b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/values.yaml b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz.v3.reqs/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/frobnitz/.helmignore b/internal/chart/v3/loader/testdata/frobnitz/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz/Chart.lock b/internal/chart/v3/loader/testdata/frobnitz/Chart.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/loader/testdata/frobnitz/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz/Chart.yaml
new file mode 100644
index 000000000..1b63fc3e2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/LICENSE b/internal/chart/v3/loader/testdata/frobnitz/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/README.md b/internal/chart/v3/loader/testdata/frobnitz/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..21ae20aad
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..5c6bc4dcb370466921bbde3c433614bed548313d
GIT binary patch
literal 910
zcmV;919AKxiwFP!000001MQe;XcIvgh9ly&p#D%nsMs-rcQ%{s1*uoOC|E1h3uzIj
z>9pCpm%Ec{#S29gR7CN>`vMg~tXln{cu*A)Zxj_g@kdp#o~;@WbarD(Tah9*5pf;@
zJDZ)IZ<u%Ho&83GmZBre?@1vXK^8^l8jwY<;WddTAacAU27{a=dALB3=LHWCQ`xB`
zF&je*0FPGej0F5;z2=_(qi8?$9~p%fX3L?bwtNgnU`Y^usXre`>d$kcAQSzCpeT6&
z*YaKYng3jWXeyJDWh;gr0%bg-Lk)$%k4eE4Av<CzCU&2OK{iq~5OF37C^jrGHdcr%
z9bsfMWyvN4mS=-Z)NoqydPxH&(u<HDQIH*C0PulC0H_v1Y#Fvq{sX{5reQ1Cu*yRq
zim_>j{C+eWYNm?Vh@ttDbJPu;c%?p|mtzAg=Vku(IR2|N9^2Gx1HbS8ycFc9|EGf{
z`qwW^pS!MDTr%g+V>IXg0v~ksmt}z?djQd2l4a`uX(4lY`$VC2&8<hJXF>NiuM0kR
z%`9J-dn5{G?Uol0Iltky)T+zUO;r!)Uzz^A-#~QzMdz&38UD5VdW^p-ZdtVI4V%AW
z@czneV<su_nR7Sv_q|%lGD=RLNpQfr)ze;P_l@NASax{+g`F86pB$g@Zb8>;@q_uD
zl)9>uC+d1mIJ0Mvzxp5(TfabAdpY~zC$K&KG~W6Cy-n3qz%fZ5@nK77*sa>(t8Uj-
zZk*P(X6}x?hYrDti(_V1^g88RGw|q|U3E8Sy)F1syX5iM+^@qbGPHsx?aTw;@}`u0
zy_1(w`z`BoJoD1#s;J%T{Z;uzY4}{EblyItW^2a>WyTG?@n|f3^sJkA{KpQSe(6`@
z?~q*o7?JH3lD#|yTfp!8zrYhqp#Gl*e%7B{A}DI8MaW{Y*%IkMbN){ffF}COd{CzT
zpALG1iBZJ{<Oe}R<>?3Y|3Py7mq9g#?9?0pG@t*AP5oaC(C@#r&>M_G#W1E~keC5(
zW<Pjjb~tZhZg|}2p)AwTA*P1M<@iVq4PuOnK(RtH^!k*&M8VNmp_{Q|LsNY!)JxnF
z;{=JQ&_ZtdpO|aFgo<SYY=A<iY}=$gMJKoAM$7{B+mRDLac1CkU-L3dgWfr33ZxPa
k0c^z(^(+d7LZMJ76bgkxp-?Ck3Z*gM0Rh<LU;rop09GfxjQ{`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz/icon.svg b/internal/chart/v3/loader/testdata/frobnitz/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz/values.yaml b/internal/chart/v3/loader/testdata/frobnitz/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash-1.2.3.tgz b/internal/chart/v3/loader/testdata/frobnitz_backslash-1.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..dfbe88a735b256fc6c82c62beea78c78b557fc0c
GIT binary patch
literal 3434
zcmV-w4VCgAiwFP!000001MOT3coS6?4pd<c@_sA`!X@S7A?-BJ39W4*lmeBOS9w2d
zCz+dM=wv3$OxlL0&;=1#DdHz6LP4b<50!5bU7=s=uB<EQickd<MYLEzuvTG}N87zK
zN%{!E*qTid=l`HHnS18mJ9FkgbIv{Yj+JB03?<CVFcX$6o+fyEj3U%fBNz<^ajP*J
z)b+PMC^QDO4mW7EY8+RnHF|^Ir~rnL_ap#Zyg+aOC>&OTqZs10a>2@fr?B3tf6NYP
z2W4Ye4u+<Up!(PN>mSFBIt5UNrukpSA6)+)J;x}UyB{)|2Lbq>WG6TQqghK<h}sCo
zf1O(6&wstaDDyuYAfXd7BxEcU<l~e8L<5F!z&JqAPKtr(007yL<0+Pj11dG9!PF}0
zAP1c+PYEpNjstc<aPo06F)){KIBAGkSVxRSe2DmZ6*|P*2RXkQ^_ULRHmXLFvO!*m
z0~C`@&=e^fuHS~+^50E3=n%CLg#Q|iR`2CMvIJVA#DAk!=6^UqIH@T<HfHOT9<JW{
zP$)^rTR6%oNP?5>6c5lpqE-@9)^S>cX)&EjnFZZBEJu2+ice7b!8<whc7cNQgJem9
zR5}QX5eU&jG%!Px>=2Ab?kJc935R4RAd;k!g+K>~)iV$E&Pit-kYyl9rg>QZ6oxgk
zq`SdMJnP~tKEoHt=vY}c#!PTZJ1f>KN;DKuQWo)=1D%TNb8$W9WNb=;VOW6>Z=KW<
z%oR8S-JLkk9x`Jtv7ZDIvO`WP@a}txes?Cixu0nnza9bXf6CbONv70POvn{N(?-zv
z4;g!Z|4*xy?SD8>YswkqQK4Hw)5suOTn@+xm}Gq|G==t&ZEypU;+-_w3g{e6X8B!#
z0Q^r)NlG4@o*cS1g7RN$@Z-P1V9?9_4+p%;28h@eXlH2>ax%65KnTG9iOHrBX~~#_
z3{@M!_^;L7GX5i)1eyO~KqMIHi_Dbud;zal4<wHsQz|1P!DODW!9YS7ND+XY;8B1D
zT%wRiegw>hH0u;S38iu*%K_4J0CLFFu(DBrhY-0E=s)X>rp2;)@r7)I!h`_)_e60a
zOanGP|A(t}IywIr4%}Y<8J^TohT}J90fXsZqsANRU#nK*8rlAb1ClxC?W~I?ff)ji
z&e5)0GR-tgAcrstm|dO-P?TUSw2MR{6axs~`=Pn7LPk?@d;WWd7enzHXuSP5>eRCR
z4-10oKLpvJp!Ofv)#ZQmNKUKK>g4giupnUm$D3Jbkn<S<oiyu4Cf`i(lm(b15s*qT
zu3X?`$-4ZHl!2(1FcFgkVzvfDkCwQVUlw-~g7QBEqXEJAug4Ak{+~h4|Aq&W|L2SL
zb5Ia(gAC*d0XcXso?>j08)#u24uT;;rpRAl;UFsa8i`Cy91?&aQ-G)nbexaL1SG{l
zix|eEGo`Gqm?}mF!VP#zY6uw&6zqGluONpK?0`^OSeIDDT7i?`kQow?LGe{CB|>>j
zU>$TOuu|f{gs)<;e<ZXLE?NK{F<@mm@vt(})5U1in)Cw81int9dZ)84V5yh&5bECu
z&!u}V*C&9*)LwCOD=mZw%Ks3I1~l6LL;T0(`M+VouhqYU-~~++pMu8gUxRD(vi`$?
z#_7Ll!9Y;|UsrGbmqCa0uQTXy`TZXb1oZzUWjA#HO`d63($gTlV8^)3kYmtWnh)&y
zt5kQ>Yx1r|<M{9O!y0J-g697;IzRibGa6<7hXrDu?iS}+QZ}ZHtT)kfx+yI+8kIQ+
zL5vMVA6yg|0WCDaL1_Y^=jlM+JH;WloD~O)odnNIL&fN)8+rS+4mdBKES>}sfJ!<~
zHW$r;#_(SoEg5)Bu+3{!8^QRmGwS{MuU5<Rf5L)3tNzqQ+Nl|&7)*?wsJ4tw!&BX{
z2D5I8noKuPGty)6aZ{$?X;bMr1Vg$fO<)s5S3q&8bnni8sJpcK@;~mC@urG`(=(Ny
zW7yII^LLMm(mPU)EnQK8jTCm|t(esD!#AGClb(twUt>r-UvTP^H}k(+y=UEhiea1K
z-j>~`4y>AA_2jpY?1~!Kukg+Hr&Z+5y>D}3*6Guat7pI7uYA}3L1kMGJ-6V(PVAkU
z#j)EzJ^X{d7k51F@8_qMJ)kU0wnTN+j$P9o>j@?gdgs7QbNeCXi`A}ii*~mD^3m!g
z8*kPO`rz8)WmQXlJlx%K=6rW_p*3IUm1ZdJZ{{0+haf2b>&A7O+(r}PKXFNz9RGy@
zjnKc}XxguDBbfeit-t>DT8-@gg#``bKaDbrV#qi!o+XtIC=ete5aNmxPgFR6J~k23
zkl-OU79Ci)Fd7~4j0kvsBT1StLt0v;0s!H3Vp+9OB1W;uiC_pDB%{sl2DPO_E}ODI
zumH?;u>u5AO@Yp@?T25h0QeG2(zA<#Pd}Nuo_a5K;X;*?cS4KUQx1xcfH0n=DT~xG
z-*B>OEJUHL3SeG|45uU_HR&CH_FJx$Lr{Wu0S)Cqmx_AgVNIM4i}kFb@s6d(ftjip
zGsVR4G=xr7lqwbxK{Y$<PH<5EH!b9AfS~qYukpA4dR+GZ!h%R?k%yR%5uaf1_>aor
zj`pZuj>_(G+@Am5)qv5``oBiUeDx88{~BE5ng3@r>eaY3{;S4~GXKK@6#sd4A}(*B
z?43>Bmq&i}`j+bPrX43WOLOpzm+pOe>cN522A8&>I&QzP@6=oC53HMWs7-R0Nh2yt
zZnW%b+C8IcYwq~29oa5j<10r^er@xf2ignSmPcl;RpA}y_HOy`#!Z{p4LRRzsv4R1
z%nOl6DpLCPGIdKXe;_~km9vH?1_170zgBtA_jA8FEWiBT_8rnsz1&aJGpUVY&6G>4
z@3{$!zS&&!qJ8L<K0TIovmV)6xPQU@qcT%EEP8oppV1dT<X-@ttCnpU=vJKgVfM9W
zYi2FBKeTQw9K5`DOBnxRQrl%EYf|3s()VHWp#Iqf%T4%1Lx;Kjl>_l8H9loU)Pn@6
zgYWgf=NVgGYN>NZ<-C-L{>N73_nwgdpjq+#k`am>-G<XW_NP@xlngH<2A_QGa1vO#
zmwNo>B7M&}g)2|4*m`XpU)pw4?zY4&>n#yc<*@p{L#lV_dw*6+M-*4o9PCoIqh@<v
z|LZ4WQVR~eGHsT&{6mYryryLz;p%$0Byzsuql~BE#Tu$F@4hi&tLuY3qqf;hKjE*o
zNzC~mDr3X^eoE`*Xa3wiw)pJ+(w#?+rA=;Mp7Ct;!85~zs^s$B$9q)2eq-M1;=#=H
zeHYtqEH-~%eb`~?KdACq-gxDwq8aaL9~oPa;w*XV<KvH7fBI|Lm1)_z)yp>Z=u^<E
zppr42$g0e{w(04&cCH(6ao*S=f3xKmUk9CM77v>~KlaAi0k0)g>%X{GU6l55dWj~b
zPbD$Nesa&JXLm6tCNs}}vfujMlSPlWdwb<7i*?GCxN|dg-=BYOw##TMivD@xfwIbz
zr(gZ&L)v{y2V8zX;>-_)PcJB1w|>Hn=x@3BACG;rbI0f3R!zQ^O#M9TCE<(2ZPu)J
zTf={~EvmFfEx59KW6sTY+ihNSVd_^E`Lk-euf5#usiOFMXO>jlC@$$dW=nNJt3{s_
z%u)@Uvm^Q6=DnvnT^Pn!kL&bU|LaE<j4!M%Xg4qKi3x{Vm9;h{ox9NbYK@7jT5mEe
zzf{^wp)aUel~$E;|Iv!#eMft)9)3t&XwKizg0T+GC9{VhLzsK|{MM-BNBb5ofA`$a
zquaJMuU<K9?{Mvv>rWSrc>AMiTQ}~tB&9EWsC3NfPG8^i#EzrGnd=1`vP%B45=PLE
z4c|_G_EJLffH%&Ke81(@&(?MxI@kK8E8|CPYTg&IHswp5+O?n$b+{U(TsC~`_<>z~
zn{ApiEn1u`%Tx?(4*mzQ|0HV(<?R2a%>Oj#jdK1!EV!NiL%9ensQwMNtp5_l<@bLW
zP?zDUw*pj30{NDKOCPSdtL8k(s6zn$i=Q;X_-tFq+6cyf1CIOiU#pYne})C|LvtOp
z?`tm!D)HknLlc$pNc{j6Fnk=^OHg?~e3O%tgXQQjmb1lZk=|lZnaU&fiz3pvm#4N|
znqsm732S0wV`HRJRsHYJczOhKC{nN|sI&%L1?-Tr*#++picC-mkQY>m=&X2g#!6zc
zcMhlc7{|v*hr}{*Mye!kr8p!Ha#0N`;FkV+tJkaRYRA#Om7?hc6+>jZRWS|g;32A<
zlq%5}q+0YrYT+O$RuV7Xki<L4m<Hm%=aZ13Yoqc0AFdYpFZ+N0e+1Bf2r_;R(FFY)
z^afe~;lMBIzjnI3;QTG$0t`O>uk|1Q*Qn+7Utz&$NYkvCQWFzpU_tFt3RMov(WGkO
z!aL|)B_s3*!2b|r{2C${|26*kKNSD#<n{kyK_oEM&irh!t_tl~DVvM)hX20Ip!ji3
zAleF*Qi;4^X>xe&3;~s7M5GS`c+2Gcp$r)^WXO;qLxv0)GGxe*Awz}?88T$ZkkJhI
MAHOr*RseVa0Fp7mZvX%Q

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/.helmignore b/internal/chart/v3/loader/testdata/frobnitz_backslash/.helmignore
new file mode 100755
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.lock b/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.lock
new file mode 100755
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.yaml
new file mode 100755
index 000000000..6a952e333
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz_backslash
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz_backslash/INSTALL.txt
new file mode 100755
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/LICENSE b/internal/chart/v3/loader/testdata/frobnitz_backslash/LICENSE
new file mode 100755
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/README.md b/internal/chart/v3/loader/testdata/frobnitz_backslash/README.md
new file mode 100755
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/_ignore_me
new file mode 100755
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
new file mode 100755
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/README.md
new file mode 100755
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
new file mode 100755
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
new file mode 100755
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100755
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
new file mode 100755
index 000000000..0ac5ca6a8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service | quote }}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
new file mode 100755
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz_backslash/charts/mariner-4.3.2.tgz
new file mode 100755
index 0000000000000000000000000000000000000000..5c6bc4dcb370466921bbde3c433614bed548313d
GIT binary patch
literal 910
zcmV;919AKxiwFP!000001MQe;XcIvgh9ly&p#D%nsMs-rcQ%{s1*uoOC|E1h3uzIj
z>9pCpm%Ec{#S29gR7CN>`vMg~tXln{cu*A)Zxj_g@kdp#o~;@WbarD(Tah9*5pf;@
zJDZ)IZ<u%Ho&83GmZBre?@1vXK^8^l8jwY<;WddTAacAU27{a=dALB3=LHWCQ`xB`
zF&je*0FPGej0F5;z2=_(qi8?$9~p%fX3L?bwtNgnU`Y^usXre`>d$kcAQSzCpeT6&
z*YaKYng3jWXeyJDWh;gr0%bg-Lk)$%k4eE4Av<CzCU&2OK{iq~5OF37C^jrGHdcr%
z9bsfMWyvN4mS=-Z)NoqydPxH&(u<HDQIH*C0PulC0H_v1Y#Fvq{sX{5reQ1Cu*yRq
zim_>j{C+eWYNm?Vh@ttDbJPu;c%?p|mtzAg=Vku(IR2|N9^2Gx1HbS8ycFc9|EGf{
z`qwW^pS!MDTr%g+V>IXg0v~ksmt}z?djQd2l4a`uX(4lY`$VC2&8<hJXF>NiuM0kR
z%`9J-dn5{G?Uol0Iltky)T+zUO;r!)Uzz^A-#~QzMdz&38UD5VdW^p-ZdtVI4V%AW
z@czneV<su_nR7Sv_q|%lGD=RLNpQfr)ze;P_l@NASax{+g`F86pB$g@Zb8>;@q_uD
zl)9>uC+d1mIJ0Mvzxp5(TfabAdpY~zC$K&KG~W6Cy-n3qz%fZ5@nK77*sa>(t8Uj-
zZk*P(X6}x?hYrDti(_V1^g88RGw|q|U3E8Sy)F1syX5iM+^@qbGPHsx?aTw;@}`u0
zy_1(w`z`BoJoD1#s;J%T{Z;uzY4}{EblyItW^2a>WyTG?@n|f3^sJkA{KpQSe(6`@
z?~q*o7?JH3lD#|yTfp!8zrYhqp#Gl*e%7B{A}DI8MaW{Y*%IkMbN){ffF}COd{CzT
zpALG1iBZJ{<Oe}R<>?3Y|3Py7mq9g#?9?0pG@t*AP5oaC(C@#r&>M_G#W1E~keC5(
zW<Pjjb~tZhZg|}2p)AwTA*P1M<@iVq4PuOnK(RtH^!k*&M8VNmp_{Q|LsNY!)JxnF
z;{=JQ&_ZtdpO|aFgo<SYY=A<iY}=$gMJKoAM$7{B+mRDLac1CkU-L3dgWfr33ZxPa
k0c^z(^(+d7LZMJ76bgkxp-?Ck3Z*gM0Rh<LU;rop09GfxjQ{`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz_backslash/docs/README.md
new file mode 100755
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/icon.svg b/internal/chart/v3/loader/testdata/frobnitz_backslash/icon.svg
new file mode 100755
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz_backslash/ignore/me.txt
new file mode 100755
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz_backslash/templates/template.tpl
new file mode 100755
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz_backslash/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_backslash/values.yaml
new file mode 100755
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_backslash/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_bom.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..7f0edc6b2b87a1c9d815dbca7f55e56532f00d0f
GIT binary patch
literal 3453
zcmV-@4TAC?iwFP!000001MOT3coRh)4^-g{@_rl$2SecFA?-GsC#`KEv;`_HukwD_
zZnBeP>1H?VZrX;Y&;t=TDdHz6LP4b<50&o_J)vLgot!7=iBJU;MYLEzuvX!eN86j-
zBqdF$u{EZM`}?4~nVFs0-T(al`~S~>W~>}*W+-7^Mh+#|Gt8_bS`l)n5sZ4hc*Ko*
zwg1rv1+G_X4SJ16Z7?X*xK5|hDS$row^AQ2ULZIC6b>uFQ4G;wxnTLfQ&{WCAG1T+
zLD?9VgCS}|6tF?3YgqocHbDLcJ<0~^5Vila_=C&8;y|%S*3ru5z7-kGfcpGTv=f|w
z(X1saRBZ&~zgDda<iA#{lldPGApVok2^kVH77FsQN&un&LpWe8AZRDWK$HMLHspAU
zWnzI!jp3MDB_(pu$?}xIa_(4Q7X&9C8yyXE35S!0m<4qti`bEPzX~1V8-!dyjXF$=
zX&O}{N!cJT!~%-RCTNP371ysoL;QCW4mwnA1mQo9<9aXuwTSu}iT^sS%>Qrz@t<%~
zQ+#a9)+#+*_4NxS33&@gIRz<ulAYoK`bX5}W6E1h#xV`1RVlNeJBQ^+uP&*rNc_P&
zIrLqDg7kxANrF^52#OI1Q7_a{K9lSaj7Ekim;?!jq#PhBNh7_05{LUK1;1<3SqEep
z2$E?Y`d`AZW|nl<xrk?7oW-Z^Zl`LjEE{bmIHjExYZgn?Euf?<;xpgwQiCqnpu?Pu
zO-V2eD-hzVlUjng0!N^?6YDuc%F89*CxHstAtz;c&plbcJH_1GomobsQD6V3j7^_p
zN=?OtTp>hl1oi)n`at_ngOX(Z9|j=(U#rv^WKp5FLDNVzTU-vv2$-aYEi{GBk(O`+
zlH#2-Itu6-Oy>LVANBd4nv$42Ha$6nZ3N}NHgNn;uhVE`{)YpI|6YLuL~IMRvor}g
znc9C8)aU=iWK&XFGUgyd)<!V?YqWvmKYF8D=6_g#_}>qV^!aE?KU=_S-vi0E$CS!`
z{lH|Nu)*6E!a#}u>;#WoE#MLhdCDijY)G?C(UMRqN3t9sJqeIQmWGv$1U!VultBMk
zXA~{w`FR?$4hjeA^WWpkg)$7-`1qgRh^yuJUpUa9{4+dZp$x~bj{*kM|2U2Z$lqwx
z7-jt*4*2{(-p;yc5||<I$Q_-!CDlx`1TqLCf!XEp0L2oFg?5ps2*m)x_kC#Y2a(Yv
zG{}F?AY({A1C7`JM%*Cl|F9sK{6i593abB+%x}eij0&{|7e5KI{tp8hivM_H40WPE
zNzh5NZlv<f1W#FjNh$(TDaMrxoGf`O5+ubU{6Z&UxIm2CV7y&A${&k62Eq6riqU{z
z{MQ)+^uI=})5-I{!UCWD=kxY+kP~l%4CDv_8F((9Vr-HbXki@=f+0bs$X{ULAj<bD
ziA+o!5`Z96fT#+T&PQhglH#C6bmP&LQhZko8Y2ba20SG-gcJsH_C0Y}Aa*`LC@ri@
z%wny;NpMIF2}q&%Dwjf{JSMOXIulqaabUt%v3P$Zv=S~_0G?vN%5q||GShR5QK&WP
zBbEt#H;L+<&bolbFX|!qzX;Exdmh(U0E@1D;^vlHs1S_*p%@KlwEZXYU!MOP7W_i_
zI|yFDo7xK+FMnKT#AW%11C5e@6P<ye_P^FxYyTU>bd6Sr%klrPpdtHT5_nzn-{hH)
zCG`mD13SiLh8%;w(){gBf0gR4`ApumXcYgwHdtd7K+yOfZV1r-qAHO29}Y<Izoh!c
zvm|g#+0Spv=X6tAY81+I5Q69%h&H%bAPHJ%f`igjLQfAt);q-^vz!$Ni=70|OGCxz
zryE)OwFWpZUMyY&;(<!KPF5G;M<e*JiIS8%CfMdRu8m;)*BS%j{~C=!Z;<&P4)j^|
zr!LY-&0xh4V)R6{WptV$)g7ZZYp1BmbUigAJ;pF@$`nJ|RC*4<knTwn*m%(nP+ThA
zyYrvwF0H=!uX|;jsiNTYOyy@7w)DXK-J>FPj+A3dS5#mlg&lb-CUyMa_2&$UPezol
z(I=cQIQ8)x`QNVIv+h2{@Xc^<%kEPLRn4z@;+uzeMULxV_{MwFD)Q#uw>cr}^y$ac
zvtR39zH9&BvMq<6U2tJ1_IAzUnC+h&{$AIMJ0AOw^Ha+nP?jZIBD-qFuIY~T1d|89
zePE`!{m}BoYS*|$J6nJ8NcED9H){sJe{J!yswF=h?ru4AzB_u*ny>OoGZgnX^NYVj
z5RCt~#&nwAMicx$T;#v(|NZv(<?;_0NozzK!SufY*96F4r#8y*pRgd%|HGA86hp>>
z@hquyK!G3$fe_c8c)Y^-^RbDLh6E3>u_$5T!YGvD85QvSMkQ&&3~6b-3IK%DiDlJ#
zi5SHqLxLe}kc=|B>(rJGxopbfso-{()ixi{7y!PwlGJUH&lynW)(v`}ap6Lhl6OLj
zc!L}ig)fX}Y04tqk8c!NH5MX|Rs}F`i43PyL~7DI>>RLODTkm0?+O~qfu0cEiH9(;
zS}ex1h{ijF9t&owqRkW&&C?J%RgtO~L;=<8X0m;Q@xO^KUmXPFzgib)|KVDl%>S@J
z^8dsDix`g)yRvuuN9AxwdAfk?mEFx~kpJE_fl<;bz{dN0{s_W<+~6JmF&cGhao|U-
zQR{WG{}&b@|Ic$0ad`t}?`-P6yx*6vZK)n_+Hn$Jnq$~_>E4&79vn1nNNF3Y<Ms>t
zPQAJQz`8ky+9Y?GlvG)Aqh(jq?ip2EbH{h>$ad)(S2=3(tDE;c&|b*4JUnx)%FuCc
z@0Jg3+_Z_^kn{DXs*!n5Ki}_2MM~dZrf$jQ59BAmd{+PXK)@aB-zx99{_Z!1=a=8x
zzC-${m-^#96Wb`(Ou4lBo|~}f>&-PU*oR%|(_>jT>yfR6`xo3lDl?_SqL+sC8GZ2s
z{&~>3YT1@SZpDf3XJ31!X4Yc+gX`A9A<KKWgmEt<wp~`TCgrUzeIGIp9*|wI++>)j
z?=W|Oa*!cXZJ4qm@-GCbh3^iy=V@DBYN>NZ<-C-L0moM5_nwgd7qjBKB}s}M-A2$o
z_NP@xl#D1OhMau$a3WZ_mwN2xB3;ipg)2|4*m`XpU)pw4?zV(2>n#zH<*@pHL#ub`
zdVg9<M-*4o9PCoIqh@>Ffa@osQwt8fJZ+Yy`~!=wyryLz;p%$0q~CnShZ#@8i#1eV
z-hCr!tLyzeqqf;hKN?<XlaTX%WX6X1{gu|sPye}nO!3+Mr8|!tOPk!jJmZ<_gJ*^d
zRmtVMkN2p4?Z&*-#Y33s`!2TKSZw~T`mn<?U~uI#yz$D9MKj*jJUq4_#aZ&^N5>zr
z{`j}DE7P)btCwx+(WjtSK_z24kyV*@ZPQb4?p!zU;=Hj#|8C1Kz79IiEFM06e$0)t
z17D4=)_s1hx+v|V^b$O!PbD$Nesa$zXLm6tCNs}{yx;om6Ge};du!z?i*?GC*mE<r
z-<^MUw##TMiu!5dfwIbzr(gNkgPMIy2VQ<J;>`DjPc0}~w|>HnsBgHqAC7&!bH``j
zR878?O#L+LMd9;=ZPu)JTEl<0EvmFfF1WILW6sTY+HGERVd|F^`Lk-euf5#u$)dP>
zXO>jlC@$$dW=nNJt3@9d%u)@Svm^OG=DnvnT^P<+kL&d4fa^yVj4!M%Xg4qK@d<}o
zm9;h{p1aWcYK@7jT5r-Xzf{^wp)06al~$E;|Iv!#eMft)9&t!rXwKizg0T+EC9{Vj
zMVNc~{MN|hNBb5of9Kp!quaJMuU<KP?+DG6>rWLWz4hU=tsD1R64MtxSUTo(r?2jL
ze8<rd%=Ll|StWm62_xu7M{K7*eK9_H;Opl`zSr{Vr)xV8n``~TmGOfnHShBnoASj@
z?OM=>I$VuZE*r6R{Gcwr!#4a(ixwx#G8KcGga7sQKgn7`I{Uv#^Z&JaIsP9OG$8+w
zE&>Z`|Lg1R|6|a~>%YPR|MlPgD?p_nkZ&2dw1vgpGv`UhE!5|~xUmVwXWK&8Mlk;C
z4TeDe<7#>TudpC)SgwQiZTb?g68Df9mY|G7@&_n`;bYNRyvn=(O-@b@mZQa3&K9jf
za*IZJDo?SWEh3G6d1}k0DJJW7h4Gk}m}n_i<-ZM$=Z-)QMGE$Kl}2w+0Xw8@cES6D
zBI8v8<ONj%x++ebu9A@Koxmyf<G5%kNz4<cqe{iC6o<-#TvUS!xTU||>UHW{wHwg6
zm7?i*6+>jZRnc|p;32A<lq$jXQZ2e5wQ!IWD~S_dNWvYYNpHh{&vuX@Y@-SGpHXd;
z?Z0rKzWhTG@vDo*%ikdF{~^o&x5v-Pzjms;;QUp40R|uc*9Xr37Q2i5{SO0>{XZJg
zG%Lo|#E2PKP`i{umBVs0sam-34*Fcl2r=sOKNJzax(LR9JTU%;{C~AP{vQ@d@jp}T
z%+EUOs?dp*vbi{~`|pbkirZ`gQCFyxN@NI2lf!Fg2&g0_B5e%d&6DGYGGxe*Awz}?
f88T$ZkRd~c3>h+H$dDmJM!4~R>e)Ct0C)fZ$tl;`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/.helmignore b/internal/chart/v3/loader/testdata/frobnitz_with_bom/.helmignore
new file mode 100644
index 000000000..7a4b92da2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.lock b/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.lock
new file mode 100644
index 000000000..ed43b227f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.yaml
new file mode 100644
index 000000000..924fae6fc
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz_with_bom/INSTALL.txt
new file mode 100644
index 000000000..77c4e724a
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/LICENSE b/internal/chart/v3/loader/testdata/frobnitz_with_bom/LICENSE
new file mode 100644
index 000000000..c27b00bf2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_bom/README.md
new file mode 100644
index 000000000..e9c40031b
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/_ignore_me
new file mode 100644
index 000000000..a7e3a38b7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..6fe4f411f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
new file mode 100644
index 000000000..ea7526bee
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..0732c7d7d
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..f690d53c4
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..f3e662a28
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
new file mode 100644
index 000000000..6b7cb2596
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_bom/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..5c6bc4dcb370466921bbde3c433614bed548313d
GIT binary patch
literal 910
zcmV;919AKxiwFP!000001MQe;XcIvgh9ly&p#D%nsMs-rcQ%{s1*uoOC|E1h3uzIj
z>9pCpm%Ec{#S29gR7CN>`vMg~tXln{cu*A)Zxj_g@kdp#o~;@WbarD(Tah9*5pf;@
zJDZ)IZ<u%Ho&83GmZBre?@1vXK^8^l8jwY<;WddTAacAU27{a=dALB3=LHWCQ`xB`
zF&je*0FPGej0F5;z2=_(qi8?$9~p%fX3L?bwtNgnU`Y^usXre`>d$kcAQSzCpeT6&
z*YaKYng3jWXeyJDWh;gr0%bg-Lk)$%k4eE4Av<CzCU&2OK{iq~5OF37C^jrGHdcr%
z9bsfMWyvN4mS=-Z)NoqydPxH&(u<HDQIH*C0PulC0H_v1Y#Fvq{sX{5reQ1Cu*yRq
zim_>j{C+eWYNm?Vh@ttDbJPu;c%?p|mtzAg=Vku(IR2|N9^2Gx1HbS8ycFc9|EGf{
z`qwW^pS!MDTr%g+V>IXg0v~ksmt}z?djQd2l4a`uX(4lY`$VC2&8<hJXF>NiuM0kR
z%`9J-dn5{G?Uol0Iltky)T+zUO;r!)Uzz^A-#~QzMdz&38UD5VdW^p-ZdtVI4V%AW
z@czneV<su_nR7Sv_q|%lGD=RLNpQfr)ze;P_l@NASax{+g`F86pB$g@Zb8>;@q_uD
zl)9>uC+d1mIJ0Mvzxp5(TfabAdpY~zC$K&KG~W6Cy-n3qz%fZ5@nK77*sa>(t8Uj-
zZk*P(X6}x?hYrDti(_V1^g88RGw|q|U3E8Sy)F1syX5iM+^@qbGPHsx?aTw;@}`u0
zy_1(w`z`BoJoD1#s;J%T{Z;uzY4}{EblyItW^2a>WyTG?@n|f3^sJkA{KpQSe(6`@
z?~q*o7?JH3lD#|yTfp!8zrYhqp#Gl*e%7B{A}DI8MaW{Y*%IkMbN){ffF}COd{CzT
zpALG1iBZJ{<Oe}R<>?3Y|3Py7mq9g#?9?0pG@t*AP5oaC(C@#r&>M_G#W1E~keC5(
zW<Pjjb~tZhZg|}2p)AwTA*P1M<@iVq4PuOnK(RtH^!k*&M8VNmp_{Q|LsNY!)JxnF
z;{=JQ&_ZtdpO|aFgo<SYY=A<iY}=$gMJKoAM$7{B+mRDLac1CkU-L3dgWfr33ZxPa
k0c^z(^(+d7LZMJ76bgkxp-?Ck3Z*gM0Rh<LU;rop09GfxjQ{`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_bom/docs/README.md
new file mode 100644
index 000000000..816c3e431
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/icon.svg b/internal/chart/v3/loader/testdata/frobnitz_with_bom/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz_with_bom/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz_with_bom/templates/template.tpl
new file mode 100644
index 000000000..bb29c5491
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_bom/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_bom/values.yaml
new file mode 100644
index 000000000..c24ceadf9
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_bom/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/.helmignore b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.lock b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.yaml
new file mode 100644
index 000000000..1b63fc3e2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/LICENSE b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..21ae20aad
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..5c6bc4dcb370466921bbde3c433614bed548313d
GIT binary patch
literal 910
zcmV;919AKxiwFP!000001MQe;XcIvgh9ly&p#D%nsMs-rcQ%{s1*uoOC|E1h3uzIj
z>9pCpm%Ec{#S29gR7CN>`vMg~tXln{cu*A)Zxj_g@kdp#o~;@WbarD(Tah9*5pf;@
zJDZ)IZ<u%Ho&83GmZBre?@1vXK^8^l8jwY<;WddTAacAU27{a=dALB3=LHWCQ`xB`
zF&je*0FPGej0F5;z2=_(qi8?$9~p%fX3L?bwtNgnU`Y^usXre`>d$kcAQSzCpeT6&
z*YaKYng3jWXeyJDWh;gr0%bg-Lk)$%k4eE4Av<CzCU&2OK{iq~5OF37C^jrGHdcr%
z9bsfMWyvN4mS=-Z)NoqydPxH&(u<HDQIH*C0PulC0H_v1Y#Fvq{sX{5reQ1Cu*yRq
zim_>j{C+eWYNm?Vh@ttDbJPu;c%?p|mtzAg=Vku(IR2|N9^2Gx1HbS8ycFc9|EGf{
z`qwW^pS!MDTr%g+V>IXg0v~ksmt}z?djQd2l4a`uX(4lY`$VC2&8<hJXF>NiuM0kR
z%`9J-dn5{G?Uol0Iltky)T+zUO;r!)Uzz^A-#~QzMdz&38UD5VdW^p-ZdtVI4V%AW
z@czneV<su_nR7Sv_q|%lGD=RLNpQfr)ze;P_l@NASax{+g`F86pB$g@Zb8>;@q_uD
zl)9>uC+d1mIJ0Mvzxp5(TfabAdpY~zC$K&KG~W6Cy-n3qz%fZ5@nK77*sa>(t8Uj-
zZk*P(X6}x?hYrDti(_V1^g88RGw|q|U3E8Sy)F1syX5iM+^@qbGPHsx?aTw;@}`u0
zy_1(w`z`BoJoD1#s;J%T{Z;uzY4}{EblyItW^2a>WyTG?@n|f3^sJkA{KpQSe(6`@
z?~q*o7?JH3lD#|yTfp!8zrYhqp#Gl*e%7B{A}DI8MaW{Y*%IkMbN){ffF}COd{CzT
zpALG1iBZJ{<Oe}R<>?3Y|3Py7mq9g#?9?0pG@t*AP5oaC(C@#r&>M_G#W1E~keC5(
zW<Pjjb~tZhZg|}2p)AwTA*P1M<@iVq4PuOnK(RtH^!k*&M8VNmp_{Q|LsNY!)JxnF
z;{=JQ&_ZtdpO|aFgo<SYY=A<iY}=$gMJKoAM$7{B+mRDLac1CkU-L3dgWfr33ZxPa
k0c^z(^(+d7LZMJ76bgkxp-?Ck3Z*gM0Rh<LU;rop09GfxjQ{`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/icon.svg b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/null b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/null
new file mode 120000
index 000000000..dc1dc0cde
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/null
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_dev_null/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/.helmignore b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.lock b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.yaml
new file mode 100644
index 000000000..1b63fc3e2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/INSTALL.txt b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/_ignore_me b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..21ae20aad
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    app.kubernetes.io/name: {{.Chart.Name}}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.9"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..5c6bc4dcb370466921bbde3c433614bed548313d
GIT binary patch
literal 910
zcmV;919AKxiwFP!000001MQe;XcIvgh9ly&p#D%nsMs-rcQ%{s1*uoOC|E1h3uzIj
z>9pCpm%Ec{#S29gR7CN>`vMg~tXln{cu*A)Zxj_g@kdp#o~;@WbarD(Tah9*5pf;@
zJDZ)IZ<u%Ho&83GmZBre?@1vXK^8^l8jwY<;WddTAacAU27{a=dALB3=LHWCQ`xB`
zF&je*0FPGej0F5;z2=_(qi8?$9~p%fX3L?bwtNgnU`Y^usXre`>d$kcAQSzCpeT6&
z*YaKYng3jWXeyJDWh;gr0%bg-Lk)$%k4eE4Av<CzCU&2OK{iq~5OF37C^jrGHdcr%
z9bsfMWyvN4mS=-Z)NoqydPxH&(u<HDQIH*C0PulC0H_v1Y#Fvq{sX{5reQ1Cu*yRq
zim_>j{C+eWYNm?Vh@ttDbJPu;c%?p|mtzAg=Vku(IR2|N9^2Gx1HbS8ycFc9|EGf{
z`qwW^pS!MDTr%g+V>IXg0v~ksmt}z?djQd2l4a`uX(4lY`$VC2&8<hJXF>NiuM0kR
z%`9J-dn5{G?Uol0Iltky)T+zUO;r!)Uzz^A-#~QzMdz&38UD5VdW^p-ZdtVI4V%AW
z@czneV<su_nR7Sv_q|%lGD=RLNpQfr)ze;P_l@NASax{+g`F86pB$g@Zb8>;@q_uD
zl)9>uC+d1mIJ0Mvzxp5(TfabAdpY~zC$K&KG~W6Cy-n3qz%fZ5@nK77*sa>(t8Uj-
zZk*P(X6}x?hYrDti(_V1^g88RGw|q|U3E8Sy)F1syX5iM+^@qbGPHsx?aTw;@}`u0
zy_1(w`z`BoJoD1#s;J%T{Z;uzY4}{EblyItW^2a>WyTG?@n|f3^sJkA{KpQSe(6`@
z?~q*o7?JH3lD#|yTfp!8zrYhqp#Gl*e%7B{A}DI8MaW{Y*%IkMbN){ffF}COd{CzT
zpALG1iBZJ{<Oe}R<>?3Y|3Py7mq9g#?9?0pG@t*AP5oaC(C@#r&>M_G#W1E~keC5(
zW<Pjjb~tZhZg|}2p)AwTA*P1M<@iVq4PuOnK(RtH^!k*&M8VNmp_{Q|LsNY!)JxnF
z;{=JQ&_ZtdpO|aFgo<SYY=A<iY}=$gMJKoAM$7{B+mRDLac1CkU-L3dgWfr33ZxPa
k0c^z(^(+d7LZMJ76bgkxp-?Ck3Z*gM0Rh<LU;rop09GfxjQ{`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/docs/README.md b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/icon.svg b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/ignore/me.txt b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/templates/template.tpl b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/loader/testdata/frobnitz_with_symlink/values.yaml b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/frobnitz_with_symlink/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/loader/testdata/genfrob.sh b/internal/chart/v3/loader/testdata/genfrob.sh
new file mode 100755
index 000000000..eae68906b
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/genfrob.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Pack the albatross chart into the mariner chart.
+echo "Packing albatross into mariner"
+tar -zcvf mariner/charts/albatross-0.1.0.tgz albatross
+
+echo "Packing mariner into frobnitz"
+tar -zcvf frobnitz/charts/mariner-4.3.2.tgz mariner
+cp frobnitz/charts/mariner-4.3.2.tgz frobnitz_backslash/charts/
+cp frobnitz/charts/mariner-4.3.2.tgz frobnitz_with_bom/charts/
+cp frobnitz/charts/mariner-4.3.2.tgz frobnitz_with_dev_null/charts/
+cp frobnitz/charts/mariner-4.3.2.tgz frobnitz_with_symlink/charts/
+
+# Pack the frobnitz chart.
+echo "Packing frobnitz"
+tar --exclude=ignore/* -zcvf frobnitz-1.2.3.tgz frobnitz
+tar --exclude=ignore/* -zcvf frobnitz_backslash-1.2.3.tgz frobnitz_backslash
+tar --exclude=ignore/* -zcvf frobnitz_with_bom.tgz frobnitz_with_bom
diff --git a/internal/chart/v3/loader/testdata/mariner/Chart.yaml b/internal/chart/v3/loader/testdata/mariner/Chart.yaml
new file mode 100644
index 000000000..4d3eea730
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/mariner/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v3
+name: mariner
+description: A Helm chart for Kubernetes
+version: 4.3.2
+home: ""
+dependencies:
+  - name: albatross
+    repository: https://example.com/mariner/charts
+    version: "0.1.0"
diff --git a/internal/chart/v3/loader/testdata/mariner/charts/albatross-0.1.0.tgz b/internal/chart/v3/loader/testdata/mariner/charts/albatross-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..ec7bfbfcf38602dc9f8608c0ac171d5392c16342
GIT binary patch
literal 282
zcmb2|=3oE==C@bwXB}3MVEqvDTSUIH!EbYhLiu9zX4|9FubD9lx6e9sukLKZOAYPR
z3vc+X_e<+fSs~+p!*otl|3|&(9-CEL=DCGt{w%DSuBrRJSC1>xM=dl_YwE<fcOL4=
zJ~ADf>W(jz{_$v6_UC$$^FP-|^JRWLw0HMcx!?oKbo8IC=PI36pE>1>$Gu+)^M5}7
z$$#hetY_g0+syKuzR$6;zw*VQ|Jv6rGvnCa)+|`Qabx0!lWv6@6!+;)(%w30(bvo6
zpJM)eX?@`B_t$=dbZ*Qe_JXzlgTmAQUJsJ~^56Q*Px;fc4`mc9emiIWCd=_ia#rn%
e%(ruS@0R6X%!7CyMmF4kA*$s6gOfpnfdK$0bcT`u

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/loader/testdata/mariner/templates/placeholder.tpl b/internal/chart/v3/loader/testdata/mariner/templates/placeholder.tpl
new file mode 100644
index 000000000..29c11843a
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/mariner/templates/placeholder.tpl
@@ -0,0 +1 @@
+# This is a placeholder.
diff --git a/internal/chart/v3/loader/testdata/mariner/values.yaml b/internal/chart/v3/loader/testdata/mariner/values.yaml
new file mode 100644
index 000000000..b0ccb0086
--- /dev/null
+++ b/internal/chart/v3/loader/testdata/mariner/values.yaml
@@ -0,0 +1,7 @@
+# Default values for <CHARTNAME>.
+# This is a YAML-formatted file. https://github.com/toml-lang/toml
+# Declare name/value pairs to be passed into your templates.
+# name: "value"
+
+<CHARTNAME>:
+  test: true
diff --git a/internal/chart/v3/metadata.go b/internal/chart/v3/metadata.go
new file mode 100644
index 000000000..4629d571b
--- /dev/null
+++ b/internal/chart/v3/metadata.go
@@ -0,0 +1,178 @@
+/*
+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 v3
+
+import (
+	"path/filepath"
+	"strings"
+	"unicode"
+
+	"github.com/Masterminds/semver/v3"
+)
+
+// Maintainer describes a Chart maintainer.
+type Maintainer struct {
+	// Name is a user name or organization name
+	Name string `json:"name,omitempty"`
+	// Email is an optional email address to contact the named maintainer
+	Email string `json:"email,omitempty"`
+	// URL is an optional URL to an address for the named maintainer
+	URL string `json:"url,omitempty"`
+}
+
+// Validate checks valid data and sanitizes string characters.
+func (m *Maintainer) Validate() error {
+	if m == nil {
+		return ValidationError("maintainers must not contain empty or null nodes")
+	}
+	m.Name = sanitizeString(m.Name)
+	m.Email = sanitizeString(m.Email)
+	m.URL = sanitizeString(m.URL)
+	return nil
+}
+
+// Metadata for a Chart file. This models the structure of a Chart.yaml file.
+type Metadata struct {
+	// The name of the chart. Required.
+	Name string `json:"name,omitempty"`
+	// The URL to a relevant project page, git repo, or contact person
+	Home string `json:"home,omitempty"`
+	// Source is the URL to the source code of this chart
+	Sources []string `json:"sources,omitempty"`
+	// A SemVer 2 conformant version string of the chart. Required.
+	Version string `json:"version,omitempty"`
+	// A one-sentence description of the chart
+	Description string `json:"description,omitempty"`
+	// A list of string keywords
+	Keywords []string `json:"keywords,omitempty"`
+	// A list of name and URL/email address combinations for the maintainer(s)
+	Maintainers []*Maintainer `json:"maintainers,omitempty"`
+	// The URL to an icon file.
+	Icon string `json:"icon,omitempty"`
+	// The API Version of this chart. Required.
+	APIVersion string `json:"apiVersion,omitempty"`
+	// The condition to check to enable chart
+	Condition string `json:"condition,omitempty"`
+	// The tags to check to enable chart
+	Tags string `json:"tags,omitempty"`
+	// The version of the application enclosed inside of this chart.
+	AppVersion string `json:"appVersion,omitempty"`
+	// Whether or not this chart is deprecated
+	Deprecated bool `json:"deprecated,omitempty"`
+	// Annotations are additional mappings uninterpreted by Helm,
+	// made available for inspection by other applications.
+	Annotations map[string]string `json:"annotations,omitempty"`
+	// KubeVersion is a SemVer constraint specifying the version of Kubernetes required.
+	KubeVersion string `json:"kubeVersion,omitempty"`
+	// Dependencies are a list of dependencies for a chart.
+	Dependencies []*Dependency `json:"dependencies,omitempty"`
+	// Specifies the chart type: application or library
+	Type string `json:"type,omitempty"`
+}
+
+// Validate checks the metadata for known issues and sanitizes string
+// characters.
+func (md *Metadata) Validate() error {
+	if md == nil {
+		return ValidationError("chart.metadata is required")
+	}
+
+	md.Name = sanitizeString(md.Name)
+	md.Description = sanitizeString(md.Description)
+	md.Home = sanitizeString(md.Home)
+	md.Icon = sanitizeString(md.Icon)
+	md.Condition = sanitizeString(md.Condition)
+	md.Tags = sanitizeString(md.Tags)
+	md.AppVersion = sanitizeString(md.AppVersion)
+	md.KubeVersion = sanitizeString(md.KubeVersion)
+	for i := range md.Sources {
+		md.Sources[i] = sanitizeString(md.Sources[i])
+	}
+	for i := range md.Keywords {
+		md.Keywords[i] = sanitizeString(md.Keywords[i])
+	}
+
+	if md.APIVersion == "" {
+		return ValidationError("chart.metadata.apiVersion is required")
+	}
+	if md.Name == "" {
+		return ValidationError("chart.metadata.name is required")
+	}
+
+	if md.Name != filepath.Base(md.Name) {
+		return ValidationErrorf("chart.metadata.name %q is invalid", md.Name)
+	}
+
+	if md.Version == "" {
+		return ValidationError("chart.metadata.version is required")
+	}
+	if !isValidSemver(md.Version) {
+		return ValidationErrorf("chart.metadata.version %q is invalid", md.Version)
+	}
+	if !isValidChartType(md.Type) {
+		return ValidationError("chart.metadata.type must be application or library")
+	}
+
+	for _, m := range md.Maintainers {
+		if err := m.Validate(); err != nil {
+			return err
+		}
+	}
+
+	// Aliases need to be validated here to make sure that the alias name does
+	// not contain any illegal characters.
+	dependencies := map[string]*Dependency{}
+	for _, dependency := range md.Dependencies {
+		if err := dependency.Validate(); err != nil {
+			return err
+		}
+		key := dependency.Name
+		if dependency.Alias != "" {
+			key = dependency.Alias
+		}
+		if dependencies[key] != nil {
+			return ValidationErrorf("more than one dependency with name or alias %q", key)
+		}
+		dependencies[key] = dependency
+	}
+	return nil
+}
+
+func isValidChartType(in string) bool {
+	switch in {
+	case "", "application", "library":
+		return true
+	}
+	return false
+}
+
+func isValidSemver(v string) bool {
+	_, err := semver.NewVersion(v)
+	return err == nil
+}
+
+// sanitizeString normalize spaces and removes non-printable characters.
+func sanitizeString(str string) string {
+	return strings.Map(func(r rune) rune {
+		if unicode.IsSpace(r) {
+			return ' '
+		}
+		if unicode.IsPrint(r) {
+			return r
+		}
+		return -1
+	}, str)
+}
diff --git a/internal/chart/v3/metadata_test.go b/internal/chart/v3/metadata_test.go
new file mode 100644
index 000000000..596a03695
--- /dev/null
+++ b/internal/chart/v3/metadata_test.go
@@ -0,0 +1,201 @@
+/*
+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 v3
+
+import (
+	"testing"
+)
+
+func TestValidate(t *testing.T) {
+	tests := []struct {
+		name string
+		md   *Metadata
+		err  error
+	}{
+		{
+			"chart without metadata",
+			nil,
+			ValidationError("chart.metadata is required"),
+		},
+		{
+			"chart without apiVersion",
+			&Metadata{Name: "test", Version: "1.0"},
+			ValidationError("chart.metadata.apiVersion is required"),
+		},
+		{
+			"chart without name",
+			&Metadata{APIVersion: "v3", Version: "1.0"},
+			ValidationError("chart.metadata.name is required"),
+		},
+		{
+			"chart without name",
+			&Metadata{Name: "../../test", APIVersion: "v3", Version: "1.0"},
+			ValidationError("chart.metadata.name \"../../test\" is invalid"),
+		},
+		{
+			"chart without version",
+			&Metadata{Name: "test", APIVersion: "v3"},
+			ValidationError("chart.metadata.version is required"),
+		},
+		{
+			"chart with bad type",
+			&Metadata{Name: "test", APIVersion: "v3", Version: "1.0", Type: "test"},
+			ValidationError("chart.metadata.type must be application or library"),
+		},
+		{
+			"chart without dependency",
+			&Metadata{Name: "test", APIVersion: "v3", Version: "1.0", Type: "application"},
+			nil,
+		},
+		{
+			"dependency with valid alias",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "dependency", Alias: "legal-alias"},
+				},
+			},
+			nil,
+		},
+		{
+			"dependency with bad characters in alias",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "bad", Alias: "illegal alias"},
+				},
+			},
+			ValidationError("dependency \"bad\" has disallowed characters in the alias"),
+		},
+		{
+			"same dependency twice",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "foo", Alias: ""},
+					{Name: "foo", Alias: ""},
+				},
+			},
+			ValidationError("more than one dependency with name or alias \"foo\""),
+		},
+		{
+			"two dependencies with alias from second dependency shadowing first one",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "foo", Alias: ""},
+					{Name: "bar", Alias: "foo"},
+				},
+			},
+			ValidationError("more than one dependency with name or alias \"foo\""),
+		},
+		{
+			// this case would make sense and could work in future versions of Helm, currently template rendering would
+			// result in undefined behaviour
+			"same dependency twice with different version",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "foo", Alias: "", Version: "1.2.3"},
+					{Name: "foo", Alias: "", Version: "1.0.0"},
+				},
+			},
+			ValidationError("more than one dependency with name or alias \"foo\""),
+		},
+		{
+			// this case would make sense and could work in future versions of Helm, currently template rendering would
+			// result in undefined behaviour
+			"two dependencies with same name but different repos",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					{Name: "foo", Repository: "repo-0"},
+					{Name: "foo", Repository: "repo-1"},
+				},
+			},
+			ValidationError("more than one dependency with name or alias \"foo\""),
+		},
+		{
+			"dependencies has nil",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Dependencies: []*Dependency{
+					nil,
+				},
+			},
+			ValidationError("dependencies must not contain empty or null nodes"),
+		},
+		{
+			"maintainer not empty",
+			&Metadata{
+				Name:       "test",
+				APIVersion: "v3",
+				Version:    "1.0",
+				Type:       "application",
+				Maintainers: []*Maintainer{
+					nil,
+				},
+			},
+			ValidationError("maintainers must not contain empty or null nodes"),
+		},
+		{
+			"version invalid",
+			&Metadata{APIVersion: "3", Name: "test", Version: "1.2.3.4"},
+			ValidationError("chart.metadata.version \"1.2.3.4\" is invalid"),
+		},
+	}
+
+	for _, tt := range tests {
+		result := tt.md.Validate()
+		if result != tt.err {
+			t.Errorf("expected %q, got %q in test %q", tt.err, result, tt.name)
+		}
+	}
+}
+
+func TestValidate_sanitize(t *testing.T) {
+	md := &Metadata{APIVersion: "3", Name: "test", Version: "1.0", Description: "\adescr\u0081iption\rtest", Maintainers: []*Maintainer{{Name: "\r"}}}
+	if err := md.Validate(); err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	if md.Description != "description test" {
+		t.Fatalf("description was not sanitized: %q", md.Description)
+	}
+	if md.Maintainers[0].Name != " " {
+		t.Fatal("maintainer name was not sanitized")
+	}
+}
diff --git a/internal/chart/v3/util/capabilities.go b/internal/chart/v3/util/capabilities.go
new file mode 100644
index 000000000..23b6d46fa
--- /dev/null
+++ b/internal/chart/v3/util/capabilities.go
@@ -0,0 +1,122 @@
+/*
+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 util
+
+import (
+	"fmt"
+	"slices"
+	"strconv"
+
+	"github.com/Masterminds/semver/v3"
+	"k8s.io/client-go/kubernetes/scheme"
+
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+
+	helmversion "helm.sh/helm/v4/internal/version"
+)
+
+var (
+	// The Kubernetes version can be set by LDFLAGS. In order to do that the value
+	// must be a string.
+	k8sVersionMajor = "1"
+	k8sVersionMinor = "20"
+
+	// DefaultVersionSet is the default version set, which includes only Core V1 ("v1").
+	DefaultVersionSet = allKnownVersions()
+
+	// DefaultCapabilities is the default set of capabilities.
+	DefaultCapabilities = &Capabilities{
+		KubeVersion: KubeVersion{
+			Version: fmt.Sprintf("v%s.%s.0", k8sVersionMajor, k8sVersionMinor),
+			Major:   k8sVersionMajor,
+			Minor:   k8sVersionMinor,
+		},
+		APIVersions: DefaultVersionSet,
+		HelmVersion: helmversion.Get(),
+	}
+)
+
+// Capabilities describes the capabilities of the Kubernetes cluster.
+type Capabilities struct {
+	// KubeVersion is the Kubernetes version.
+	KubeVersion KubeVersion
+	// APIVersions are supported Kubernetes API versions.
+	APIVersions VersionSet
+	// HelmVersion is the build information for this helm version
+	HelmVersion helmversion.BuildInfo
+}
+
+func (capabilities *Capabilities) Copy() *Capabilities {
+	return &Capabilities{
+		KubeVersion: capabilities.KubeVersion,
+		APIVersions: capabilities.APIVersions,
+		HelmVersion: capabilities.HelmVersion,
+	}
+}
+
+// KubeVersion is the Kubernetes version.
+type KubeVersion struct {
+	Version string // Kubernetes version
+	Major   string // Kubernetes major version
+	Minor   string // Kubernetes minor version
+}
+
+// String implements fmt.Stringer
+func (kv *KubeVersion) String() string { return kv.Version }
+
+// GitVersion returns the Kubernetes version string.
+//
+// Deprecated: use KubeVersion.Version.
+func (kv *KubeVersion) GitVersion() string { return kv.Version }
+
+// ParseKubeVersion parses kubernetes version from string
+func ParseKubeVersion(version string) (*KubeVersion, error) {
+	sv, err := semver.NewVersion(version)
+	if err != nil {
+		return nil, err
+	}
+	return &KubeVersion{
+		Version: "v" + sv.String(),
+		Major:   strconv.FormatUint(sv.Major(), 10),
+		Minor:   strconv.FormatUint(sv.Minor(), 10),
+	}, nil
+}
+
+// VersionSet is a set of Kubernetes API versions.
+type VersionSet []string
+
+// Has returns true if the version string is in the set.
+//
+//	vs.Has("apps/v1")
+func (v VersionSet) Has(apiVersion string) bool {
+	return slices.Contains(v, apiVersion)
+}
+
+func allKnownVersions() VersionSet {
+	// We should register the built in extension APIs as well so CRDs are
+	// supported in the default version set. This has caused problems with `helm
+	// template` in the past, so let's be safe
+	apiextensionsv1beta1.AddToScheme(scheme.Scheme)
+	apiextensionsv1.AddToScheme(scheme.Scheme)
+
+	groups := scheme.Scheme.PrioritizedVersionsAllGroups()
+	vs := make(VersionSet, 0, len(groups))
+	for _, gv := range groups {
+		vs = append(vs, gv.String())
+	}
+	return vs
+}
diff --git a/internal/chart/v3/util/capabilities_test.go b/internal/chart/v3/util/capabilities_test.go
new file mode 100644
index 000000000..aa9be9db8
--- /dev/null
+++ b/internal/chart/v3/util/capabilities_test.go
@@ -0,0 +1,84 @@
+/*
+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 util
+
+import (
+	"testing"
+)
+
+func TestVersionSet(t *testing.T) {
+	vs := VersionSet{"v1", "apps/v1"}
+	if d := len(vs); d != 2 {
+		t.Errorf("Expected 2 versions, got %d", d)
+	}
+
+	if !vs.Has("apps/v1") {
+		t.Error("Expected to find apps/v1")
+	}
+
+	if vs.Has("Spanish/inquisition") {
+		t.Error("No one expects the Spanish/inquisition")
+	}
+}
+
+func TestDefaultVersionSet(t *testing.T) {
+	if !DefaultVersionSet.Has("v1") {
+		t.Error("Expected core v1 version set")
+	}
+}
+
+func TestDefaultCapabilities(t *testing.T) {
+	kv := DefaultCapabilities.KubeVersion
+	if kv.String() != "v1.20.0" {
+		t.Errorf("Expected default KubeVersion.String() to be v1.20.0, got %q", kv.String())
+	}
+	if kv.Version != "v1.20.0" {
+		t.Errorf("Expected default KubeVersion.Version to be v1.20.0, got %q", kv.Version)
+	}
+	if kv.GitVersion() != "v1.20.0" {
+		t.Errorf("Expected default KubeVersion.GitVersion() to be v1.20.0, got %q", kv.Version)
+	}
+	if kv.Major != "1" {
+		t.Errorf("Expected default KubeVersion.Major to be 1, got %q", kv.Major)
+	}
+	if kv.Minor != "20" {
+		t.Errorf("Expected default KubeVersion.Minor to be 20, got %q", kv.Minor)
+	}
+}
+
+func TestDefaultCapabilitiesHelmVersion(t *testing.T) {
+	hv := DefaultCapabilities.HelmVersion
+
+	if hv.Version != "v4.0" {
+		t.Errorf("Expected default HelmVersion to be v4.0, got %q", hv.Version)
+	}
+}
+
+func TestParseKubeVersion(t *testing.T) {
+	kv, err := ParseKubeVersion("v1.16.0")
+	if err != nil {
+		t.Errorf("Expected v1.16.0 to parse successfully")
+	}
+	if kv.Version != "v1.16.0" {
+		t.Errorf("Expected parsed KubeVersion.Version to be v1.16.0, got %q", kv.String())
+	}
+	if kv.Major != "1" {
+		t.Errorf("Expected parsed KubeVersion.Major to be 1, got %q", kv.Major)
+	}
+	if kv.Minor != "16" {
+		t.Errorf("Expected parsed KubeVersion.Minor to be 16, got %q", kv.Minor)
+	}
+}
diff --git a/internal/chart/v3/util/chartfile.go b/internal/chart/v3/util/chartfile.go
new file mode 100644
index 000000000..25271e1cf
--- /dev/null
+++ b/internal/chart/v3/util/chartfile.go
@@ -0,0 +1,96 @@
+/*
+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 util
+
+import (
+	"errors"
+	"fmt"
+	"io/fs"
+	"os"
+	"path/filepath"
+
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// LoadChartfile loads a Chart.yaml file into a *chart.Metadata.
+func LoadChartfile(filename string) (*chart.Metadata, error) {
+	b, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	y := new(chart.Metadata)
+	err = yaml.Unmarshal(b, y)
+	return y, err
+}
+
+// StrictLoadChartfile loads a Chart.yaml into a *chart.Metadata using a strict unmarshaling
+func StrictLoadChartfile(filename string) (*chart.Metadata, error) {
+	b, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	y := new(chart.Metadata)
+	err = yaml.UnmarshalStrict(b, y)
+	return y, err
+}
+
+// SaveChartfile saves the given metadata as a Chart.yaml file at the given path.
+//
+// 'filename' should be the complete path and filename ('foo/Chart.yaml')
+func SaveChartfile(filename string, cf *chart.Metadata) error {
+	out, err := yaml.Marshal(cf)
+	if err != nil {
+		return err
+	}
+	return os.WriteFile(filename, out, 0644)
+}
+
+// IsChartDir validate a chart directory.
+//
+// Checks for a valid Chart.yaml.
+func IsChartDir(dirName string) (bool, error) {
+	if fi, err := os.Stat(dirName); err != nil {
+		return false, err
+	} else if !fi.IsDir() {
+		return false, fmt.Errorf("%q is not a directory", dirName)
+	}
+
+	chartYaml := filepath.Join(dirName, ChartfileName)
+	if _, err := os.Stat(chartYaml); errors.Is(err, fs.ErrNotExist) {
+		return false, fmt.Errorf("no %s exists in directory %q", ChartfileName, dirName)
+	}
+
+	chartYamlContent, err := os.ReadFile(chartYaml)
+	if err != nil {
+		return false, fmt.Errorf("cannot read %s in directory %q", ChartfileName, dirName)
+	}
+
+	chartContent := new(chart.Metadata)
+	if err := yaml.Unmarshal(chartYamlContent, &chartContent); err != nil {
+		return false, err
+	}
+	if chartContent == nil {
+		return false, fmt.Errorf("chart metadata (%s) missing", ChartfileName)
+	}
+	if chartContent.Name == "" {
+		return false, fmt.Errorf("invalid chart (%s): name must not be empty", ChartfileName)
+	}
+
+	return true, nil
+}
diff --git a/internal/chart/v3/util/chartfile_test.go b/internal/chart/v3/util/chartfile_test.go
new file mode 100644
index 000000000..c3d19c381
--- /dev/null
+++ b/internal/chart/v3/util/chartfile_test.go
@@ -0,0 +1,117 @@
+/*
+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 util
+
+import (
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+const testfile = "testdata/chartfiletest.yaml"
+
+func TestLoadChartfile(t *testing.T) {
+	f, err := LoadChartfile(testfile)
+	if err != nil {
+		t.Errorf("Failed to open %s: %s", testfile, err)
+		return
+	}
+	verifyChartfile(t, f, "frobnitz")
+}
+
+func verifyChartfile(t *testing.T, f *chart.Metadata, name string) {
+	t.Helper()
+	if f == nil { //nolint:staticcheck
+		t.Fatal("Failed verifyChartfile because f is nil")
+	}
+
+	if f.Name != name {
+		t.Errorf("Expected %s, got %s", name, f.Name)
+	}
+
+	if f.Description != "This is a frobnitz." {
+		t.Errorf("Unexpected description %q", f.Description)
+	}
+
+	if f.Version != "1.2.3" {
+		t.Errorf("Unexpected version %q", f.Version)
+	}
+
+	if len(f.Maintainers) != 2 {
+		t.Errorf("Expected 2 maintainers, got %d", len(f.Maintainers))
+	}
+
+	if f.Maintainers[0].Name != "The Helm Team" {
+		t.Errorf("Unexpected maintainer name.")
+	}
+
+	if f.Maintainers[1].Email != "nobody@example.com" {
+		t.Errorf("Unexpected maintainer email.")
+	}
+
+	if len(f.Sources) != 1 {
+		t.Fatalf("Unexpected number of sources")
+	}
+
+	if f.Sources[0] != "https://example.com/foo/bar" {
+		t.Errorf("Expected https://example.com/foo/bar, got %s", f.Sources)
+	}
+
+	if f.Home != "http://example.com" {
+		t.Error("Unexpected home.")
+	}
+
+	if f.Icon != "https://example.com/64x64.png" {
+		t.Errorf("Unexpected icon: %q", f.Icon)
+	}
+
+	if len(f.Keywords) != 3 {
+		t.Error("Unexpected keywords")
+	}
+
+	if len(f.Annotations) != 2 {
+		t.Fatalf("Unexpected annotations")
+	}
+
+	if want, got := "extravalue", f.Annotations["extrakey"]; want != got {
+		t.Errorf("Want %q, but got %q", want, got)
+	}
+
+	if want, got := "anothervalue", f.Annotations["anotherkey"]; want != got {
+		t.Errorf("Want %q, but got %q", want, got)
+	}
+
+	kk := []string{"frobnitz", "sprocket", "dodad"}
+	for i, k := range f.Keywords {
+		if kk[i] != k {
+			t.Errorf("Expected %q, got %q", kk[i], k)
+		}
+	}
+}
+
+func TestIsChartDir(t *testing.T) {
+	validChartDir, err := IsChartDir("testdata/frobnitz")
+	if !validChartDir {
+		t.Errorf("unexpected error while reading chart-directory: (%v)", err)
+		return
+	}
+	validChartDir, err = IsChartDir("testdata")
+	if validChartDir || err == nil {
+		t.Errorf("expected error but did not get any")
+		return
+	}
+}
diff --git a/internal/chart/v3/util/coalesce.go b/internal/chart/v3/util/coalesce.go
new file mode 100644
index 000000000..caea2e119
--- /dev/null
+++ b/internal/chart/v3/util/coalesce.go
@@ -0,0 +1,308 @@
+/*
+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 util
+
+import (
+	"fmt"
+	"log"
+	"maps"
+
+	"github.com/mitchellh/copystructure"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+func concatPrefix(a, b string) string {
+	if a == "" {
+		return b
+	}
+	return fmt.Sprintf("%s.%s", a, b)
+}
+
+// CoalesceValues coalesces all of the values in a chart (and its subcharts).
+//
+// Values are coalesced together using the following rules:
+//
+//   - Values in a higher level chart always override values in a lower-level
+//     dependency chart
+//   - Scalar values and arrays are replaced, maps are merged
+//   - A chart has access to all of the variables for it, as well as all of
+//     the values destined for its dependencies.
+func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
+	valsCopy, err := copyValues(vals)
+	if err != nil {
+		return vals, err
+	}
+	return coalesce(log.Printf, chrt, valsCopy, "", false)
+}
+
+// MergeValues is used to merge the values in a chart and its subcharts. This
+// is different from Coalescing as nil/null values are preserved.
+//
+// Values are coalesced together using the following rules:
+//
+//   - Values in a higher level chart always override values in a lower-level
+//     dependency chart
+//   - Scalar values and arrays are replaced, maps are merged
+//   - A chart has access to all of the variables for it, as well as all of
+//     the values destined for its dependencies.
+//
+// Retaining Nils is useful when processes early in a Helm action or business
+// logic need to retain them for when Coalescing will happen again later in the
+// business logic.
+func MergeValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
+	valsCopy, err := copyValues(vals)
+	if err != nil {
+		return vals, err
+	}
+	return coalesce(log.Printf, chrt, valsCopy, "", true)
+}
+
+func copyValues(vals map[string]interface{}) (Values, error) {
+	v, err := copystructure.Copy(vals)
+	if err != nil {
+		return vals, err
+	}
+
+	valsCopy := v.(map[string]interface{})
+	// if we have an empty map, make sure it is initialized
+	if valsCopy == nil {
+		valsCopy = make(map[string]interface{})
+	}
+
+	return valsCopy, nil
+}
+
+type printFn func(format string, v ...interface{})
+
+// coalesce coalesces the dest values and the chart values, giving priority to the dest values.
+//
+// This is a helper function for CoalesceValues and MergeValues.
+//
+// Note, the merge argument specifies whether this is being used by MergeValues
+// or CoalesceValues. Coalescing removes null values and their keys in some
+// situations while merging keeps the null values.
+func coalesce(printf printFn, ch *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
+	coalesceValues(printf, ch, dest, prefix, merge)
+	return coalesceDeps(printf, ch, dest, prefix, merge)
+}
+
+// coalesceDeps coalesces the dependencies of the given chart.
+func coalesceDeps(printf printFn, chrt *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
+	for _, subchart := range chrt.Dependencies() {
+		if c, ok := dest[subchart.Name()]; !ok {
+			// If dest doesn't already have the key, create it.
+			dest[subchart.Name()] = make(map[string]interface{})
+		} else if !istable(c) {
+			return dest, fmt.Errorf("type mismatch on %s: %t", subchart.Name(), c)
+		}
+		if dv, ok := dest[subchart.Name()]; ok {
+			dvmap := dv.(map[string]interface{})
+			subPrefix := concatPrefix(prefix, chrt.Metadata.Name)
+			// Get globals out of dest and merge them into dvmap.
+			coalesceGlobals(printf, dvmap, dest, subPrefix, merge)
+			// Now coalesce the rest of the values.
+			var err error
+			dest[subchart.Name()], err = coalesce(printf, subchart, dvmap, subPrefix, merge)
+			if err != nil {
+				return dest, err
+			}
+		}
+	}
+	return dest, nil
+}
+
+// coalesceGlobals copies the globals out of src and merges them into dest.
+//
+// For convenience, returns dest.
+func coalesceGlobals(printf printFn, dest, src map[string]interface{}, prefix string, _ bool) {
+	var dg, sg map[string]interface{}
+
+	if destglob, ok := dest[GlobalKey]; !ok {
+		dg = make(map[string]interface{})
+	} else if dg, ok = destglob.(map[string]interface{}); !ok {
+		printf("warning: skipping globals because destination %s is not a table.", GlobalKey)
+		return
+	}
+
+	if srcglob, ok := src[GlobalKey]; !ok {
+		sg = make(map[string]interface{})
+	} else if sg, ok = srcglob.(map[string]interface{}); !ok {
+		printf("warning: skipping globals because source %s is not a table.", GlobalKey)
+		return
+	}
+
+	// EXPERIMENTAL: In the past, we have disallowed globals to test tables. This
+	// reverses that decision. It may somehow be possible to introduce a loop
+	// here, but I haven't found a way. So for the time being, let's allow
+	// tables in globals.
+	for key, val := range sg {
+		if istable(val) {
+			vv := copyMap(val.(map[string]interface{}))
+			if destv, ok := dg[key]; !ok {
+				// Here there is no merge. We're just adding.
+				dg[key] = vv
+			} else {
+				if destvmap, ok := destv.(map[string]interface{}); !ok {
+					printf("Conflict: cannot merge map onto non-map for %q. Skipping.", key)
+				} else {
+					// Basically, we reverse order of coalesce here to merge
+					// top-down.
+					subPrefix := concatPrefix(prefix, key)
+					// In this location coalesceTablesFullKey should always have
+					// merge set to true. The output of coalesceGlobals is run
+					// through coalesce where any nils will be removed.
+					coalesceTablesFullKey(printf, vv, destvmap, subPrefix, true)
+					dg[key] = vv
+				}
+			}
+		} else if dv, ok := dg[key]; ok && istable(dv) {
+			// It's not clear if this condition can actually ever trigger.
+			printf("key %s is table. Skipping", key)
+		} else {
+			// TODO: Do we need to do any additional checking on the value?
+			dg[key] = val
+		}
+	}
+	dest[GlobalKey] = dg
+}
+
+func copyMap(src map[string]interface{}) map[string]interface{} {
+	m := make(map[string]interface{}, len(src))
+	maps.Copy(m, src)
+	return m
+}
+
+// coalesceValues builds up a values map for a particular chart.
+//
+// Values in v will override the values in the chart.
+func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, prefix string, merge bool) {
+	subPrefix := concatPrefix(prefix, c.Metadata.Name)
+
+	// Using c.Values directly when coalescing a table can cause problems where
+	// the original c.Values is altered. Creating a deep copy stops the problem.
+	// This section is fault-tolerant as there is no ability to return an error.
+	valuesCopy, err := copystructure.Copy(c.Values)
+	var vc map[string]interface{}
+	var ok bool
+	if err != nil {
+		// If there is an error something is wrong with copying c.Values it
+		// means there is a problem in the deep copying package or something
+		// wrong with c.Values. In this case we will use c.Values and report
+		// an error.
+		printf("warning: unable to copy values, err: %s", err)
+		vc = c.Values
+	} else {
+		vc, ok = valuesCopy.(map[string]interface{})
+		if !ok {
+			// c.Values has a map[string]interface{} structure. If the copy of
+			// it cannot be treated as map[string]interface{} there is something
+			// strangely wrong. Log it and use c.Values
+			printf("warning: unable to convert values copy to values type")
+			vc = c.Values
+		}
+	}
+
+	for key, val := range vc {
+		if value, ok := v[key]; ok {
+			if value == nil && !merge {
+				// When the YAML value is null and we are coalescing instead of
+				// merging, we remove the value's key.
+				// This allows Helm's various sources of values (value files or --set) to
+				// remove incompatible keys from any previous chart, file, or set values.
+				delete(v, key)
+			} else if dest, ok := value.(map[string]interface{}); ok {
+				// if v[key] is a table, merge nv's val table into v[key].
+				src, ok := val.(map[string]interface{})
+				if !ok {
+					// If the original value is nil, there is nothing to coalesce, so we don't print
+					// the warning
+					if val != nil {
+						printf("warning: skipped value for %s.%s: Not a table.", subPrefix, key)
+					}
+				} else {
+					// If the key is a child chart, coalesce tables with Merge set to true
+					merge := childChartMergeTrue(c, key, merge)
+
+					// Because v has higher precedence than nv, dest values override src
+					// values.
+					coalesceTablesFullKey(printf, dest, src, concatPrefix(subPrefix, key), merge)
+				}
+			}
+		} else {
+			// If the key is not in v, copy it from nv.
+			v[key] = val
+		}
+	}
+}
+
+func childChartMergeTrue(chrt *chart.Chart, key string, merge bool) bool {
+	for _, subchart := range chrt.Dependencies() {
+		if subchart.Name() == key {
+			return true
+		}
+	}
+	return merge
+}
+
+// CoalesceTables merges a source map into a destination map.
+//
+// dest is considered authoritative.
+func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} {
+	return coalesceTablesFullKey(log.Printf, dst, src, "", false)
+}
+
+func MergeTables(dst, src map[string]interface{}) map[string]interface{} {
+	return coalesceTablesFullKey(log.Printf, dst, src, "", true)
+}
+
+// coalesceTablesFullKey merges a source map into a destination map.
+//
+// dest is considered authoritative.
+func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, prefix string, merge bool) map[string]interface{} {
+	// When --reuse-values is set but there are no modifications yet, return new values
+	if src == nil {
+		return dst
+	}
+	if dst == nil {
+		return src
+	}
+	for key, val := range dst {
+		if val == nil {
+			src[key] = nil
+		}
+	}
+	// Because dest has higher precedence than src, dest values override src
+	// values.
+	for key, val := range src {
+		fullkey := concatPrefix(prefix, key)
+		if dv, ok := dst[key]; ok && !merge && dv == nil {
+			delete(dst, key)
+		} else if !ok {
+			dst[key] = val
+		} else if istable(val) {
+			if istable(dv) {
+				coalesceTablesFullKey(printf, dv.(map[string]interface{}), val.(map[string]interface{}), fullkey, merge)
+			} else {
+				printf("warning: cannot overwrite table with non table for %s (%v)", fullkey, val)
+			}
+		} else if istable(dv) && val != nil {
+			printf("warning: destination for %s is a table. Ignoring non-table value (%v)", fullkey, val)
+		}
+	}
+	return dst
+}
diff --git a/internal/chart/v3/util/coalesce_test.go b/internal/chart/v3/util/coalesce_test.go
new file mode 100644
index 000000000..4770b601d
--- /dev/null
+++ b/internal/chart/v3/util/coalesce_test.go
@@ -0,0 +1,723 @@
+/*
+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 util
+
+import (
+	"encoding/json"
+	"fmt"
+	"maps"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
+var testCoalesceValuesYaml = []byte(`
+top: yup
+bottom: null
+right: Null
+left: NULL
+front: ~
+back: ""
+nested:
+  boat: null
+
+global:
+  name: Ishmael
+  subject: Queequeg
+  nested:
+    boat: true
+
+pequod:
+  boat: null
+  global:
+    name: Stinky
+    harpooner: Tashtego
+    nested:
+      boat: false
+      sail: true
+      foo2: null
+  ahab:
+    scope: whale
+    boat: null
+    nested:
+      foo: true
+      boat: null
+    object: null
+`)
+
+func withDeps(c *chart.Chart, deps ...*chart.Chart) *chart.Chart {
+	c.AddDependency(deps...)
+	return c
+}
+
+func TestCoalesceValues(t *testing.T) {
+	is := assert.New(t)
+
+	c := withDeps(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "moby"},
+		Values: map[string]interface{}{
+			"back":     "exists",
+			"bottom":   "exists",
+			"front":    "exists",
+			"left":     "exists",
+			"name":     "moby",
+			"nested":   map[string]interface{}{"boat": true},
+			"override": "bad",
+			"right":    "exists",
+			"scope":    "moby",
+			"top":      "nope",
+			"global": map[string]interface{}{
+				"nested2": map[string]interface{}{"l0": "moby"},
+			},
+			"pequod": map[string]interface{}{
+				"boat": "maybe",
+				"ahab": map[string]interface{}{
+					"boat":   "maybe",
+					"nested": map[string]interface{}{"boat": "maybe"},
+				},
+			},
+		},
+	},
+		withDeps(&chart.Chart{
+			Metadata: &chart.Metadata{Name: "pequod"},
+			Values: map[string]interface{}{
+				"name":  "pequod",
+				"scope": "pequod",
+				"global": map[string]interface{}{
+					"nested2": map[string]interface{}{"l1": "pequod"},
+				},
+				"boat": false,
+				"ahab": map[string]interface{}{
+					"boat":   false,
+					"nested": map[string]interface{}{"boat": false},
+				},
+			},
+		},
+			&chart.Chart{
+				Metadata: &chart.Metadata{Name: "ahab"},
+				Values: map[string]interface{}{
+					"global": map[string]interface{}{
+						"nested":  map[string]interface{}{"foo": "bar", "foo2": "bar2"},
+						"nested2": map[string]interface{}{"l2": "ahab"},
+					},
+					"scope":  "ahab",
+					"name":   "ahab",
+					"boat":   true,
+					"nested": map[string]interface{}{"foo": false, "boat": true},
+					"object": map[string]interface{}{"foo": "bar"},
+				},
+			},
+		),
+		&chart.Chart{
+			Metadata: &chart.Metadata{Name: "spouter"},
+			Values: map[string]interface{}{
+				"scope": "spouter",
+				"global": map[string]interface{}{
+					"nested2": map[string]interface{}{"l1": "spouter"},
+				},
+			},
+		},
+	)
+
+	vals, err := ReadValues(testCoalesceValuesYaml)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// taking a copy of the values before passing it
+	// to CoalesceValues as argument, so that we can
+	// use it for asserting later
+	valsCopy := make(Values, len(vals))
+	maps.Copy(valsCopy, vals)
+
+	v, err := CoalesceValues(c, vals)
+	if err != nil {
+		t.Fatal(err)
+	}
+	j, _ := json.MarshalIndent(v, "", "  ")
+	t.Logf("Coalesced Values: %s", string(j))
+
+	tests := []struct {
+		tpl    string
+		expect string
+	}{
+		{"{{.top}}", "yup"},
+		{"{{.back}}", ""},
+		{"{{.name}}", "moby"},
+		{"{{.global.name}}", "Ishmael"},
+		{"{{.global.subject}}", "Queequeg"},
+		{"{{.global.harpooner}}", "<no value>"},
+		{"{{.pequod.name}}", "pequod"},
+		{"{{.pequod.ahab.name}}", "ahab"},
+		{"{{.pequod.ahab.scope}}", "whale"},
+		{"{{.pequod.ahab.nested.foo}}", "true"},
+		{"{{.pequod.ahab.global.name}}", "Ishmael"},
+		{"{{.pequod.ahab.global.nested.foo}}", "bar"},
+		{"{{.pequod.ahab.global.nested.foo2}}", "<no value>"},
+		{"{{.pequod.ahab.global.subject}}", "Queequeg"},
+		{"{{.pequod.ahab.global.harpooner}}", "Tashtego"},
+		{"{{.pequod.global.name}}", "Ishmael"},
+		{"{{.pequod.global.nested.foo}}", "<no value>"},
+		{"{{.pequod.global.subject}}", "Queequeg"},
+		{"{{.spouter.global.name}}", "Ishmael"},
+		{"{{.spouter.global.harpooner}}", "<no value>"},
+
+		{"{{.global.nested.boat}}", "true"},
+		{"{{.pequod.global.nested.boat}}", "true"},
+		{"{{.spouter.global.nested.boat}}", "true"},
+		{"{{.pequod.global.nested.sail}}", "true"},
+		{"{{.spouter.global.nested.sail}}", "<no value>"},
+
+		{"{{.global.nested2.l0}}", "moby"},
+		{"{{.global.nested2.l1}}", "<no value>"},
+		{"{{.global.nested2.l2}}", "<no value>"},
+		{"{{.pequod.global.nested2.l0}}", "moby"},
+		{"{{.pequod.global.nested2.l1}}", "pequod"},
+		{"{{.pequod.global.nested2.l2}}", "<no value>"},
+		{"{{.pequod.ahab.global.nested2.l0}}", "moby"},
+		{"{{.pequod.ahab.global.nested2.l1}}", "pequod"},
+		{"{{.pequod.ahab.global.nested2.l2}}", "ahab"},
+		{"{{.spouter.global.nested2.l0}}", "moby"},
+		{"{{.spouter.global.nested2.l1}}", "spouter"},
+		{"{{.spouter.global.nested2.l2}}", "<no value>"},
+	}
+
+	for _, tt := range tests {
+		if o, err := ttpl(tt.tpl, v); err != nil || o != tt.expect {
+			t.Errorf("Expected %q to expand to %q, got %q", tt.tpl, tt.expect, o)
+		}
+	}
+
+	nullKeys := []string{"bottom", "right", "left", "front"}
+	for _, nullKey := range nullKeys {
+		if _, ok := v[nullKey]; ok {
+			t.Errorf("Expected key %q to be removed, still present", nullKey)
+		}
+	}
+
+	if _, ok := v["nested"].(map[string]interface{})["boat"]; ok {
+		t.Error("Expected nested boat key to be removed, still present")
+	}
+
+	subchart := v["pequod"].(map[string]interface{})
+	if _, ok := subchart["boat"]; ok {
+		t.Error("Expected subchart boat key to be removed, still present")
+	}
+
+	subsubchart := subchart["ahab"].(map[string]interface{})
+	if _, ok := subsubchart["boat"]; ok {
+		t.Error("Expected sub-subchart ahab boat key to be removed, still present")
+	}
+
+	if _, ok := subsubchart["nested"].(map[string]interface{})["boat"]; ok {
+		t.Error("Expected sub-subchart nested boat key to be removed, still present")
+	}
+
+	if _, ok := subsubchart["object"]; ok {
+		t.Error("Expected sub-subchart object map to be removed, still present")
+	}
+
+	// CoalesceValues should not mutate the passed arguments
+	is.Equal(valsCopy, vals)
+}
+
+func TestMergeValues(t *testing.T) {
+	is := assert.New(t)
+
+	c := withDeps(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "moby"},
+		Values: map[string]interface{}{
+			"back":     "exists",
+			"bottom":   "exists",
+			"front":    "exists",
+			"left":     "exists",
+			"name":     "moby",
+			"nested":   map[string]interface{}{"boat": true},
+			"override": "bad",
+			"right":    "exists",
+			"scope":    "moby",
+			"top":      "nope",
+			"global": map[string]interface{}{
+				"nested2": map[string]interface{}{"l0": "moby"},
+			},
+		},
+	},
+		withDeps(&chart.Chart{
+			Metadata: &chart.Metadata{Name: "pequod"},
+			Values: map[string]interface{}{
+				"name":  "pequod",
+				"scope": "pequod",
+				"global": map[string]interface{}{
+					"nested2": map[string]interface{}{"l1": "pequod"},
+				},
+			},
+		},
+			&chart.Chart{
+				Metadata: &chart.Metadata{Name: "ahab"},
+				Values: map[string]interface{}{
+					"global": map[string]interface{}{
+						"nested":  map[string]interface{}{"foo": "bar"},
+						"nested2": map[string]interface{}{"l2": "ahab"},
+					},
+					"scope":  "ahab",
+					"name":   "ahab",
+					"boat":   true,
+					"nested": map[string]interface{}{"foo": false, "bar": true},
+				},
+			},
+		),
+		&chart.Chart{
+			Metadata: &chart.Metadata{Name: "spouter"},
+			Values: map[string]interface{}{
+				"scope": "spouter",
+				"global": map[string]interface{}{
+					"nested2": map[string]interface{}{"l1": "spouter"},
+				},
+			},
+		},
+	)
+
+	vals, err := ReadValues(testCoalesceValuesYaml)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// taking a copy of the values before passing it
+	// to MergeValues as argument, so that we can
+	// use it for asserting later
+	valsCopy := make(Values, len(vals))
+	maps.Copy(valsCopy, vals)
+
+	v, err := MergeValues(c, vals)
+	if err != nil {
+		t.Fatal(err)
+	}
+	j, _ := json.MarshalIndent(v, "", "  ")
+	t.Logf("Coalesced Values: %s", string(j))
+
+	tests := []struct {
+		tpl    string
+		expect string
+	}{
+		{"{{.top}}", "yup"},
+		{"{{.back}}", ""},
+		{"{{.name}}", "moby"},
+		{"{{.global.name}}", "Ishmael"},
+		{"{{.global.subject}}", "Queequeg"},
+		{"{{.global.harpooner}}", "<no value>"},
+		{"{{.pequod.name}}", "pequod"},
+		{"{{.pequod.ahab.name}}", "ahab"},
+		{"{{.pequod.ahab.scope}}", "whale"},
+		{"{{.pequod.ahab.nested.foo}}", "true"},
+		{"{{.pequod.ahab.global.name}}", "Ishmael"},
+		{"{{.pequod.ahab.global.nested.foo}}", "bar"},
+		{"{{.pequod.ahab.global.subject}}", "Queequeg"},
+		{"{{.pequod.ahab.global.harpooner}}", "Tashtego"},
+		{"{{.pequod.global.name}}", "Ishmael"},
+		{"{{.pequod.global.nested.foo}}", "<no value>"},
+		{"{{.pequod.global.subject}}", "Queequeg"},
+		{"{{.spouter.global.name}}", "Ishmael"},
+		{"{{.spouter.global.harpooner}}", "<no value>"},
+
+		{"{{.global.nested.boat}}", "true"},
+		{"{{.pequod.global.nested.boat}}", "true"},
+		{"{{.spouter.global.nested.boat}}", "true"},
+		{"{{.pequod.global.nested.sail}}", "true"},
+		{"{{.spouter.global.nested.sail}}", "<no value>"},
+
+		{"{{.global.nested2.l0}}", "moby"},
+		{"{{.global.nested2.l1}}", "<no value>"},
+		{"{{.global.nested2.l2}}", "<no value>"},
+		{"{{.pequod.global.nested2.l0}}", "moby"},
+		{"{{.pequod.global.nested2.l1}}", "pequod"},
+		{"{{.pequod.global.nested2.l2}}", "<no value>"},
+		{"{{.pequod.ahab.global.nested2.l0}}", "moby"},
+		{"{{.pequod.ahab.global.nested2.l1}}", "pequod"},
+		{"{{.pequod.ahab.global.nested2.l2}}", "ahab"},
+		{"{{.spouter.global.nested2.l0}}", "moby"},
+		{"{{.spouter.global.nested2.l1}}", "spouter"},
+		{"{{.spouter.global.nested2.l2}}", "<no value>"},
+	}
+
+	for _, tt := range tests {
+		if o, err := ttpl(tt.tpl, v); err != nil || o != tt.expect {
+			t.Errorf("Expected %q to expand to %q, got %q", tt.tpl, tt.expect, o)
+		}
+	}
+
+	// nullKeys is different from coalescing. Here the null/nil values are not
+	// removed.
+	nullKeys := []string{"bottom", "right", "left", "front"}
+	for _, nullKey := range nullKeys {
+		if vv, ok := v[nullKey]; !ok {
+			t.Errorf("Expected key %q to be present but it was removed", nullKey)
+		} else if vv != nil {
+			t.Errorf("Expected key %q to be null but it has a value of %v", nullKey, vv)
+		}
+	}
+
+	if _, ok := v["nested"].(map[string]interface{})["boat"]; !ok {
+		t.Error("Expected nested boat key to be present but it was removed")
+	}
+
+	subchart := v["pequod"].(map[string]interface{})["ahab"].(map[string]interface{})
+	if _, ok := subchart["boat"]; !ok {
+		t.Error("Expected subchart boat key to be present but it was removed")
+	}
+
+	if _, ok := subchart["nested"].(map[string]interface{})["bar"]; !ok {
+		t.Error("Expected subchart nested bar key to be present but it was removed")
+	}
+
+	// CoalesceValues should not mutate the passed arguments
+	is.Equal(valsCopy, vals)
+}
+
+func TestCoalesceTables(t *testing.T) {
+	dst := map[string]interface{}{
+		"name": "Ishmael",
+		"address": map[string]interface{}{
+			"street":  "123 Spouter Inn Ct.",
+			"city":    "Nantucket",
+			"country": nil,
+		},
+		"details": map[string]interface{}{
+			"friends": []string{"Tashtego"},
+		},
+		"boat": "pequod",
+		"hole": nil,
+	}
+	src := map[string]interface{}{
+		"occupation": "whaler",
+		"address": map[string]interface{}{
+			"state":   "MA",
+			"street":  "234 Spouter Inn Ct.",
+			"country": "US",
+		},
+		"details": "empty",
+		"boat": map[string]interface{}{
+			"mast": true,
+		},
+		"hole": "black",
+	}
+
+	// What we expect is that anything in dst overrides anything in src, but that
+	// otherwise the values are coalesced.
+	CoalesceTables(dst, src)
+
+	if dst["name"] != "Ishmael" {
+		t.Errorf("Unexpected name: %s", dst["name"])
+	}
+	if dst["occupation"] != "whaler" {
+		t.Errorf("Unexpected occupation: %s", dst["occupation"])
+	}
+
+	addr, ok := dst["address"].(map[string]interface{})
+	if !ok {
+		t.Fatal("Address went away.")
+	}
+
+	if addr["street"].(string) != "123 Spouter Inn Ct." {
+		t.Errorf("Unexpected address: %v", addr["street"])
+	}
+
+	if addr["city"].(string) != "Nantucket" {
+		t.Errorf("Unexpected city: %v", addr["city"])
+	}
+
+	if addr["state"].(string) != "MA" {
+		t.Errorf("Unexpected state: %v", addr["state"])
+	}
+
+	if _, ok = addr["country"]; ok {
+		t.Error("The country is not left out.")
+	}
+
+	if det, ok := dst["details"].(map[string]interface{}); !ok {
+		t.Fatalf("Details is the wrong type: %v", dst["details"])
+	} else if _, ok := det["friends"]; !ok {
+		t.Error("Could not find your friends. Maybe you don't have any. :-(")
+	}
+
+	if dst["boat"].(string) != "pequod" {
+		t.Errorf("Expected boat string, got %v", dst["boat"])
+	}
+
+	if _, ok = dst["hole"]; ok {
+		t.Error("The hole still exists.")
+	}
+
+	dst2 := map[string]interface{}{
+		"name": "Ishmael",
+		"address": map[string]interface{}{
+			"street":  "123 Spouter Inn Ct.",
+			"city":    "Nantucket",
+			"country": "US",
+		},
+		"details": map[string]interface{}{
+			"friends": []string{"Tashtego"},
+		},
+		"boat": "pequod",
+		"hole": "black",
+	}
+
+	// What we expect is that anything in dst should have all values set,
+	// this happens when the --reuse-values flag is set but the chart has no modifications yet
+	CoalesceTables(dst2, nil)
+
+	if dst2["name"] != "Ishmael" {
+		t.Errorf("Unexpected name: %s", dst2["name"])
+	}
+
+	addr2, ok := dst2["address"].(map[string]interface{})
+	if !ok {
+		t.Fatal("Address went away.")
+	}
+
+	if addr2["street"].(string) != "123 Spouter Inn Ct." {
+		t.Errorf("Unexpected address: %v", addr2["street"])
+	}
+
+	if addr2["city"].(string) != "Nantucket" {
+		t.Errorf("Unexpected city: %v", addr2["city"])
+	}
+
+	if addr2["country"].(string) != "US" {
+		t.Errorf("Unexpected Country: %v", addr2["country"])
+	}
+
+	if det2, ok := dst2["details"].(map[string]interface{}); !ok {
+		t.Fatalf("Details is the wrong type: %v", dst2["details"])
+	} else if _, ok := det2["friends"]; !ok {
+		t.Error("Could not find your friends. Maybe you don't have any. :-(")
+	}
+
+	if dst2["boat"].(string) != "pequod" {
+		t.Errorf("Expected boat string, got %v", dst2["boat"])
+	}
+
+	if dst2["hole"].(string) != "black" {
+		t.Errorf("Expected hole string, got %v", dst2["boat"])
+	}
+}
+
+func TestMergeTables(t *testing.T) {
+	dst := map[string]interface{}{
+		"name": "Ishmael",
+		"address": map[string]interface{}{
+			"street":  "123 Spouter Inn Ct.",
+			"city":    "Nantucket",
+			"country": nil,
+		},
+		"details": map[string]interface{}{
+			"friends": []string{"Tashtego"},
+		},
+		"boat": "pequod",
+		"hole": nil,
+	}
+	src := map[string]interface{}{
+		"occupation": "whaler",
+		"address": map[string]interface{}{
+			"state":   "MA",
+			"street":  "234 Spouter Inn Ct.",
+			"country": "US",
+		},
+		"details": "empty",
+		"boat": map[string]interface{}{
+			"mast": true,
+		},
+		"hole": "black",
+	}
+
+	// What we expect is that anything in dst overrides anything in src, but that
+	// otherwise the values are coalesced.
+	MergeTables(dst, src)
+
+	if dst["name"] != "Ishmael" {
+		t.Errorf("Unexpected name: %s", dst["name"])
+	}
+	if dst["occupation"] != "whaler" {
+		t.Errorf("Unexpected occupation: %s", dst["occupation"])
+	}
+
+	addr, ok := dst["address"].(map[string]interface{})
+	if !ok {
+		t.Fatal("Address went away.")
+	}
+
+	if addr["street"].(string) != "123 Spouter Inn Ct." {
+		t.Errorf("Unexpected address: %v", addr["street"])
+	}
+
+	if addr["city"].(string) != "Nantucket" {
+		t.Errorf("Unexpected city: %v", addr["city"])
+	}
+
+	if addr["state"].(string) != "MA" {
+		t.Errorf("Unexpected state: %v", addr["state"])
+	}
+
+	// This is one test that is different from CoalesceTables. Because country
+	// is a nil value and it's not removed it's still present.
+	if _, ok = addr["country"]; !ok {
+		t.Error("The country is left out.")
+	}
+
+	if det, ok := dst["details"].(map[string]interface{}); !ok {
+		t.Fatalf("Details is the wrong type: %v", dst["details"])
+	} else if _, ok := det["friends"]; !ok {
+		t.Error("Could not find your friends. Maybe you don't have any. :-(")
+	}
+
+	if dst["boat"].(string) != "pequod" {
+		t.Errorf("Expected boat string, got %v", dst["boat"])
+	}
+
+	// This is one test that is different from CoalesceTables. Because hole
+	// is a nil value and it's not removed it's still present.
+	if _, ok = dst["hole"]; !ok {
+		t.Error("The hole no longer exists.")
+	}
+
+	dst2 := map[string]interface{}{
+		"name": "Ishmael",
+		"address": map[string]interface{}{
+			"street":  "123 Spouter Inn Ct.",
+			"city":    "Nantucket",
+			"country": "US",
+		},
+		"details": map[string]interface{}{
+			"friends": []string{"Tashtego"},
+		},
+		"boat":   "pequod",
+		"hole":   "black",
+		"nilval": nil,
+	}
+
+	// What we expect is that anything in dst should have all values set,
+	// this happens when the --reuse-values flag is set but the chart has no modifications yet
+	MergeTables(dst2, nil)
+
+	if dst2["name"] != "Ishmael" {
+		t.Errorf("Unexpected name: %s", dst2["name"])
+	}
+
+	addr2, ok := dst2["address"].(map[string]interface{})
+	if !ok {
+		t.Fatal("Address went away.")
+	}
+
+	if addr2["street"].(string) != "123 Spouter Inn Ct." {
+		t.Errorf("Unexpected address: %v", addr2["street"])
+	}
+
+	if addr2["city"].(string) != "Nantucket" {
+		t.Errorf("Unexpected city: %v", addr2["city"])
+	}
+
+	if addr2["country"].(string) != "US" {
+		t.Errorf("Unexpected Country: %v", addr2["country"])
+	}
+
+	if det2, ok := dst2["details"].(map[string]interface{}); !ok {
+		t.Fatalf("Details is the wrong type: %v", dst2["details"])
+	} else if _, ok := det2["friends"]; !ok {
+		t.Error("Could not find your friends. Maybe you don't have any. :-(")
+	}
+
+	if dst2["boat"].(string) != "pequod" {
+		t.Errorf("Expected boat string, got %v", dst2["boat"])
+	}
+
+	if dst2["hole"].(string) != "black" {
+		t.Errorf("Expected hole string, got %v", dst2["boat"])
+	}
+
+	if dst2["nilval"] != nil {
+		t.Error("Expected nilvalue to have nil value but it does not")
+	}
+}
+
+func TestCoalesceValuesWarnings(t *testing.T) {
+
+	c := withDeps(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "level1"},
+		Values: map[string]interface{}{
+			"name": "moby",
+		},
+	},
+		withDeps(&chart.Chart{
+			Metadata: &chart.Metadata{Name: "level2"},
+			Values: map[string]interface{}{
+				"name": "pequod",
+			},
+		},
+			&chart.Chart{
+				Metadata: &chart.Metadata{Name: "level3"},
+				Values: map[string]interface{}{
+					"name": "ahab",
+					"boat": true,
+					"spear": map[string]interface{}{
+						"tip": true,
+						"sail": map[string]interface{}{
+							"cotton": true,
+						},
+					},
+				},
+			},
+		),
+	)
+
+	vals := map[string]interface{}{
+		"level2": map[string]interface{}{
+			"level3": map[string]interface{}{
+				"boat": map[string]interface{}{"mast": true},
+				"spear": map[string]interface{}{
+					"tip": map[string]interface{}{
+						"sharp": true,
+					},
+					"sail": true,
+				},
+			},
+		},
+	}
+
+	warnings := make([]string, 0)
+	printf := func(format string, v ...interface{}) {
+		t.Logf(format, v...)
+		warnings = append(warnings, fmt.Sprintf(format, v...))
+	}
+
+	_, err := coalesce(printf, c, vals, "", false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Logf("vals: %v", vals)
+	assert.Contains(t, warnings, "warning: skipped value for level1.level2.level3.boat: Not a table.")
+	assert.Contains(t, warnings, "warning: destination for level1.level2.level3.spear.tip is a table. Ignoring non-table value (true)")
+	assert.Contains(t, warnings, "warning: cannot overwrite table with non table for level1.level2.level3.spear.sail (map[cotton:true])")
+
+}
+
+func TestConcatPrefix(t *testing.T) {
+	assert.Equal(t, "b", concatPrefix("", "b"))
+	assert.Equal(t, "a.b", concatPrefix("a", "b"))
+}
diff --git a/internal/chart/v3/util/compatible.go b/internal/chart/v3/util/compatible.go
new file mode 100644
index 000000000..d384d2d45
--- /dev/null
+++ b/internal/chart/v3/util/compatible.go
@@ -0,0 +1,34 @@
+/*
+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 util
+
+import "github.com/Masterminds/semver/v3"
+
+// IsCompatibleRange compares a version to a constraint.
+// It returns true if the version matches the constraint, and false in all other cases.
+func IsCompatibleRange(constraint, ver string) bool {
+	sv, err := semver.NewVersion(ver)
+	if err != nil {
+		return false
+	}
+
+	c, err := semver.NewConstraint(constraint)
+	if err != nil {
+		return false
+	}
+	return c.Check(sv)
+}
diff --git a/internal/chart/v3/util/compatible_test.go b/internal/chart/v3/util/compatible_test.go
new file mode 100644
index 000000000..e17d33e35
--- /dev/null
+++ b/internal/chart/v3/util/compatible_test.go
@@ -0,0 +1,43 @@
+/*
+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 version represents the current version of the project.
+package util
+
+import "testing"
+
+func TestIsCompatibleRange(t *testing.T) {
+	tests := []struct {
+		constraint string
+		ver        string
+		expected   bool
+	}{
+		{"v2.0.0-alpha.4", "v2.0.0-alpha.4", true},
+		{"v2.0.0-alpha.3", "v2.0.0-alpha.4", false},
+		{"v2.0.0", "v2.0.0-alpha.4", false},
+		{"v2.0.0-alpha.4", "v2.0.0", false},
+		{"~v2.0.0", "v2.0.1", true},
+		{"v2", "v2.0.0", true},
+		{">2.0.0", "v2.1.1", true},
+		{"v2.1.*", "v2.1.1", true},
+	}
+
+	for _, tt := range tests {
+		if IsCompatibleRange(tt.constraint, tt.ver) != tt.expected {
+			t.Errorf("expected constraint %s to be %v for %s", tt.constraint, tt.expected, tt.ver)
+		}
+	}
+}
diff --git a/internal/chart/v3/util/create.go b/internal/chart/v3/util/create.go
new file mode 100644
index 000000000..72fed5955
--- /dev/null
+++ b/internal/chart/v3/util/create.go
@@ -0,0 +1,832 @@
+/*
+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 util
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+// chartName is a regular expression for testing the supplied name of a chart.
+// This regular expression is probably stricter than it needs to be. We can relax it
+// somewhat. Newline characters, as well as $, quotes, +, parens, and % are known to be
+// problematic.
+var chartName = regexp.MustCompile("^[a-zA-Z0-9._-]+$")
+
+const (
+	// ChartfileName is the default Chart file name.
+	ChartfileName = "Chart.yaml"
+	// ValuesfileName is the default values file name.
+	ValuesfileName = "values.yaml"
+	// SchemafileName is the default values schema file name.
+	SchemafileName = "values.schema.json"
+	// TemplatesDir is the relative directory name for templates.
+	TemplatesDir = "templates"
+	// ChartsDir is the relative directory name for charts dependencies.
+	ChartsDir = "charts"
+	// TemplatesTestsDir is the relative directory name for tests.
+	TemplatesTestsDir = TemplatesDir + sep + "tests"
+	// IgnorefileName is the name of the Helm ignore file.
+	IgnorefileName = ".helmignore"
+	// IngressFileName is the name of the example ingress file.
+	IngressFileName = TemplatesDir + sep + "ingress.yaml"
+	// HTTPRouteFileName is the name of the example HTTPRoute file.
+	HTTPRouteFileName = TemplatesDir + sep + "httproute.yaml"
+	// DeploymentName is the name of the example deployment file.
+	DeploymentName = TemplatesDir + sep + "deployment.yaml"
+	// ServiceName is the name of the example service file.
+	ServiceName = TemplatesDir + sep + "service.yaml"
+	// ServiceAccountName is the name of the example serviceaccount file.
+	ServiceAccountName = TemplatesDir + sep + "serviceaccount.yaml"
+	// HorizontalPodAutoscalerName is the name of the example hpa file.
+	HorizontalPodAutoscalerName = TemplatesDir + sep + "hpa.yaml"
+	// NotesName is the name of the example NOTES.txt file.
+	NotesName = TemplatesDir + sep + "NOTES.txt"
+	// HelpersName is the name of the example helpers file.
+	HelpersName = TemplatesDir + sep + "_helpers.tpl"
+	// TestConnectionName is the name of the example test file.
+	TestConnectionName = TemplatesTestsDir + sep + "test-connection.yaml"
+)
+
+// maxChartNameLength is lower than the limits we know of with certain file systems,
+// and with certain Kubernetes fields.
+const maxChartNameLength = 250
+
+const sep = string(filepath.Separator)
+
+const defaultChartfile = `apiVersion: v3
+name: %s
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+`
+
+const defaultValues = `# Default values for %s.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
+replicaCount: 1
+
+# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
+image:
+  repository: nginx
+  # This sets the pull policy for images.
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+imagePullSecrets: []
+# This is to override the chart name.
+nameOverride: ""
+fullnameOverride: ""
+
+# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+# This is for setting Kubernetes Annotations to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+podAnnotations: {}
+# This is for setting Kubernetes Labels to a Pod.
+# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/
+service:
+  # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
+  type: ClusterIP
+  # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports
+  port: 80
+
+# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+# -- Expose the service via gateway-api HTTPRoute
+# Requires Gateway API resources and suitable controller installed within the cluster
+# (see: https://gateway-api.sigs.k8s.io/guides/)
+httpRoute:
+  # HTTPRoute enabled.
+  enabled: false
+  # HTTPRoute annotations.
+  annotations: {}
+  # Which Gateways this Route is attached to.
+  parentRefs:
+  - name: gateway
+    sectionName: http
+    # namespace: default
+  # Hostnames matching HTTP header.
+  hostnames:
+  - chart-example.local
+  # List of rules and filters applied.
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /headers
+  #   filters:
+  #   - type: RequestHeaderModifier
+  #     requestHeaderModifier:
+  #       set:
+  #       - name: My-Overwrite-Header
+  #         value: this-is-the-only-value
+  #       remove:
+  #       - User-Agent
+  # - matches:
+  #   - path:
+  #       type: PathPrefix
+  #       value: /echo
+  #     headers:
+  #     - name: version
+  #       value: v2
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
+livenessProbe:
+  httpGet:
+    path: /
+    port: http
+readinessProbe:
+  httpGet:
+    path: /
+    port: http
+
+# This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+`
+
+const defaultIgnore = `# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+`
+
+const defaultIngress = `{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.ingress.className }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- with .pathType }}
+            pathType: {{ . }}
+            {{- end }}
+            backend:
+              service:
+                name: {{ include "<CHARTNAME>.fullname" $ }}
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}
+`
+
+const defaultHTTPRoute = `{{- if .Values.httpRoute.enabled -}}
+{{- $fullName := include "<CHARTNAME>.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  {{- with .Values.httpRoute.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- with .Values.httpRoute.parentRefs }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.httpRoute.rules }}
+    {{- with .matches }}
+    - matches:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .filters }}
+      filters:
+      {{- toYaml . | nindent 8 }}
+    {{- end }}
+      backendRefs:
+        - name: {{ $fullName }}
+          port: {{ $svcPort }}
+          weight: 1
+    {{- end }}
+{{- end }}
+`
+
+const defaultDeployment = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "<CHARTNAME>.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "<CHARTNAME>.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "<CHARTNAME>.serviceAccountName" . }}
+      {{- with .Values.podSecurityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: {{ .Chart.Name }}
+          {{- with .Values.securityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          {{- with .Values.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.readinessProbe }}
+          readinessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+`
+
+const defaultService = `apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "<CHARTNAME>.selectorLabels" . | nindent 4 }}
+`
+
+const defaultServiceAccount = `{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "<CHARTNAME>.serviceAccountName" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
+`
+
+const defaultHorizontalPodAutoscaler = `{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "<CHARTNAME>.fullname" . }}
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "<CHARTNAME>.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
+`
+
+const defaultNotes = `1. Get the application URL by running these commands:
+{{- if .Values.httpRoute.enabled }}
+{{- if .Values.httpRoute.hostnames }}
+    export APP_HOSTNAME={{ .Values.httpRoute.hostnames | first }}
+{{- else }}
+    export APP_HOSTNAME=$(kubectl get --namespace {{(first .Values.httpRoute.parentRefs).namespace | default .Release.Namespace }} gateway/{{ (first .Values.httpRoute.parentRefs).name }} -o jsonpath="{.spec.listeners[0].hostname}")
+  {{- end }}
+{{- if and .Values.httpRoute.rules (first .Values.httpRoute.rules).matches (first (first .Values.httpRoute.rules).matches).path.value }}
+    echo "Visit http://$APP_HOSTNAME{{ (first (first .Values.httpRoute.rules).matches).path.value }} to use your application"
+
+    NOTE: Your HTTPRoute depends on the listener configuration of your gateway and your HTTPRoute rules.
+    The rules can be set for path, method, header and query parameters.
+    You can check the gateway configuration with 'kubectl get --namespace {{(first .Values.httpRoute.parentRefs).namespace | default .Release.Namespace }} gateway/{{ (first .Values.httpRoute.parentRefs).name }} -o yaml'
+{{- end }}
+{{- else if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "<CHARTNAME>.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "<CHARTNAME>.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "<CHARTNAME>.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "<CHARTNAME>.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
+`
+
+const defaultHelpers = `{{/*
+Expand the name of the chart.
+*/}}
+{{- define "<CHARTNAME>.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "<CHARTNAME>.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "<CHARTNAME>.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "<CHARTNAME>.labels" -}}
+helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
+{{ include "<CHARTNAME>.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "<CHARTNAME>.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "<CHARTNAME>.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "<CHARTNAME>.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+`
+
+const defaultTestConnection = `apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "<CHARTNAME>.fullname" . }}-test-connection"
+  labels:
+    {{- include "<CHARTNAME>.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "<CHARTNAME>.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
+`
+
+// Stderr is an io.Writer to which error messages can be written
+//
+// In Helm 4, this will be replaced. It is needed in Helm 3 to preserve API backward
+// compatibility.
+var Stderr io.Writer = os.Stderr
+
+// CreateFrom creates a new chart, but scaffolds it from the src chart.
+func CreateFrom(chartfile *chart.Metadata, dest, src string) error {
+	schart, err := loader.Load(src)
+	if err != nil {
+		return fmt.Errorf("could not load %s: %w", src, err)
+	}
+
+	schart.Metadata = chartfile
+
+	var updatedTemplates []*chart.File
+
+	for _, template := range schart.Templates {
+		newData := transform(string(template.Data), schart.Name())
+		updatedTemplates = append(updatedTemplates, &chart.File{Name: template.Name, Data: newData})
+	}
+
+	schart.Templates = updatedTemplates
+	b, err := yaml.Marshal(schart.Values)
+	if err != nil {
+		return fmt.Errorf("reading values file: %w", err)
+	}
+
+	var m map[string]interface{}
+	if err := yaml.Unmarshal(transform(string(b), schart.Name()), &m); err != nil {
+		return fmt.Errorf("transforming values file: %w", err)
+	}
+	schart.Values = m
+
+	// SaveDir looks for the file values.yaml when saving rather than the values
+	// key in order to preserve the comments in the YAML. The name placeholder
+	// needs to be replaced on that file.
+	for _, f := range schart.Raw {
+		if f.Name == ValuesfileName {
+			f.Data = transform(string(f.Data), schart.Name())
+		}
+	}
+
+	return SaveDir(schart, dest)
+}
+
+// Create creates a new chart in a directory.
+//
+// Inside of dir, this will create a directory based on the name of
+// chartfile.Name. It will then write the Chart.yaml into this directory and
+// create the (empty) appropriate directories.
+//
+// The returned string will point to the newly created directory. It will be
+// an absolute path, even if the provided base directory was relative.
+//
+// If dir does not exist, this will return an error.
+// If Chart.yaml or any directories cannot be created, this will return an
+// error. In such a case, this will attempt to clean up by removing the
+// new chart directory.
+func Create(name, dir string) (string, error) {
+
+	// Sanity-check the name of a chart so user doesn't create one that causes problems.
+	if err := validateChartName(name); err != nil {
+		return "", err
+	}
+
+	path, err := filepath.Abs(dir)
+	if err != nil {
+		return path, err
+	}
+
+	if fi, err := os.Stat(path); err != nil {
+		return path, err
+	} else if !fi.IsDir() {
+		return path, fmt.Errorf("no such directory %s", path)
+	}
+
+	cdir := filepath.Join(path, name)
+	if fi, err := os.Stat(cdir); err == nil && !fi.IsDir() {
+		return cdir, fmt.Errorf("file %s already exists and is not a directory", cdir)
+	}
+
+	// Note: If adding a new template below (i.e., to `helm create`) which is disabled by default (similar to hpa and
+	// ingress below); or making an existing template disabled by default, add the enabling condition in
+	// `TestHelmCreateChart_CheckDeprecatedWarnings` in `pkg/lint/lint_test.go` to make it run through deprecation checks
+	// with latest Kubernetes version.
+	files := []struct {
+		path    string
+		content []byte
+	}{
+		{
+			// Chart.yaml
+			path:    filepath.Join(cdir, ChartfileName),
+			content: []byte(fmt.Sprintf(defaultChartfile, name)),
+		},
+		{
+			// values.yaml
+			path:    filepath.Join(cdir, ValuesfileName),
+			content: []byte(fmt.Sprintf(defaultValues, name)),
+		},
+		{
+			// .helmignore
+			path:    filepath.Join(cdir, IgnorefileName),
+			content: []byte(defaultIgnore),
+		},
+		{
+			// ingress.yaml
+			path:    filepath.Join(cdir, IngressFileName),
+			content: transform(defaultIngress, name),
+		},
+		{
+			// httproute.yaml
+			path:    filepath.Join(cdir, HTTPRouteFileName),
+			content: transform(defaultHTTPRoute, name),
+		},
+		{
+			// deployment.yaml
+			path:    filepath.Join(cdir, DeploymentName),
+			content: transform(defaultDeployment, name),
+		},
+		{
+			// service.yaml
+			path:    filepath.Join(cdir, ServiceName),
+			content: transform(defaultService, name),
+		},
+		{
+			// serviceaccount.yaml
+			path:    filepath.Join(cdir, ServiceAccountName),
+			content: transform(defaultServiceAccount, name),
+		},
+		{
+			// hpa.yaml
+			path:    filepath.Join(cdir, HorizontalPodAutoscalerName),
+			content: transform(defaultHorizontalPodAutoscaler, name),
+		},
+		{
+			// NOTES.txt
+			path:    filepath.Join(cdir, NotesName),
+			content: transform(defaultNotes, name),
+		},
+		{
+			// _helpers.tpl
+			path:    filepath.Join(cdir, HelpersName),
+			content: transform(defaultHelpers, name),
+		},
+		{
+			// test-connection.yaml
+			path:    filepath.Join(cdir, TestConnectionName),
+			content: transform(defaultTestConnection, name),
+		},
+	}
+
+	for _, file := range files {
+		if _, err := os.Stat(file.path); err == nil {
+			// There is no handle to a preferred output stream here.
+			fmt.Fprintf(Stderr, "WARNING: File %q already exists. Overwriting.\n", file.path)
+		}
+		if err := writeFile(file.path, file.content); err != nil {
+			return cdir, err
+		}
+	}
+	// Need to add the ChartsDir explicitly as it does not contain any file OOTB
+	if err := os.MkdirAll(filepath.Join(cdir, ChartsDir), 0755); err != nil {
+		return cdir, err
+	}
+	return cdir, nil
+}
+
+// transform performs a string replacement of the specified source for
+// a given key with the replacement string
+func transform(src, replacement string) []byte {
+	return []byte(strings.ReplaceAll(src, "<CHARTNAME>", replacement))
+}
+
+func writeFile(name string, content []byte) error {
+	if err := os.MkdirAll(filepath.Dir(name), 0755); err != nil {
+		return err
+	}
+	return os.WriteFile(name, content, 0644)
+}
+
+func validateChartName(name string) error {
+	if name == "" || len(name) > maxChartNameLength {
+		return fmt.Errorf("chart name must be between 1 and %d characters", maxChartNameLength)
+	}
+	if !chartName.MatchString(name) {
+		return fmt.Errorf("chart name must match the regular expression %q", chartName.String())
+	}
+	return nil
+}
diff --git a/internal/chart/v3/util/create_test.go b/internal/chart/v3/util/create_test.go
new file mode 100644
index 000000000..b3b58cc5a
--- /dev/null
+++ b/internal/chart/v3/util/create_test.go
@@ -0,0 +1,172 @@
+/*
+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 util
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+func TestCreate(t *testing.T) {
+	tdir := t.TempDir()
+
+	c, err := Create("foo", tdir)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	dir := filepath.Join(tdir, "foo")
+
+	mychart, err := loader.LoadDir(c)
+	if err != nil {
+		t.Fatalf("Failed to load newly created chart %q: %s", c, err)
+	}
+
+	if mychart.Name() != "foo" {
+		t.Errorf("Expected name to be 'foo', got %q", mychart.Name())
+	}
+
+	for _, f := range []string{
+		ChartfileName,
+		DeploymentName,
+		HelpersName,
+		IgnorefileName,
+		NotesName,
+		ServiceAccountName,
+		ServiceName,
+		TemplatesDir,
+		TemplatesTestsDir,
+		TestConnectionName,
+		ValuesfileName,
+	} {
+		if _, err := os.Stat(filepath.Join(dir, f)); err != nil {
+			t.Errorf("Expected %s file: %s", f, err)
+		}
+	}
+}
+
+func TestCreateFrom(t *testing.T) {
+	tdir := t.TempDir()
+
+	cf := &chart.Metadata{
+		APIVersion: chart.APIVersionV3,
+		Name:       "foo",
+		Version:    "0.1.0",
+	}
+	srcdir := "./testdata/frobnitz/charts/mariner"
+
+	if err := CreateFrom(cf, tdir, srcdir); err != nil {
+		t.Fatal(err)
+	}
+
+	dir := filepath.Join(tdir, "foo")
+	c := filepath.Join(tdir, cf.Name)
+	mychart, err := loader.LoadDir(c)
+	if err != nil {
+		t.Fatalf("Failed to load newly created chart %q: %s", c, err)
+	}
+
+	if mychart.Name() != "foo" {
+		t.Errorf("Expected name to be 'foo', got %q", mychart.Name())
+	}
+
+	for _, f := range []string{
+		ChartfileName,
+		ValuesfileName,
+		filepath.Join(TemplatesDir, "placeholder.tpl"),
+	} {
+		if _, err := os.Stat(filepath.Join(dir, f)); err != nil {
+			t.Errorf("Expected %s file: %s", f, err)
+		}
+
+		// Check each file to make sure <CHARTNAME> has been replaced
+		b, err := os.ReadFile(filepath.Join(dir, f))
+		if err != nil {
+			t.Errorf("Unable to read file %s: %s", f, err)
+		}
+		if bytes.Contains(b, []byte("<CHARTNAME>")) {
+			t.Errorf("File %s contains <CHARTNAME>", f)
+		}
+	}
+}
+
+// TestCreate_Overwrite is a regression test for making sure that files are overwritten.
+func TestCreate_Overwrite(t *testing.T) {
+	tdir := t.TempDir()
+
+	var errlog bytes.Buffer
+
+	if _, err := Create("foo", tdir); err != nil {
+		t.Fatal(err)
+	}
+
+	dir := filepath.Join(tdir, "foo")
+
+	tplname := filepath.Join(dir, "templates/hpa.yaml")
+	writeFile(tplname, []byte("FOO"))
+
+	// Now re-run the create
+	Stderr = &errlog
+	if _, err := Create("foo", tdir); err != nil {
+		t.Fatal(err)
+	}
+
+	data, err := os.ReadFile(tplname)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(data) == "FOO" {
+		t.Fatal("File that should have been modified was not.")
+	}
+
+	if errlog.Len() == 0 {
+		t.Errorf("Expected warnings about overwriting files.")
+	}
+}
+
+func TestValidateChartName(t *testing.T) {
+	for name, shouldPass := range map[string]bool{
+		"":                              false,
+		"abcdefghijklmnopqrstuvwxyz-_.": true,
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ-_.": true,
+		"$hello":                        false,
+		"Hellô":                         false,
+		"he%%o":                         false,
+		"he\nllo":                       false,
+
+		"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"abcdefghijklmnopqrstuvwxyz-_." +
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZ-_.": false,
+	} {
+		if err := validateChartName(name); (err != nil) == shouldPass {
+			t.Errorf("test for %q failed", name)
+		}
+	}
+}
diff --git a/internal/chart/v3/util/dependencies.go b/internal/chart/v3/util/dependencies.go
new file mode 100644
index 000000000..bd5032ce4
--- /dev/null
+++ b/internal/chart/v3/util/dependencies.go
@@ -0,0 +1,366 @@
+/*
+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 util
+
+import (
+	"log/slog"
+	"strings"
+
+	"github.com/mitchellh/copystructure"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// ProcessDependencies checks through this chart's dependencies, processing accordingly.
+func ProcessDependencies(c *chart.Chart, v Values) error {
+	if err := processDependencyEnabled(c, v, ""); err != nil {
+		return err
+	}
+	return processDependencyImportValues(c, true)
+}
+
+// processDependencyConditions disables charts based on condition path value in values
+func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath string) {
+	if reqs == nil {
+		return
+	}
+	for _, r := range reqs {
+		for c := range strings.SplitSeq(strings.TrimSpace(r.Condition), ",") {
+			if len(c) > 0 {
+				// retrieve value
+				vv, err := cvals.PathValue(cpath + c)
+				if err == nil {
+					// if not bool, warn
+					if bv, ok := vv.(bool); ok {
+						r.Enabled = bv
+						break
+					}
+					slog.Warn("returned non-bool value", "path", c, "chart", r.Name)
+				} else if _, ok := err.(ErrNoValue); !ok {
+					// this is a real error
+					slog.Warn("the method PathValue returned error", slog.Any("error", err))
+				}
+			}
+		}
+	}
+}
+
+// processDependencyTags disables charts based on tags in values
+func processDependencyTags(reqs []*chart.Dependency, cvals Values) {
+	if reqs == nil {
+		return
+	}
+	vt, err := cvals.Table("tags")
+	if err != nil {
+		return
+	}
+	for _, r := range reqs {
+		var hasTrue, hasFalse bool
+		for _, k := range r.Tags {
+			if b, ok := vt[k]; ok {
+				// if not bool, warn
+				if bv, ok := b.(bool); ok {
+					if bv {
+						hasTrue = true
+					} else {
+						hasFalse = true
+					}
+				} else {
+					slog.Warn("returned non-bool value", "tag", k, "chart", r.Name)
+				}
+			}
+		}
+		if !hasTrue && hasFalse {
+			r.Enabled = false
+		} else if hasTrue || !hasTrue && !hasFalse {
+			r.Enabled = true
+		}
+	}
+}
+
+// getAliasDependency finds the chart for an alias dependency and copies parts that will be modified
+func getAliasDependency(charts []*chart.Chart, dep *chart.Dependency) *chart.Chart {
+	for _, c := range charts {
+		if c == nil {
+			continue
+		}
+		if c.Name() != dep.Name {
+			continue
+		}
+		if !IsCompatibleRange(dep.Version, c.Metadata.Version) {
+			continue
+		}
+
+		out := *c
+		out.Metadata = copyMetadata(c.Metadata)
+
+		// empty dependencies and shallow copy all dependencies, otherwise parent info may be corrupted if
+		// there is more than one dependency aliasing this chart
+		out.SetDependencies()
+		for _, dependency := range c.Dependencies() {
+			cpy := *dependency
+			out.AddDependency(&cpy)
+		}
+
+		if dep.Alias != "" {
+			out.Metadata.Name = dep.Alias
+		}
+		return &out
+	}
+	return nil
+}
+
+func copyMetadata(metadata *chart.Metadata) *chart.Metadata {
+	md := *metadata
+
+	if md.Dependencies != nil {
+		dependencies := make([]*chart.Dependency, len(md.Dependencies))
+		for i := range md.Dependencies {
+			dependency := *md.Dependencies[i]
+			dependencies[i] = &dependency
+		}
+		md.Dependencies = dependencies
+	}
+	return &md
+}
+
+// processDependencyEnabled removes disabled charts from dependencies
+func processDependencyEnabled(c *chart.Chart, v map[string]interface{}, path string) error {
+	if c.Metadata.Dependencies == nil {
+		return nil
+	}
+
+	var chartDependencies []*chart.Chart
+	// If any dependency is not a part of Chart.yaml
+	// then this should be added to chartDependencies.
+	// However, if the dependency is already specified in Chart.yaml
+	// we should not add it, as it would be processed from Chart.yaml anyway.
+
+Loop:
+	for _, existing := range c.Dependencies() {
+		for _, req := range c.Metadata.Dependencies {
+			if existing.Name() == req.Name && IsCompatibleRange(req.Version, existing.Metadata.Version) {
+				continue Loop
+			}
+		}
+		chartDependencies = append(chartDependencies, existing)
+	}
+
+	for _, req := range c.Metadata.Dependencies {
+		if req == nil {
+			continue
+		}
+		if chartDependency := getAliasDependency(c.Dependencies(), req); chartDependency != nil {
+			chartDependencies = append(chartDependencies, chartDependency)
+		}
+		if req.Alias != "" {
+			req.Name = req.Alias
+		}
+	}
+	c.SetDependencies(chartDependencies...)
+
+	// set all to true
+	for _, lr := range c.Metadata.Dependencies {
+		lr.Enabled = true
+	}
+	cvals, err := CoalesceValues(c, v)
+	if err != nil {
+		return err
+	}
+	// flag dependencies as enabled/disabled
+	processDependencyTags(c.Metadata.Dependencies, cvals)
+	processDependencyConditions(c.Metadata.Dependencies, cvals, path)
+	// make a map of charts to remove
+	rm := map[string]struct{}{}
+	for _, r := range c.Metadata.Dependencies {
+		if !r.Enabled {
+			// remove disabled chart
+			rm[r.Name] = struct{}{}
+		}
+	}
+	// don't keep disabled charts in new slice
+	cd := []*chart.Chart{}
+	copy(cd, c.Dependencies()[:0])
+	for _, n := range c.Dependencies() {
+		if _, ok := rm[n.Metadata.Name]; !ok {
+			cd = append(cd, n)
+		}
+	}
+	// don't keep disabled charts in metadata
+	cdMetadata := []*chart.Dependency{}
+	copy(cdMetadata, c.Metadata.Dependencies[:0])
+	for _, n := range c.Metadata.Dependencies {
+		if _, ok := rm[n.Name]; !ok {
+			cdMetadata = append(cdMetadata, n)
+		}
+	}
+
+	// recursively call self to process sub dependencies
+	for _, t := range cd {
+		subpath := path + t.Metadata.Name + "."
+		if err := processDependencyEnabled(t, cvals, subpath); err != nil {
+			return err
+		}
+	}
+	// set the correct dependencies in metadata
+	c.Metadata.Dependencies = nil
+	c.Metadata.Dependencies = append(c.Metadata.Dependencies, cdMetadata...)
+	c.SetDependencies(cd...)
+
+	return nil
+}
+
+// pathToMap creates a nested map given a YAML path in dot notation.
+func pathToMap(path string, data map[string]interface{}) map[string]interface{} {
+	if path == "." {
+		return data
+	}
+	return set(parsePath(path), data)
+}
+
+func set(path []string, data map[string]interface{}) map[string]interface{} {
+	if len(path) == 0 {
+		return nil
+	}
+	cur := data
+	for i := len(path) - 1; i >= 0; i-- {
+		cur = map[string]interface{}{path[i]: cur}
+	}
+	return cur
+}
+
+// processImportValues merges values from child to parent based on the chart's dependencies' ImportValues field.
+func processImportValues(c *chart.Chart, merge bool) error {
+	if c.Metadata.Dependencies == nil {
+		return nil
+	}
+	// combine chart values and empty config to get Values
+	var cvals Values
+	var err error
+	if merge {
+		cvals, err = MergeValues(c, nil)
+	} else {
+		cvals, err = CoalesceValues(c, nil)
+	}
+	if err != nil {
+		return err
+	}
+	b := make(map[string]interface{})
+	// import values from each dependency if specified in import-values
+	for _, r := range c.Metadata.Dependencies {
+		var outiv []interface{}
+		for _, riv := range r.ImportValues {
+			switch iv := riv.(type) {
+			case map[string]interface{}:
+				child := iv["child"].(string)
+				parent := iv["parent"].(string)
+
+				outiv = append(outiv, map[string]string{
+					"child":  child,
+					"parent": parent,
+				})
+
+				// get child table
+				vv, err := cvals.Table(r.Name + "." + child)
+				if err != nil {
+					slog.Warn("ImportValues missing table from chart", "chart", r.Name, slog.Any("error", err))
+					continue
+				}
+				// create value map from child to be merged into parent
+				if merge {
+					b = MergeTables(b, pathToMap(parent, vv.AsMap()))
+				} else {
+					b = CoalesceTables(b, pathToMap(parent, vv.AsMap()))
+				}
+			case string:
+				child := "exports." + iv
+				outiv = append(outiv, map[string]string{
+					"child":  child,
+					"parent": ".",
+				})
+				vm, err := cvals.Table(r.Name + "." + child)
+				if err != nil {
+					slog.Warn("ImportValues missing table", slog.Any("error", err))
+					continue
+				}
+				if merge {
+					b = MergeTables(b, vm.AsMap())
+				} else {
+					b = CoalesceTables(b, vm.AsMap())
+				}
+			}
+		}
+		r.ImportValues = outiv
+	}
+
+	// Imported values from a child to a parent chart have a lower priority than
+	// the parents values. This enables parent charts to import a large section
+	// from a child and then override select parts. This is why b is merged into
+	// cvals in the code below and not the other way around.
+	if merge {
+		// deep copying the cvals as there are cases where pointers can end
+		// up in the cvals when they are copied onto b in ways that break things.
+		cvals = deepCopyMap(cvals)
+		c.Values = MergeTables(cvals, b)
+	} else {
+		// Trimming the nil values from cvals is needed for backwards compatibility.
+		// Previously, the b value had been populated with cvals along with some
+		// overrides. This caused the coalescing functionality to remove the
+		// nil/null values. This trimming is for backwards compat.
+		cvals = trimNilValues(cvals)
+		c.Values = CoalesceTables(cvals, b)
+	}
+
+	return nil
+}
+
+func deepCopyMap(vals map[string]interface{}) map[string]interface{} {
+	valsCopy, err := copystructure.Copy(vals)
+	if err != nil {
+		return vals
+	}
+	return valsCopy.(map[string]interface{})
+}
+
+func trimNilValues(vals map[string]interface{}) map[string]interface{} {
+	valsCopy, err := copystructure.Copy(vals)
+	if err != nil {
+		return vals
+	}
+	valsCopyMap := valsCopy.(map[string]interface{})
+	for key, val := range valsCopyMap {
+		if val == nil {
+			// Iterate over the values and remove nil keys
+			delete(valsCopyMap, key)
+		} else if istable(val) {
+			// Recursively call into ourselves to remove keys from inner tables
+			valsCopyMap[key] = trimNilValues(val.(map[string]interface{}))
+		}
+	}
+
+	return valsCopyMap
+}
+
+// processDependencyImportValues imports specified chart values from child to parent.
+func processDependencyImportValues(c *chart.Chart, merge bool) error {
+	for _, d := range c.Dependencies() {
+		// recurse
+		if err := processDependencyImportValues(d, merge); err != nil {
+			return err
+		}
+	}
+	return processImportValues(c, merge)
+}
diff --git a/internal/chart/v3/util/dependencies_test.go b/internal/chart/v3/util/dependencies_test.go
new file mode 100644
index 000000000..55839fe65
--- /dev/null
+++ b/internal/chart/v3/util/dependencies_test.go
@@ -0,0 +1,569 @@
+/*
+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 util
+
+import (
+	"os"
+	"path/filepath"
+	"sort"
+	"strconv"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+func loadChart(t *testing.T, path string) *chart.Chart {
+	t.Helper()
+	c, err := loader.Load(path)
+	if err != nil {
+		t.Fatalf("failed to load testdata: %s", err)
+	}
+	return c
+}
+
+func TestLoadDependency(t *testing.T) {
+	tests := []*chart.Dependency{
+		{Name: "alpine", Version: "0.1.0", Repository: "https://example.com/charts"},
+		{Name: "mariner", Version: "4.3.2", Repository: "https://example.com/charts"},
+	}
+
+	check := func(deps []*chart.Dependency) {
+		if len(deps) != 2 {
+			t.Errorf("expected 2 dependencies, got %d", len(deps))
+		}
+		for i, tt := range tests {
+			if deps[i].Name != tt.Name {
+				t.Errorf("expected dependency named %q, got %q", tt.Name, deps[i].Name)
+			}
+			if deps[i].Version != tt.Version {
+				t.Errorf("expected dependency named %q to have version %q, got %q", tt.Name, tt.Version, deps[i].Version)
+			}
+			if deps[i].Repository != tt.Repository {
+				t.Errorf("expected dependency named %q to have repository %q, got %q", tt.Name, tt.Repository, deps[i].Repository)
+			}
+		}
+	}
+	c := loadChart(t, "testdata/frobnitz")
+	check(c.Metadata.Dependencies)
+	check(c.Lock.Dependencies)
+}
+
+func TestDependencyEnabled(t *testing.T) {
+	type M = map[string]interface{}
+	tests := []struct {
+		name string
+		v    M
+		e    []string // expected charts including duplicates in alphanumeric order
+	}{{
+		"tags with no effect",
+		M{"tags": M{"nothinguseful": false}},
+		[]string{"parentchart", "parentchart.subchart1", "parentchart.subchart1.subcharta", "parentchart.subchart1.subchartb"},
+	}, {
+		"tags disabling a group",
+		M{"tags": M{"front-end": false}},
+		[]string{"parentchart"},
+	}, {
+		"tags disabling a group and enabling a different group",
+		M{"tags": M{"front-end": false, "back-end": true}},
+		[]string{"parentchart", "parentchart.subchart2", "parentchart.subchart2.subchartb", "parentchart.subchart2.subchartc"},
+	}, {
+		"tags disabling only children, children still enabled since tag front-end=true in values.yaml",
+		M{"tags": M{"subcharta": false, "subchartb": false}},
+		[]string{"parentchart", "parentchart.subchart1", "parentchart.subchart1.subcharta", "parentchart.subchart1.subchartb"},
+	}, {
+		"tags disabling all parents/children with additional tag re-enabling a parent",
+		M{"tags": M{"front-end": false, "subchart1": true, "back-end": false}},
+		[]string{"parentchart", "parentchart.subchart1"},
+	}, {
+		"conditions enabling the parent charts, but back-end (b, c) is still disabled via values.yaml",
+		M{"subchart1": M{"enabled": true}, "subchart2": M{"enabled": true}},
+		[]string{"parentchart", "parentchart.subchart1", "parentchart.subchart1.subcharta", "parentchart.subchart1.subchartb", "parentchart.subchart2"},
+	}, {
+		"conditions disabling the parent charts, effectively disabling children",
+		M{"subchart1": M{"enabled": false}, "subchart2": M{"enabled": false}},
+		[]string{"parentchart"},
+	}, {
+		"conditions a child using the second condition path of child's condition",
+		M{"subchart1": M{"subcharta": M{"enabled": false}}},
+		[]string{"parentchart", "parentchart.subchart1", "parentchart.subchart1.subchartb"},
+	}, {
+		"tags enabling a parent/child group with condition disabling one child",
+		M{"subchart2": M{"subchartc": M{"enabled": false}}, "tags": M{"back-end": true}},
+		[]string{"parentchart", "parentchart.subchart1", "parentchart.subchart1.subcharta", "parentchart.subchart1.subchartb", "parentchart.subchart2", "parentchart.subchart2.subchartb"},
+	}, {
+		"tags will not enable a child if parent is explicitly disabled with condition",
+		M{"subchart1": M{"enabled": false}, "tags": M{"front-end": true}},
+		[]string{"parentchart"},
+	}, {
+		"subcharts with alias also respect conditions",
+		M{"subchart1": M{"enabled": false}, "subchart2alias": M{"enabled": true, "subchartb": M{"enabled": true}}},
+		[]string{"parentchart", "parentchart.subchart2alias", "parentchart.subchart2alias.subchartb"},
+	}}
+
+	for _, tc := range tests {
+		c := loadChart(t, "testdata/subpop")
+		t.Run(tc.name, func(t *testing.T) {
+			if err := processDependencyEnabled(c, tc.v, ""); err != nil {
+				t.Fatalf("error processing enabled dependencies %v", err)
+			}
+
+			names := extractChartNames(c)
+			if len(names) != len(tc.e) {
+				t.Fatalf("slice lengths do not match got %v, expected %v", len(names), len(tc.e))
+			}
+			for i := range names {
+				if names[i] != tc.e[i] {
+					t.Fatalf("slice values do not match got %v, expected %v", names, tc.e)
+				}
+			}
+		})
+	}
+}
+
+// extractChartNames recursively searches chart dependencies returning all charts found
+func extractChartNames(c *chart.Chart) []string {
+	var out []string
+	var fn func(c *chart.Chart)
+	fn = func(c *chart.Chart) {
+		out = append(out, c.ChartPath())
+		for _, d := range c.Dependencies() {
+			fn(d)
+		}
+	}
+	fn(c)
+	sort.Strings(out)
+	return out
+}
+
+func TestProcessDependencyImportValues(t *testing.T) {
+	c := loadChart(t, "testdata/subpop")
+
+	e := make(map[string]string)
+
+	e["imported-chart1.SC1bool"] = "true"
+	e["imported-chart1.SC1float"] = "3.14"
+	e["imported-chart1.SC1int"] = "100"
+	e["imported-chart1.SC1string"] = "dollywood"
+	e["imported-chart1.SC1extra1"] = "11"
+	e["imported-chart1.SPextra1"] = "helm rocks"
+	e["imported-chart1.SC1extra1"] = "11"
+
+	e["imported-chartA.SCAbool"] = "false"
+	e["imported-chartA.SCAfloat"] = "3.1"
+	e["imported-chartA.SCAint"] = "55"
+	e["imported-chartA.SCAstring"] = "jabba"
+	e["imported-chartA.SPextra3"] = "1.337"
+	e["imported-chartA.SC1extra2"] = "1.337"
+	e["imported-chartA.SCAnested1.SCAnested2"] = "true"
+
+	e["imported-chartA-B.SCAbool"] = "false"
+	e["imported-chartA-B.SCAfloat"] = "3.1"
+	e["imported-chartA-B.SCAint"] = "55"
+	e["imported-chartA-B.SCAstring"] = "jabba"
+
+	e["imported-chartA-B.SCBbool"] = "true"
+	e["imported-chartA-B.SCBfloat"] = "7.77"
+	e["imported-chartA-B.SCBint"] = "33"
+	e["imported-chartA-B.SCBstring"] = "boba"
+	e["imported-chartA-B.SPextra5"] = "k8s"
+	e["imported-chartA-B.SC1extra5"] = "tiller"
+
+	// These values are imported from the child chart to the parent. Parent
+	// values take precedence over imported values. This enables importing a
+	// large section from a child chart and overriding a selection from it.
+	e["overridden-chart1.SC1bool"] = "false"
+	e["overridden-chart1.SC1float"] = "3.141592"
+	e["overridden-chart1.SC1int"] = "99"
+	e["overridden-chart1.SC1string"] = "pollywog"
+	e["overridden-chart1.SPextra2"] = "42"
+
+	e["overridden-chartA.SCAbool"] = "true"
+	e["overridden-chartA.SCAfloat"] = "41.3"
+	e["overridden-chartA.SCAint"] = "808"
+	e["overridden-chartA.SCAstring"] = "jabberwocky"
+	e["overridden-chartA.SPextra4"] = "true"
+
+	// These values are imported from the child chart to the parent. Parent
+	// values take precedence over imported values. This enables importing a
+	// large section from a child chart and overriding a selection from it.
+	e["overridden-chartA-B.SCAbool"] = "true"
+	e["overridden-chartA-B.SCAfloat"] = "41.3"
+	e["overridden-chartA-B.SCAint"] = "808"
+	e["overridden-chartA-B.SCAstring"] = "jabberwocky"
+	e["overridden-chartA-B.SCBbool"] = "false"
+	e["overridden-chartA-B.SCBfloat"] = "1.99"
+	e["overridden-chartA-B.SCBint"] = "77"
+	e["overridden-chartA-B.SCBstring"] = "jango"
+	e["overridden-chartA-B.SPextra6"] = "111"
+	e["overridden-chartA-B.SCAextra1"] = "23"
+	e["overridden-chartA-B.SCBextra1"] = "13"
+	e["overridden-chartA-B.SC1extra6"] = "77"
+
+	// `exports` style
+	e["SCBexported1B"] = "1965"
+	e["SC1extra7"] = "true"
+	e["SCBexported2A"] = "blaster"
+	e["global.SC1exported2.all.SC1exported3"] = "SC1expstr"
+
+	if err := processDependencyImportValues(c, false); err != nil {
+		t.Fatalf("processing import values dependencies %v", err)
+	}
+	cc := Values(c.Values)
+	for kk, vv := range e {
+		pv, err := cc.PathValue(kk)
+		if err != nil {
+			t.Fatalf("retrieving import values table %v %v", kk, err)
+		}
+
+		switch pv := pv.(type) {
+		case float64:
+			if s := strconv.FormatFloat(pv, 'f', -1, 64); s != vv {
+				t.Errorf("failed to match imported float value %v with expected %v for key %q", s, vv, kk)
+			}
+		case bool:
+			if b := strconv.FormatBool(pv); b != vv {
+				t.Errorf("failed to match imported bool value %v with expected %v for key %q", b, vv, kk)
+			}
+		default:
+			if pv != vv {
+				t.Errorf("failed to match imported string value %q with expected %q for key %q", pv, vv, kk)
+			}
+		}
+	}
+
+	// Since this was processed with coalescing there should be no null values.
+	// Here we verify that.
+	_, err := cc.PathValue("ensurenull")
+	if err == nil {
+		t.Error("expect nil value not found but found it")
+	}
+	switch xerr := err.(type) {
+	case ErrNoValue:
+		// We found what we expected
+	default:
+		t.Errorf("expected an ErrNoValue but got %q instead", xerr)
+	}
+
+	c = loadChart(t, "testdata/subpop")
+	if err := processDependencyImportValues(c, true); err != nil {
+		t.Fatalf("processing import values dependencies %v", err)
+	}
+	cc = Values(c.Values)
+	val, err := cc.PathValue("ensurenull")
+	if err != nil {
+		t.Error("expect value but ensurenull was not found")
+	}
+	if val != nil {
+		t.Errorf("expect nil value but got %q instead", val)
+	}
+}
+
+func TestProcessDependencyImportValuesFromSharedDependencyToAliases(t *testing.T) {
+	c := loadChart(t, "testdata/chart-with-import-from-aliased-dependencies")
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+	if err := processDependencyImportValues(c, true); err != nil {
+		t.Fatalf("processing import values dependencies %v", err)
+	}
+	e := make(map[string]string)
+
+	e["foo-defaults.defaultValue"] = "42"
+	e["bar-defaults.defaultValue"] = "42"
+
+	e["foo.defaults.defaultValue"] = "42"
+	e["bar.defaults.defaultValue"] = "42"
+
+	e["foo.grandchild.defaults.defaultValue"] = "42"
+	e["bar.grandchild.defaults.defaultValue"] = "42"
+
+	cValues := Values(c.Values)
+	for kk, vv := range e {
+		pv, err := cValues.PathValue(kk)
+		if err != nil {
+			t.Fatalf("retrieving import values table %v %v", kk, err)
+		}
+		if pv != vv {
+			t.Errorf("failed to match imported value %v with expected %v", pv, vv)
+		}
+	}
+}
+
+func TestProcessDependencyImportValuesMultiLevelPrecedence(t *testing.T) {
+	c := loadChart(t, "testdata/three-level-dependent-chart/umbrella")
+
+	e := make(map[string]string)
+
+	// The order of precedence should be:
+	// 1. User specified values (e.g CLI)
+	// 2. Parent chart values
+	// 3. Imported values
+	// 4. Sub-chart values
+	// The 4 app charts here deal with things differently:
+	// - app1 has a port value set in the umbrella chart. It does not import any
+	//   values so the value from the umbrella chart should be used.
+	// - app2 has a value in the app chart and imports from the library. The
+	//   app chart value should take precedence.
+	// - app3 has no value in the app chart and imports the value from the library
+	//   chart. The library chart value should be used.
+	// - app4 has a value in the app chart and does not import the value from the
+	//   library chart. The app charts value should be used.
+	e["app1.service.port"] = "3456"
+	e["app2.service.port"] = "8080"
+	e["app3.service.port"] = "9090"
+	e["app4.service.port"] = "1234"
+	if err := processDependencyImportValues(c, true); err != nil {
+		t.Fatalf("processing import values dependencies %v", err)
+	}
+	cc := Values(c.Values)
+	for kk, vv := range e {
+		pv, err := cc.PathValue(kk)
+		if err != nil {
+			t.Fatalf("retrieving import values table %v %v", kk, err)
+		}
+
+		switch pv := pv.(type) {
+		case float64:
+			if s := strconv.FormatFloat(pv, 'f', -1, 64); s != vv {
+				t.Errorf("failed to match imported float value %v with expected %v", s, vv)
+			}
+		default:
+			if pv != vv {
+				t.Errorf("failed to match imported string value %q with expected %q", pv, vv)
+			}
+		}
+	}
+}
+
+func TestProcessDependencyImportValuesForEnabledCharts(t *testing.T) {
+	c := loadChart(t, "testdata/import-values-from-enabled-subchart/parent-chart")
+	nameOverride := "parent-chart-prod"
+
+	if err := processDependencyImportValues(c, true); err != nil {
+		t.Fatalf("processing import values dependencies %v", err)
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 1 {
+		t.Fatal("expected no changes in dependencies")
+	}
+
+	if len(c.Metadata.Dependencies) != 1 {
+		t.Fatalf("expected 1 dependency specified in Chart.yaml, got %d", len(c.Metadata.Dependencies))
+	}
+
+	prodDependencyValues := c.Dependencies()[0].Values
+	if prodDependencyValues["nameOverride"] != nameOverride {
+		t.Fatalf("dependency chart name should be %s but got %s", nameOverride, prodDependencyValues["nameOverride"])
+	}
+}
+
+func TestGetAliasDependency(t *testing.T) {
+	c := loadChart(t, "testdata/frobnitz")
+	req := c.Metadata.Dependencies
+
+	if len(req) == 0 {
+		t.Fatalf("there are no dependencies to test")
+	}
+
+	// Success case
+	aliasChart := getAliasDependency(c.Dependencies(), req[0])
+	if aliasChart == nil {
+		t.Fatalf("failed to get dependency chart for alias %s", req[0].Name)
+	}
+	if req[0].Alias != "" {
+		if aliasChart.Name() != req[0].Alias {
+			t.Fatalf("dependency chart name should be %s but got %s", req[0].Alias, aliasChart.Name())
+		}
+	} else if aliasChart.Name() != req[0].Name {
+		t.Fatalf("dependency chart name should be %s but got %s", req[0].Name, aliasChart.Name())
+	}
+
+	if req[0].Version != "" {
+		if !IsCompatibleRange(req[0].Version, aliasChart.Metadata.Version) {
+			t.Fatalf("dependency chart version is not in the compatible range")
+		}
+	}
+
+	// Failure case
+	req[0].Name = "something-else"
+	if aliasChart := getAliasDependency(c.Dependencies(), req[0]); aliasChart != nil {
+		t.Fatalf("expected no chart but got %s", aliasChart.Name())
+	}
+
+	req[0].Version = "something else which is not in the compatible range"
+	if IsCompatibleRange(req[0].Version, aliasChart.Metadata.Version) {
+		t.Fatalf("dependency chart version which is not in the compatible range should cause a failure other than a success ")
+	}
+}
+
+func TestDependentChartAliases(t *testing.T) {
+	c := loadChart(t, "testdata/dependent-chart-alias")
+	req := c.Metadata.Dependencies
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 3 {
+		t.Fatal("expected alias dependencies to be added")
+	}
+
+	if len(c.Dependencies()) != len(c.Metadata.Dependencies) {
+		t.Fatalf("expected number of chart dependencies %d, but got %d", len(c.Metadata.Dependencies), len(c.Dependencies()))
+	}
+
+	aliasChart := getAliasDependency(c.Dependencies(), req[2])
+
+	if aliasChart == nil {
+		t.Fatalf("failed to get dependency chart for alias %s", req[2].Name)
+	}
+	if aliasChart.Parent() != c {
+		t.Fatalf("dependency chart has wrong parent, expected %s but got %s", c.Name(), aliasChart.Parent().Name())
+	}
+	if req[2].Alias != "" {
+		if aliasChart.Name() != req[2].Alias {
+			t.Fatalf("dependency chart name should be %s but got %s", req[2].Alias, aliasChart.Name())
+		}
+	} else if aliasChart.Name() != req[2].Name {
+		t.Fatalf("dependency chart name should be %s but got %s", req[2].Name, aliasChart.Name())
+	}
+
+	req[2].Name = "dummy-name"
+	if aliasChart := getAliasDependency(c.Dependencies(), req[2]); aliasChart != nil {
+		t.Fatalf("expected no chart but got %s", aliasChart.Name())
+	}
+
+}
+
+func TestDependentChartWithSubChartsAbsentInDependency(t *testing.T) {
+	c := loadChart(t, "testdata/dependent-chart-no-requirements-yaml")
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatal("expected no changes in dependencies")
+	}
+}
+
+func TestDependentChartWithSubChartsHelmignore(t *testing.T) {
+	// FIXME what does this test?
+	loadChart(t, "testdata/dependent-chart-helmignore")
+}
+
+func TestDependentChartsWithSubChartsSymlink(t *testing.T) {
+	joonix := filepath.Join("testdata", "joonix")
+	if err := os.Symlink(filepath.Join("..", "..", "frobnitz"), filepath.Join(joonix, "charts", "frobnitz")); err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(filepath.Join(joonix, "charts", "frobnitz"))
+	c := loadChart(t, joonix)
+
+	if c.Name() != "joonix" {
+		t.Fatalf("unexpected chart name: %s", c.Name())
+	}
+	if n := len(c.Dependencies()); n != 1 {
+		t.Fatalf("expected 1 dependency for this chart, but got %d", n)
+	}
+}
+
+func TestDependentChartsWithSubchartsAllSpecifiedInDependency(t *testing.T) {
+	c := loadChart(t, "testdata/dependent-chart-with-all-in-requirements-yaml")
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatal("expected no changes in dependencies")
+	}
+
+	if len(c.Dependencies()) != len(c.Metadata.Dependencies) {
+		t.Fatalf("expected number of chart dependencies %d, but got %d", len(c.Metadata.Dependencies), len(c.Dependencies()))
+	}
+}
+
+func TestDependentChartsWithSomeSubchartsSpecifiedInDependency(t *testing.T) {
+	c := loadChart(t, "testdata/dependent-chart-with-mixed-requirements-yaml")
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatal("expected no changes in dependencies")
+	}
+
+	if len(c.Metadata.Dependencies) != 1 {
+		t.Fatalf("expected 1 dependency specified in Chart.yaml, got %d", len(c.Metadata.Dependencies))
+	}
+}
+
+func validateDependencyTree(t *testing.T, c *chart.Chart) {
+	t.Helper()
+	for _, dependency := range c.Dependencies() {
+		if dependency.Parent() != c {
+			if dependency.Parent() != c {
+				t.Fatalf("dependency chart %s has wrong parent, expected %s but got %s", dependency.Name(), c.Name(), dependency.Parent().Name())
+			}
+		}
+		// recurse entire tree
+		validateDependencyTree(t, dependency)
+	}
+}
+
+func TestChartWithDependencyAliasedTwiceAndDoublyReferencedSubDependency(t *testing.T) {
+	c := loadChart(t, "testdata/chart-with-dependency-aliased-twice")
+
+	if len(c.Dependencies()) != 1 {
+		t.Fatalf("expected one dependency for this chart, but got %d", len(c.Dependencies()))
+	}
+
+	if err := processDependencyEnabled(c, c.Values, ""); err != nil {
+		t.Fatalf("expected no errors but got %q", err)
+	}
+
+	if len(c.Dependencies()) != 2 {
+		t.Fatal("expected two dependencies after processing aliases")
+	}
+	validateDependencyTree(t, c)
+}
diff --git a/internal/chart/v3/util/doc.go b/internal/chart/v3/util/doc.go
new file mode 100644
index 000000000..002d5babc
--- /dev/null
+++ b/internal/chart/v3/util/doc.go
@@ -0,0 +1,45 @@
+/*
+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 util contains tools for working with charts.
+
+Charts are described in the chart package (pkg/chart).
+This package provides utilities for serializing and deserializing charts.
+
+A chart can be represented on the file system in one of two ways:
+
+  - As a directory that contains a Chart.yaml file and other chart things.
+  - As a tarred gzipped file containing a directory that then contains a
+    Chart.yaml file.
+
+This package provides utilities for working with those file formats.
+
+The preferred way of loading a chart is using 'loader.Load`:
+
+	chart, err := loader.Load(filename)
+
+This will attempt to discover whether the file at 'filename' is a directory or
+a chart archive. It will then load accordingly.
+
+For accepting raw compressed tar file data from an io.Reader, the
+'loader.LoadArchive()' will read in the data, uncompress it, and unpack it
+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/internal/chart/v3/util"
diff --git a/internal/chart/v3/util/errors.go b/internal/chart/v3/util/errors.go
new file mode 100644
index 000000000..a175b9758
--- /dev/null
+++ b/internal/chart/v3/util/errors.go
@@ -0,0 +1,43 @@
+/*
+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 util
+
+import (
+	"fmt"
+)
+
+// ErrNoTable indicates that a chart does not have a matching table.
+type ErrNoTable struct {
+	Key string
+}
+
+func (e ErrNoTable) Error() string { return fmt.Sprintf("%q is not a table", e.Key) }
+
+// ErrNoValue indicates that Values does not contain a key with a value
+type ErrNoValue struct {
+	Key string
+}
+
+func (e ErrNoValue) Error() string { return fmt.Sprintf("%q is not a value", e.Key) }
+
+type ErrInvalidChartName struct {
+	Name string
+}
+
+func (e ErrInvalidChartName) Error() string {
+	return fmt.Sprintf("%q is not a valid chart name", e.Name)
+}
diff --git a/internal/chart/v3/util/errors_test.go b/internal/chart/v3/util/errors_test.go
new file mode 100644
index 000000000..b8ae86384
--- /dev/null
+++ b/internal/chart/v3/util/errors_test.go
@@ -0,0 +1,37 @@
+/*
+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 util
+
+import (
+	"testing"
+)
+
+func TestErrorNoTableDoesNotPanic(t *testing.T) {
+	x := "empty"
+
+	y := ErrNoTable{x}
+
+	t.Logf("error is: %s", y)
+}
+
+func TestErrorNoValueDoesNotPanic(t *testing.T) {
+	x := "empty"
+
+	y := ErrNoValue{x}
+
+	t.Logf("error is: %s", y)
+}
diff --git a/internal/chart/v3/util/expand.go b/internal/chart/v3/util/expand.go
new file mode 100644
index 000000000..6cbbeabf2
--- /dev/null
+++ b/internal/chart/v3/util/expand.go
@@ -0,0 +1,94 @@
+/*
+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 util
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
+	securejoin "github.com/cyphar/filepath-securejoin"
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+// Expand uncompresses and extracts a chart into the specified directory.
+func Expand(dir string, r io.Reader) error {
+	files, err := loader.LoadArchiveFiles(r)
+	if err != nil {
+		return err
+	}
+
+	// Get the name of the chart
+	var chartName string
+	for _, file := range files {
+		if file.Name == "Chart.yaml" {
+			ch := &chart.Metadata{}
+			if err := yaml.Unmarshal(file.Data, ch); err != nil {
+				return fmt.Errorf("cannot load Chart.yaml: %w", err)
+			}
+			chartName = ch.Name
+		}
+	}
+	if chartName == "" {
+		return errors.New("chart name not specified")
+	}
+
+	// Find the base directory
+	// The directory needs to be cleaned prior to passing to SecureJoin or the location may end up
+	// being wrong or returning an error. This was introduced in v0.4.0.
+	dir = filepath.Clean(dir)
+	chartdir, err := securejoin.SecureJoin(dir, chartName)
+	if err != nil {
+		return err
+	}
+
+	// Copy all files verbatim. We don't parse these files because parsing can remove
+	// comments.
+	for _, file := range files {
+		outpath, err := securejoin.SecureJoin(chartdir, file.Name)
+		if err != nil {
+			return err
+		}
+
+		// Make sure the necessary subdirs get created.
+		basedir := filepath.Dir(outpath)
+		if err := os.MkdirAll(basedir, 0755); err != nil {
+			return err
+		}
+
+		if err := os.WriteFile(outpath, file.Data, 0644); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ExpandFile expands the src file into the dest directory.
+func ExpandFile(dest, src string) error {
+	h, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer h.Close()
+	return Expand(dest, h)
+}
diff --git a/internal/chart/v3/util/expand_test.go b/internal/chart/v3/util/expand_test.go
new file mode 100644
index 000000000..280995f7e
--- /dev/null
+++ b/internal/chart/v3/util/expand_test.go
@@ -0,0 +1,124 @@
+/*
+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 util
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestExpand(t *testing.T) {
+	dest := t.TempDir()
+
+	reader, err := os.Open("testdata/frobnitz-1.2.3.tgz")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := Expand(dest, reader); err != nil {
+		t.Fatal(err)
+	}
+
+	expectedChartPath := filepath.Join(dest, "frobnitz")
+	fi, err := os.Stat(expectedChartPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !fi.IsDir() {
+		t.Fatalf("expected a chart directory at %s", expectedChartPath)
+	}
+
+	dir, err := os.Open(expectedChartPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fis, err := dir.Readdir(0)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expectLen := 11
+	if len(fis) != expectLen {
+		t.Errorf("Expected %d files, but got %d", expectLen, len(fis))
+	}
+
+	for _, fi := range fis {
+		expect, err := os.Stat(filepath.Join("testdata", "frobnitz", fi.Name()))
+		if err != nil {
+			t.Fatal(err)
+		}
+		// os.Stat can return different values for directories, based on the OS
+		// for Linux, for example, os.Stat always returns the size of the directory
+		// (value-4096) regardless of the size of the contents of the directory
+		mode := expect.Mode()
+		if !mode.IsDir() {
+			if fi.Size() != expect.Size() {
+				t.Errorf("Expected %s to have size %d, got %d", fi.Name(), expect.Size(), fi.Size())
+			}
+		}
+	}
+}
+
+func TestExpandFile(t *testing.T) {
+	dest := t.TempDir()
+
+	if err := ExpandFile(dest, "testdata/frobnitz-1.2.3.tgz"); err != nil {
+		t.Fatal(err)
+	}
+
+	expectedChartPath := filepath.Join(dest, "frobnitz")
+	fi, err := os.Stat(expectedChartPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !fi.IsDir() {
+		t.Fatalf("expected a chart directory at %s", expectedChartPath)
+	}
+
+	dir, err := os.Open(expectedChartPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fis, err := dir.Readdir(0)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expectLen := 11
+	if len(fis) != expectLen {
+		t.Errorf("Expected %d files, but got %d", expectLen, len(fis))
+	}
+
+	for _, fi := range fis {
+		expect, err := os.Stat(filepath.Join("testdata", "frobnitz", fi.Name()))
+		if err != nil {
+			t.Fatal(err)
+		}
+		// os.Stat can return different values for directories, based on the OS
+		// for Linux, for example, os.Stat always returns the size of the directory
+		// (value-4096) regardless of the size of the contents of the directory
+		mode := expect.Mode()
+		if !mode.IsDir() {
+			if fi.Size() != expect.Size() {
+				t.Errorf("Expected %s to have size %d, got %d", fi.Name(), expect.Size(), fi.Size())
+			}
+		}
+	}
+}
diff --git a/internal/chart/v3/util/jsonschema.go b/internal/chart/v3/util/jsonschema.go
new file mode 100644
index 000000000..9fe35904e
--- /dev/null
+++ b/internal/chart/v3/util/jsonschema.go
@@ -0,0 +1,113 @@
+/*
+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 util
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"log/slog"
+	"strings"
+
+	"github.com/santhosh-tekuri/jsonschema/v6"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// ValidateAgainstSchema checks that values does not violate the structure laid out in schema
+func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
+	var sb strings.Builder
+	if chrt.Schema != nil {
+		slog.Debug("chart name", "chart-name", chrt.Name())
+		err := ValidateAgainstSingleSchema(values, chrt.Schema)
+		if err != nil {
+			sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name()))
+			sb.WriteString(err.Error())
+		}
+	}
+	slog.Debug("number of dependencies in the chart", "dependencies", len(chrt.Dependencies()))
+	// For each dependency, recursively call this function with the coalesced values
+	for _, subchart := range chrt.Dependencies() {
+		subchartValues := values[subchart.Name()].(map[string]interface{})
+		if err := ValidateAgainstSchema(subchart, subchartValues); err != nil {
+			sb.WriteString(err.Error())
+		}
+	}
+
+	if sb.Len() > 0 {
+		return errors.New(sb.String())
+	}
+
+	return nil
+}
+
+// ValidateAgainstSingleSchema checks that values does not violate the structure laid out in this schema
+func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error) {
+	defer func() {
+		if r := recover(); r != nil {
+			reterr = fmt.Errorf("unable to validate schema: %s", r)
+		}
+	}()
+
+	// This unmarshal function leverages UseNumber() for number precision. The parser
+	// used for values does this as well.
+	schema, err := jsonschema.UnmarshalJSON(bytes.NewReader(schemaJSON))
+	if err != nil {
+		return err
+	}
+	slog.Debug("unmarshalled JSON schema", "schema", schemaJSON)
+
+	compiler := jsonschema.NewCompiler()
+	err = compiler.AddResource("file:///values.schema.json", schema)
+	if err != nil {
+		return err
+	}
+
+	validator, err := compiler.Compile("file:///values.schema.json")
+	if err != nil {
+		return err
+	}
+
+	err = validator.Validate(values.AsMap())
+	if err != nil {
+		return JSONSchemaValidationError{err}
+	}
+
+	return nil
+}
+
+// Note, JSONSchemaValidationError is used to wrap the error from the underlying
+// validation package so that Helm has a clean interface and the validation package
+// could be replaced without changing the Helm SDK API.
+
+// JSONSchemaValidationError is the error returned when there is a schema validation
+// error.
+type JSONSchemaValidationError struct {
+	embeddedErr error
+}
+
+// Error prints the error message
+func (e JSONSchemaValidationError) Error() string {
+	errStr := e.embeddedErr.Error()
+
+	// This string prefixes all of our error details. Further up the stack of helm error message
+	// building more detail is provided to users. This is removed.
+	errStr = strings.TrimPrefix(errStr, "jsonschema validation failed with 'file:///values.schema.json#'\n")
+
+	// The extra new line is needed for when there are sub-charts.
+	return errStr + "\n"
+}
diff --git a/internal/chart/v3/util/jsonschema_test.go b/internal/chart/v3/util/jsonschema_test.go
new file mode 100644
index 000000000..0a3820377
--- /dev/null
+++ b/internal/chart/v3/util/jsonschema_test.go
@@ -0,0 +1,247 @@
+/*
+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 util
+
+import (
+	"os"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+func TestValidateAgainstSingleSchema(t *testing.T) {
+	values, err := ReadValuesFile("./testdata/test-values.yaml")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+	schema, err := os.ReadFile("./testdata/test-values.schema.json")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+
+	if err := ValidateAgainstSingleSchema(values, schema); err != nil {
+		t.Errorf("Error validating Values against Schema: %s", err)
+	}
+}
+
+func TestValidateAgainstInvalidSingleSchema(t *testing.T) {
+	values, err := ReadValuesFile("./testdata/test-values.yaml")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+	schema, err := os.ReadFile("./testdata/test-values-invalid.schema.json")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+
+	var errString string
+	if err := ValidateAgainstSingleSchema(values, schema); err == nil {
+		t.Fatalf("Expected an error, but got nil")
+	} else {
+		errString = err.Error()
+	}
+
+	expectedErrString := `"file:///values.schema.json#" is not valid against metaschema: jsonschema validation failed with 'https://json-schema.org/draft/2020-12/schema#'
+- at '': got number, want boolean or object`
+	if errString != expectedErrString {
+		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
+	}
+}
+
+func TestValidateAgainstSingleSchemaNegative(t *testing.T) {
+	values, err := ReadValuesFile("./testdata/test-values-negative.yaml")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+	schema, err := os.ReadFile("./testdata/test-values.schema.json")
+	if err != nil {
+		t.Fatalf("Error reading JSON file: %s", err)
+	}
+
+	var errString string
+	if err := ValidateAgainstSingleSchema(values, schema); err == nil {
+		t.Fatalf("Expected an error, but got nil")
+	} else {
+		errString = err.Error()
+	}
+
+	expectedErrString := `- at '': missing property 'employmentInfo'
+- at '/age': minimum: got -5, want 0
+`
+	if errString != expectedErrString {
+		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
+	}
+}
+
+const subchartSchema = `{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Values",
+  "type": "object",
+  "properties": {
+    "age": {
+      "description": "Age",
+      "minimum": 0,
+      "type": "integer"
+    }
+  },
+  "required": [
+    "age"
+  ]
+}
+`
+
+const subchartSchema2020 = `{
+	"$schema": "https://json-schema.org/draft/2020-12/schema",
+	"title": "Values",
+	"type": "object",
+	"properties": {
+		"data": {
+			"type": "array",
+			"contains": { "type": "string" },
+			"unevaluatedItems": { "type": "number" }
+		}
+	},
+	"required": ["data"]
+}
+`
+
+func TestValidateAgainstSchema(t *testing.T) {
+	subchartJSON := []byte(subchartSchema)
+	subchart := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "subchart",
+		},
+		Schema: subchartJSON,
+	}
+	chrt := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "chrt",
+		},
+	}
+	chrt.AddDependency(subchart)
+
+	vals := map[string]interface{}{
+		"name": "John",
+		"subchart": map[string]interface{}{
+			"age": 25,
+		},
+	}
+
+	if err := ValidateAgainstSchema(chrt, vals); err != nil {
+		t.Errorf("Error validating Values against Schema: %s", err)
+	}
+}
+
+func TestValidateAgainstSchemaNegative(t *testing.T) {
+	subchartJSON := []byte(subchartSchema)
+	subchart := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "subchart",
+		},
+		Schema: subchartJSON,
+	}
+	chrt := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "chrt",
+		},
+	}
+	chrt.AddDependency(subchart)
+
+	vals := map[string]interface{}{
+		"name":     "John",
+		"subchart": map[string]interface{}{},
+	}
+
+	var errString string
+	if err := ValidateAgainstSchema(chrt, vals); err == nil {
+		t.Fatalf("Expected an error, but got nil")
+	} else {
+		errString = err.Error()
+	}
+
+	expectedErrString := `subchart:
+- at '': missing property 'age'
+`
+	if errString != expectedErrString {
+		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
+	}
+}
+
+func TestValidateAgainstSchema2020(t *testing.T) {
+	subchartJSON := []byte(subchartSchema2020)
+	subchart := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "subchart",
+		},
+		Schema: subchartJSON,
+	}
+	chrt := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "chrt",
+		},
+	}
+	chrt.AddDependency(subchart)
+
+	vals := map[string]interface{}{
+		"name": "John",
+		"subchart": map[string]interface{}{
+			"data": []any{"hello", 12},
+		},
+	}
+
+	if err := ValidateAgainstSchema(chrt, vals); err != nil {
+		t.Errorf("Error validating Values against Schema: %s", err)
+	}
+}
+
+func TestValidateAgainstSchema2020Negative(t *testing.T) {
+	subchartJSON := []byte(subchartSchema2020)
+	subchart := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "subchart",
+		},
+		Schema: subchartJSON,
+	}
+	chrt := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name: "chrt",
+		},
+	}
+	chrt.AddDependency(subchart)
+
+	vals := map[string]interface{}{
+		"name": "John",
+		"subchart": map[string]interface{}{
+			"data": []any{12},
+		},
+	}
+
+	var errString string
+	if err := ValidateAgainstSchema(chrt, vals); err == nil {
+		t.Fatalf("Expected an error, but got nil")
+	} else {
+		errString = err.Error()
+	}
+
+	expectedErrString := `subchart:
+- at '/data': no items match contains schema
+  - at '/data/0': got number, want string
+`
+	if errString != expectedErrString {
+		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
+	}
+}
diff --git a/internal/chart/v3/util/save.go b/internal/chart/v3/util/save.go
new file mode 100644
index 000000000..3125cc3c9
--- /dev/null
+++ b/internal/chart/v3/util/save.go
@@ -0,0 +1,253 @@
+/*
+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 util
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"time"
+
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
+
+// SaveDir saves a chart as files in a directory.
+//
+// This takes the chart name, and creates a new subdirectory inside of the given dest
+// directory, writing the chart's contents to that subdirectory.
+func SaveDir(c *chart.Chart, dest string) error {
+	// Create the chart directory
+	err := validateName(c.Name())
+	if err != nil {
+		return err
+	}
+	outdir := filepath.Join(dest, c.Name())
+	if fi, err := os.Stat(outdir); err == nil && !fi.IsDir() {
+		return fmt.Errorf("file %s already exists and is not a directory", outdir)
+	}
+	if err := os.MkdirAll(outdir, 0755); err != nil {
+		return err
+	}
+
+	// Save the chart file.
+	if err := SaveChartfile(filepath.Join(outdir, ChartfileName), c.Metadata); err != nil {
+		return err
+	}
+
+	// Save values.yaml
+	for _, f := range c.Raw {
+		if f.Name == ValuesfileName {
+			vf := filepath.Join(outdir, ValuesfileName)
+			if err := writeFile(vf, f.Data); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Save values.schema.json if it exists
+	if c.Schema != nil {
+		filename := filepath.Join(outdir, SchemafileName)
+		if err := writeFile(filename, c.Schema); err != nil {
+			return err
+		}
+	}
+
+	// Save templates and files
+	for _, o := range [][]*chart.File{c.Templates, c.Files} {
+		for _, f := range o {
+			n := filepath.Join(outdir, f.Name)
+			if err := writeFile(n, f.Data); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Save dependencies
+	base := filepath.Join(outdir, ChartsDir)
+	for _, dep := range c.Dependencies() {
+		// Here, we write each dependency as a tar file.
+		if _, err := Save(dep, base); err != nil {
+			return fmt.Errorf("saving %s: %w", dep.ChartFullPath(), err)
+		}
+	}
+	return nil
+}
+
+// Save creates an archived chart to the given directory.
+//
+// This takes an existing chart and a destination directory.
+//
+// If the directory is /foo, and the chart is named bar, with version 1.0.0, this
+// will generate /foo/bar-1.0.0.tgz.
+//
+// This returns the absolute path to the chart archive file.
+func Save(c *chart.Chart, outDir string) (string, error) {
+	if err := c.Validate(); err != nil {
+		return "", fmt.Errorf("chart validation: %w", err)
+	}
+
+	filename := fmt.Sprintf("%s-%s.tgz", c.Name(), c.Metadata.Version)
+	filename = filepath.Join(outDir, filename)
+	dir := filepath.Dir(filename)
+	if stat, err := os.Stat(dir); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			if err2 := os.MkdirAll(dir, 0755); err2 != nil {
+				return "", err2
+			}
+		} else {
+			return "", fmt.Errorf("stat %s: %w", dir, err)
+		}
+	} else if !stat.IsDir() {
+		return "", fmt.Errorf("is not a directory: %s", dir)
+	}
+
+	f, err := os.Create(filename)
+	if err != nil {
+		return "", err
+	}
+
+	// Wrap in gzip writer
+	zipper := gzip.NewWriter(f)
+	zipper.Extra = headerBytes
+	zipper.Comment = "Helm"
+
+	// Wrap in tar writer
+	twriter := tar.NewWriter(zipper)
+	rollback := false
+	defer func() {
+		twriter.Close()
+		zipper.Close()
+		f.Close()
+		if rollback {
+			os.Remove(filename)
+		}
+	}()
+
+	if err := writeTarContents(twriter, c, ""); err != nil {
+		rollback = true
+		return filename, err
+	}
+	return filename, nil
+}
+
+func writeTarContents(out *tar.Writer, c *chart.Chart, prefix string) error {
+	err := validateName(c.Name())
+	if err != nil {
+		return err
+	}
+	base := filepath.Join(prefix, c.Name())
+
+	// Save Chart.yaml
+	cdata, err := yaml.Marshal(c.Metadata)
+	if err != nil {
+		return err
+	}
+	if err := writeToTar(out, filepath.Join(base, ChartfileName), cdata); err != nil {
+		return err
+	}
+
+	// Save Chart.lock
+	if c.Lock != nil {
+		ldata, err := yaml.Marshal(c.Lock)
+		if err != nil {
+			return err
+		}
+		if err := writeToTar(out, filepath.Join(base, "Chart.lock"), ldata); err != nil {
+			return err
+		}
+	}
+
+	// Save values.yaml
+	for _, f := range c.Raw {
+		if f.Name == ValuesfileName {
+			if err := writeToTar(out, filepath.Join(base, ValuesfileName), f.Data); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Save values.schema.json if it exists
+	if c.Schema != nil {
+		if !json.Valid(c.Schema) {
+			return errors.New("invalid JSON in " + SchemafileName)
+		}
+		if err := writeToTar(out, filepath.Join(base, SchemafileName), c.Schema); err != nil {
+			return err
+		}
+	}
+
+	// Save templates
+	for _, f := range c.Templates {
+		n := filepath.Join(base, f.Name)
+		if err := writeToTar(out, n, f.Data); err != nil {
+			return err
+		}
+	}
+
+	// Save files
+	for _, f := range c.Files {
+		n := filepath.Join(base, f.Name)
+		if err := writeToTar(out, n, f.Data); err != nil {
+			return err
+		}
+	}
+
+	// Save dependencies
+	for _, dep := range c.Dependencies() {
+		if err := writeTarContents(out, dep, filepath.Join(base, ChartsDir)); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// writeToTar writes a single file to a tar archive.
+func writeToTar(out *tar.Writer, name string, body []byte) error {
+	// TODO: Do we need to create dummy parent directory names if none exist?
+	h := &tar.Header{
+		Name:    filepath.ToSlash(name),
+		Mode:    0644,
+		Size:    int64(len(body)),
+		ModTime: time.Now(),
+	}
+	if err := out.WriteHeader(h); err != nil {
+		return err
+	}
+	_, err := out.Write(body)
+	return err
+}
+
+// If the name has directory name has characters which would change the location
+// they need to be removed.
+func validateName(name string) error {
+	nname := filepath.Base(name)
+
+	if nname != name {
+		return ErrInvalidChartName{name}
+	}
+
+	return nil
+}
diff --git a/internal/chart/v3/util/save_test.go b/internal/chart/v3/util/save_test.go
new file mode 100644
index 000000000..852675bb0
--- /dev/null
+++ b/internal/chart/v3/util/save_test.go
@@ -0,0 +1,261 @@
+/*
+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 util
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+func TestSave(t *testing.T) {
+	tmp := t.TempDir()
+
+	for _, dest := range []string{tmp, filepath.Join(tmp, "newdir")} {
+		t.Run("outDir="+dest, func(t *testing.T) {
+			c := &chart.Chart{
+				Metadata: &chart.Metadata{
+					APIVersion: chart.APIVersionV3,
+					Name:       "ahab",
+					Version:    "1.2.3",
+				},
+				Lock: &chart.Lock{
+					Digest: "testdigest",
+				},
+				Files: []*chart.File{
+					{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+				},
+				Schema: []byte("{\n  \"title\": \"Values\"\n}"),
+			}
+			chartWithInvalidJSON := withSchema(*c, []byte("{"))
+
+			where, err := Save(c, dest)
+			if err != nil {
+				t.Fatalf("Failed to save: %s", err)
+			}
+			if !strings.HasPrefix(where, dest) {
+				t.Fatalf("Expected %q to start with %q", where, dest)
+			}
+			if !strings.HasSuffix(where, ".tgz") {
+				t.Fatalf("Expected %q to end with .tgz", where)
+			}
+
+			c2, err := loader.LoadFile(where)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if c2.Name() != c.Name() {
+				t.Fatalf("Expected chart archive to have %q, got %q", c.Name(), c2.Name())
+			}
+			if len(c2.Files) != 1 || c2.Files[0].Name != "scheherazade/shahryar.txt" {
+				t.Fatal("Files data did not match")
+			}
+
+			if !bytes.Equal(c.Schema, c2.Schema) {
+				indentation := 4
+				formattedExpected := Indent(indentation, string(c.Schema))
+				formattedActual := Indent(indentation, string(c2.Schema))
+				t.Fatalf("Schema data did not match.\nExpected:\n%s\nActual:\n%s", formattedExpected, formattedActual)
+			}
+			if _, err := Save(&chartWithInvalidJSON, dest); err == nil {
+				t.Fatalf("Invalid JSON was not caught while saving chart")
+			}
+
+			c.Metadata.APIVersion = chart.APIVersionV3
+			where, err = Save(c, dest)
+			if err != nil {
+				t.Fatalf("Failed to save: %s", err)
+			}
+			c2, err = loader.LoadFile(where)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if c2.Lock == nil {
+				t.Fatal("Expected v3 chart archive to contain a Chart.lock file")
+			}
+			if c2.Lock.Digest != c.Lock.Digest {
+				t.Fatal("Chart.lock data did not match")
+			}
+		})
+	}
+
+	c := &chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: chart.APIVersionV3,
+			Name:       "../ahab",
+			Version:    "1.2.3",
+		},
+		Lock: &chart.Lock{
+			Digest: "testdigest",
+		},
+		Files: []*chart.File{
+			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+		},
+	}
+	_, err := Save(c, tmp)
+	if err == nil {
+		t.Fatal("Expected error saving chart with invalid name")
+	}
+}
+
+// Creates a copy with a different schema; does not modify anything.
+func withSchema(chart chart.Chart, schema []byte) chart.Chart {
+	chart.Schema = schema
+	return chart
+}
+
+func Indent(n int, text string) string {
+	startOfLine := regexp.MustCompile(`(?m)^`)
+	indentation := strings.Repeat(" ", n)
+	return startOfLine.ReplaceAllLiteralString(text, indentation)
+}
+
+func TestSavePreservesTimestamps(t *testing.T) {
+	// Test executes so quickly that if we don't subtract a second, the
+	// check will fail because `initialCreateTime` will be identical to the
+	// written timestamp for the files.
+	initialCreateTime := time.Now().Add(-1 * time.Second)
+
+	tmp := t.TempDir()
+
+	c := &chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: chart.APIVersionV3,
+			Name:       "ahab",
+			Version:    "1.2.3",
+		},
+		Values: map[string]interface{}{
+			"imageName": "testimage",
+			"imageId":   42,
+		},
+		Files: []*chart.File{
+			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+		},
+		Schema: []byte("{\n  \"title\": \"Values\"\n}"),
+	}
+
+	where, err := Save(c, tmp)
+	if err != nil {
+		t.Fatalf("Failed to save: %s", err)
+	}
+
+	allHeaders, err := retrieveAllHeadersFromTar(where)
+	if err != nil {
+		t.Fatalf("Failed to parse tar: %v", err)
+	}
+
+	for _, header := range allHeaders {
+		if header.ModTime.Before(initialCreateTime) {
+			t.Fatalf("File timestamp not preserved: %v", header.ModTime)
+		}
+	}
+}
+
+// We could refactor `load.go` to use this `retrieveAllHeadersFromTar` function
+// as well, so we are not duplicating components of the code which iterate
+// through the tar.
+func retrieveAllHeadersFromTar(path string) ([]*tar.Header, error) {
+	raw, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer raw.Close()
+
+	unzipped, err := gzip.NewReader(raw)
+	if err != nil {
+		return nil, err
+	}
+	defer unzipped.Close()
+
+	tr := tar.NewReader(unzipped)
+	headers := []*tar.Header{}
+	for {
+		hd, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			return nil, err
+		}
+
+		headers = append(headers, hd)
+	}
+
+	return headers, nil
+}
+
+func TestSaveDir(t *testing.T) {
+	tmp := t.TempDir()
+
+	c := &chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: chart.APIVersionV3,
+			Name:       "ahab",
+			Version:    "1.2.3",
+		},
+		Files: []*chart.File{
+			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+		},
+		Templates: []*chart.File{
+			{Name: path.Join(TemplatesDir, "nested", "dir", "thing.yaml"), Data: []byte("abc: {{ .Values.abc }}")},
+		},
+	}
+
+	if err := SaveDir(c, tmp); err != nil {
+		t.Fatalf("Failed to save: %s", err)
+	}
+
+	c2, err := loader.LoadDir(tmp + "/ahab")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if c2.Name() != c.Name() {
+		t.Fatalf("Expected chart archive to have %q, got %q", c.Name(), c2.Name())
+	}
+
+	if len(c2.Templates) != 1 || c2.Templates[0].Name != c.Templates[0].Name {
+		t.Fatal("Templates data did not match")
+	}
+
+	if len(c2.Files) != 1 || c2.Files[0].Name != c.Files[0].Name {
+		t.Fatal("Files data did not match")
+	}
+
+	tmp2 := t.TempDir()
+	c.Metadata.Name = "../ahab"
+	pth := filepath.Join(tmp2, "tmpcharts")
+	if err := os.MkdirAll(filepath.Join(pth), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := SaveDir(c, pth); err.Error() != "\"../ahab\" is not a valid chart name" {
+		t.Fatalf("Did not get expected error for chart named %q", c.Name())
+	}
+}
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/Chart.yaml
new file mode 100644
index 000000000..4a4da7996
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/Chart.yaml
@@ -0,0 +1,14 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: chart-with-dependency-aliased-twice
+type: application
+version: 1.0.0
+
+dependencies:
+  - name: child
+    alias: foo
+    version: 1.0.0
+  - name: child
+    alias: bar
+    version: 1.0.0
+
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/Chart.yaml
new file mode 100644
index 000000000..0f3afd8c6
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: child
+type: application
+version: 1.0.0
+
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/Chart.yaml
new file mode 100644
index 000000000..3e0bf725b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: grandchild
+type: application
+version: 1.0.0
+
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/templates/dummy.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/templates/dummy.yaml
new file mode 100644
index 000000000..1830492ef
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/charts/grandchild/templates/dummy.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Chart.Name }}-{{ .Values.from }}
+data:
+  {{- toYaml .Values | nindent 2 }}
+
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/templates/dummy.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/templates/dummy.yaml
new file mode 100644
index 000000000..b5d55af7c
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/charts/child/templates/dummy.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Chart.Name }}
+data:
+  {{- toYaml .Values | nindent 2 }}
+
diff --git a/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/values.yaml b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/values.yaml
new file mode 100644
index 000000000..695521a4a
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-dependency-aliased-twice/values.yaml
@@ -0,0 +1,7 @@
+foo:
+  grandchild:
+    from: foo
+bar:
+  grandchild:
+    from: bar
+
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/Chart.yaml
new file mode 100644
index 000000000..f2f0610b5
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: chart-with-dependency-aliased-twice
+type: application
+version: 1.0.0
+
+dependencies:
+  - name: child
+    alias: foo
+    version: 1.0.0
+    import-values:
+      - parent: foo-defaults
+        child: defaults
+  - name: child
+    alias: bar
+    version: 1.0.0
+    import-values:
+      - parent: bar-defaults
+        child: defaults
+
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/Chart.yaml
new file mode 100644
index 000000000..08ccac9e5
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: child
+type: application
+version: 1.0.0
+
+dependencies:
+  - name: grandchild
+    version: 1.0.0
+    import-values:
+      - parent: defaults
+        child: defaults
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/Chart.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/Chart.yaml
new file mode 100644
index 000000000..3e0bf725b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+appVersion: 1.0.0
+name: grandchild
+type: application
+version: 1.0.0
+
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/values.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/values.yaml
new file mode 100644
index 000000000..f51c594f4
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/charts/grandchild/values.yaml
@@ -0,0 +1,2 @@
+defaults:
+  defaultValue: "42"
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/templates/dummy.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/templates/dummy.yaml
new file mode 100644
index 000000000..3140f53dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/charts/child/templates/dummy.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Chart.Name }}
+data:
+  {{ .Values.defaults | toYaml }}
+
diff --git a/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/templates/dummy.yaml b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/templates/dummy.yaml
new file mode 100644
index 000000000..a2b62c95a
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chart-with-import-from-aliased-dependencies/templates/dummy.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Chart.Name }}
+data:
+  {{ toYaml .Values.defaults | indent 2 }}
+
diff --git a/internal/chart/v3/util/testdata/chartfiletest.yaml b/internal/chart/v3/util/testdata/chartfiletest.yaml
new file mode 100644
index 000000000..d222c8f8d
--- /dev/null
+++ b/internal/chart/v3/util/testdata/chartfiletest.yaml
@@ -0,0 +1,20 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
diff --git a/internal/chart/v3/util/testdata/coleridge.yaml b/internal/chart/v3/util/testdata/coleridge.yaml
new file mode 100644
index 000000000..b6579628b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/coleridge.yaml
@@ -0,0 +1,12 @@
+poet: "Coleridge"
+title: "Rime of the Ancient Mariner"
+stanza: ["at", "length", "did", "cross", "an", "Albatross"]
+
+mariner:
+  with: "crossbow"
+  shot: "ALBATROSS"
+
+water:
+  water:
+    where: "everywhere"
+    nor: "any drop to drink"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/.helmignore b/internal/chart/v3/util/testdata/dependent-chart-alias/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.lock b/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.yaml
new file mode 100644
index 000000000..b8773d0d3
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/Chart.yaml
@@ -0,0 +1,29 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+    alias: mariners2
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+    alias: mariners1
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/INSTALL.txt b/internal/chart/v3/util/testdata/dependent-chart-alias/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/LICENSE b/internal/chart/v3/util/testdata/dependent-chart-alias/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/README.md b/internal/chart/v3/util/testdata/dependent-chart-alias/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/_ignore_me b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/README.md b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz b/internal/chart/v3/util/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/docs/README.md b/internal/chart/v3/util/testdata/dependent-chart-alias/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/icon.svg b/internal/chart/v3/util/testdata/dependent-chart-alias/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/ignore/me.txt b/internal/chart/v3/util/testdata/dependent-chart-alias/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/templates/template.tpl b/internal/chart/v3/util/testdata/dependent-chart-alias/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/dependent-chart-alias/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-alias/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-alias/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/.helmignore b/internal/chart/v3/util/testdata/dependent-chart-helmignore/.helmignore
new file mode 100644
index 000000000..8a71bc82e
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/.helmignore
@@ -0,0 +1,2 @@
+ignore/
+.*
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/Chart.yaml
new file mode 100644
index 000000000..8b4ad8cdd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/.ignore_me b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/.ignore_me
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/_ignore_me b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/README.md b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/templates/template.tpl b/internal/chart/v3/util/testdata/dependent-chart-helmignore/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/dependent-chart-helmignore/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-helmignore/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-helmignore/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/.helmignore b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
new file mode 100644
index 000000000..8b4ad8cdd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/LICENSE b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/README.md b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/icon.svg b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-no-requirements-yaml/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
new file mode 100644
index 000000000..06283093e
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
new file mode 100644
index 000000000..6543799d0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..3190136b050e62c628b3c817fd963ac9dc4a9e25
GIT binary patch
literal 967
zcmV;&133I2iwFR+9h6)E1MQb<XcR{rz^_PKS%@t@2-T(;FA7S?-tO(=@EQ|Bv<6Hh
zL{Z`^&RynmOZRb|olT7*El5F)TEwV`nuzp6)emYPp9BRpS`dt{#^i%ap<*CLvDLF8
zG0yGfjwGT{n~R9^<6vg*X8-@W`9H^iSThm!c`}F~2mwU_?x?EnDEQ^%*bfjTSylv5
z73o|MB~es7K*{8$QaCn&m~I7PglzQUb#z%I@)9}y|06xVBN+YmFO5P>_y%a`Bd>#=
zhbqf2w!b6}wZ9@rvIhtwzm?~C&+QLm+G2!l%`$_aUgS(@pdjdX3a%E}VXVc7`)dg(
zL%IRN2}c1D3xoMi2w@WuWOMZ?5i&3FelBVyq<FnlKn$6+$P8=94srk#fTRMbhakb0
zZPV`nz$j+f8nJLg5JU-y*+HKVt%gQSM|{{ad?_DwRVQCbEA$Gy$O~TXZJ*=2%HXrj
zOc{99{4YzYDk>_Ce_8fREdP%NDf<&d!wu3{&VUQNs{N%vK$Ha~k^gB2!0bO7r0ic0
zbqCp*X#j?=|H@GNONsuE)&I<s2j-v%baVoe9^h8?!qT#msznP*D&`jPTpm~y)oegN
z5LA~`lo!wy1|$U4f`~>dbh>2MX(Z}|+=@*sLod*wS?A8Ugp#mMPuMO0NnZmos9_rr
z3xpDL+otj~lRh?B4hHFTl+d5-8NBXmUXB~EyF^bx7m*+!*g>obczvGF|8xkWsHN8;
z%#+wiWP{=2pC*98@$VNzzsll&G#D7&11-;D>HT0x|DV2?6}a~*p46@R|2l??e_8dX
z@Bb>D3t~VC_*wjq2Dy!6J-_5ME%%J+xmsbK5<dNKReMqEhB1|U&TMST2`xPM<Zf1Z
z*|hcBdcecDQ#JXgLl?6i%v*OeGO-ok+1#>a#qO>ZV?Wt`d|TDdrB^B&LqFr@lYdUA
zs&4-JAg3&uc4dA0gv*bXU9QePa9^8wR{HovA)j@)JOAIkak0Jl)aKqA_3XLM#?H=V
z-{tlG=xy^os=1Z><jAl7hc!3WOl^65uebQOwmYTW@ku#5I`-r&k-y-M{dF|nGj-g(
z><53;&+C4=zp|%rwv!)UyY=%k_t%Y|wNRQl`C6N_Z&S;S+~wb1=)2Uh_4I81`y>DO
zoLPSt=btB&x{CUK`0DA&){efW_O36RxnsYZNT0r;JbTLR{H4M3C$8(Cee==aQ~Gbq
p$`5v3?NB{4-j0<R3<iV2U@#aA27|$1Fc^$C;~7HLiNF9T006nP>XQHf

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/frobnitz-1.2.3.tgz b/internal/chart/v3/util/testdata/frobnitz-1.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..8731dce02cc9603e7813a07670a7d057129a8b20
GIT binary patch
literal 3485
zcmV;O4Px>iiwFRyACz1G1MOT3TolzBhwPeez8~c^`*9rfidUF@%`Sp~AdnJ>5AaDU
z!|q{sVs>YnnFUtlqF_quB{faUuIRnpn-?EtYMQ2^*3EomX<1&iyrx3=%6GcL-ZQhy
z0xP<vuxic!htBMr@0>Gp&V1kbUS~2{Cc{ke6XkwQ2Zcfrs?h-PsMU%`g^F+<T>wfo
zL8wDRm4reI6iT&PP51##6W)^>R*olGbSoqaAqQ_yhsZKB@6e9xIo!ub1erDSpOg?A
zpPUlk6n&ua&=SNQ=3k`|=U<~xYK0d?p(NDmP(Pq(iktDo?|lAU(+(^&se?v_)<YJT
zJ?NW~;4`@SKh{XHJZ>XRbffp-h5waGrOJc<H7bop;(uR&v``}<%TbIu9AqnHX3_-1
zLCs4c(?d?jQWjn;PBl^-K!2pW9G7L+)Wwvz3Rh#YENIJNSUndm10bZfA>jvSVHsT(
z<i#I)Mo;QxCXzDq=pSmuS;5(Vsu6-gkT!u-NSe@f03f2I!+{Z9jE1?S$wEV1$C&EW
zNnuQoF+&hfbFgj|Gn2vSZS^W~jFr_vSC2-Xw{YQdc^v|ICd0@xNLFTKgq8)0`UEmc
zCp>dQRkcK}mcT7$gN!tr8J-k|PV5Qh@+^r)C)|0KP1083K1oDmgsfQLI(HW7p#_@t
z(5$0iy|E!_3mPx+32O&mfh%zZCSGKrh2bckVQmfHpiba(u1<p{k`*SvqeTK&<EmfP
z;)8yZCEN?#^4~d&O=1Szt^QA_wOW-@A?SZvrApHOeF69U3nC5YvJFkphd2FSgD!fk
z|L9Lz|9ydo{<$W)M(#&q!ZOl7N)~}$1b_<A(uK|<G1n59laqtzsBwlh$W`be<){pE
zlHHL+Tt%F%<<gWnt07`#SXh``EXC@sM9w<`Ih39^Mq(<B7DGA!WiaxtACx{4;~~dm
zQK(jgpsqy4JC`OPywDMH@sd!+LLD!XXHqPp2f3&P4A{i~UCk4U+Saw`Jd>j7NX$%T
z+c0_kHaLhH*NcrPHDW7-msVJ)7aEBW1|;esS}WcBpOBoA8k3ZS^SOLu_u<w454~0Y
zSEwca_XXTay%|tu^o%r(RCArx1kF4y>ft(?Lgz?Jv;jTES!i_RQ60%i@Y{f!|Iw^B
zjrMo<`kzXx(h?e#p#Q0~YDxd|1>EzG3$`_7Ff;5O2I1b|RsJg#p7Nj2XeIgY3pi(7
zE=lv>Dct-&JU%9Fa6E3(H+~=9_+O<~dd7dWN`=J#zCa*&uEs|ztD_6L{Chz33gI$Y
zU?3R5kp|ch5e^b~U?e$UW`I>7a?;1aY)CT}L6elpo?}>`cV2)j(lj%fV8B6$R7v!Y
zv4qe<SshQKq+a?69`PTV(PcGyAKv(1t?=Z3jfzl7{O=1qa$yENWq=$Xj$}wSNmF`B
zPTU{d{Le!)(j*U?zzF>H_Mb+rR!a7tFW{bkG3v-QNdka3`L85yk^dScA<2JVAP~d=
z=hO?1YNYTnVnCh~PBJNjl@%k{NTYK~aZCuagJg7$$z&YViJ1XNe7j180wkFM30!5E
zB%dE{G$8+L&T!t+IHJI-|A+AO|06QV|L+qFf;7#5ygXcF-ATwu%OtHd53n4DrS({T
zzQn-4Y1H@sH;og>EB|Y5UH=Km|Kk(XCiT_H00x<YyT%m;bSVH2`bH%*2|V+^oOXZX
z+JJX!{}G{~Dz#Fu|FjCNR<i$m0nhoL;0y>&Fg0Qn(5wBY@XY_xB6>;w`vRi;=ZuV%
z)`JXWyNR=pPHm!Vo@Pk290Y?5t1|;cpfKxbs~(YvW}YiP@SvYU!o9+i|6Oj{5YaJ<
z^M;9y(1#cPSB5Iw_Ft%0Bjo>v5`<FXe_tSAW(&V%0rOt)Yj$?QIAf=Q-OAfO7W35G
z1InV}ChmxTd+hs%HdpoKM#N6+I^ea@X(e%4-ILFqVrSaFKJ;PwEbXz_<^N6%UTNwn
z9}(0wzJ30C1NyYr6l1b&Ab<9Lw)^vcE_{a=@xz(%=LU5eY~p$yzd3s0(M^XO1=-c5
zy66>ev>0_=Rt#EnkN5v>S=o0%kDol#*S}rQF|YR=(R#*X?cx$zl|?P-#10D^-e$@|
z{0|vZyInqG<Huqbx`lQ8eonxI_On{r2hMHRaZAUpH};%fVqd!J;+nJaSH{@;6fWCX
zf)&qLvNH<oxjB6CDb4!+Yu9B?eRi*E$CB6+Nya6Lg%%lJ@>Z9F^zo{+Cx4n_p1kmM
z5Fp7fX1^HwZQSEwFAPkcx+ihc?8LFF=0#7Iy*KBN12dCilNUBy(m~%jdUNXzbXc3J
z)_$|--Cq{J+;0a+C_X!NdD$0#GJYF=T=)90`Im+bv0k13(e}yZGe2r~Z2Z-zEoDhZ
z4{x70<>`Hn_k){{sg^envv-W!(R%-AeDaew)9i^$X9qo5w#X6x%Au`6C(eBDf29*E
zJK&cz!7;zr>8(Acjjob6@0{NA`SN+m(FdD-v};T7@Co)|yw!A|taHRD|Gy{f^}k%0
zKF*Y)>-je_dce?bJ&3VOFZJ9sF7UI|MWa@~0xRc-6NfkV`+P))13$LOJK6tqR{6B9
z*?y~|7v-Jro4Po2|EI})UXF=+_QM-%B4f+*LdsuyZDhsOPJD-!%?eYBHU9F?4_q&8
zqnx+)a^LL{s}0yQNl!Zn|D?Y<K%~DcxO(Qc6P1f;+f#|}J~8C7<9gAUf99+@o?t)a
zcvrXamjz!>x;Z`dle3Q48M}Te81{2P*zTNi$KGCB=6<=Y`K4KkclaIaI#+zKU`6k5
z`V8H@x~M4a`~rOJFIP&A{sVB#)m8h85(nw&y&HO7sr<U&g%{75BG-Y7)z8@Nr=M<H
zx)uA&k#!xf<y#CD=|BAE<fr{^JT?B8<qme-%}dkf<PZL4-vzG1G4$X>-Ok*KjO&*3
zXO}nA7*uZ@3@Y7Xsa(H$)d9Q1w*30Rl}WotuibR~@JV*a+H+s*yxPB@x7|Mc+Lsps
zORK7@_V!^G8xLLkabor4Po7OIt^Dlg>h6x6CDZfX+`7!J+`z86ezfr7?#+gP$hT6e
z$V11Y@+kZJHceVqa!K<~H%<HI-I9o(t2VArOSDgC&a6y+b!%QIXYU2m_m$_}czxaf
z4vv|!^zz&_hfiJUH+}l9ee#euHYT?HX+>$p;v2iJUEQthP_!*w(WO=Mn!|+vTdRN%
zf&=`5?w9{>qyIPRZa}a4pH^L8|5FLqB>C?PG`RoI75uHY`!5b!XvT(Az6_G1bRb3~
z0ZEkEnhPw9zIG>|7$mN<bxw%m3b}<iXB3Z;viLCJHvHeHyTR_-{&(;H3RM%5{qGap
zX8s%15$sL=Yi`N^LGv%!|2~0e|JP*u<&YdOKxF=rJTmaD9A!3$ZU7x)GLdFINEhTc
z(6JDeyB3LbTu2FoAiXwzm=5%muv3a*ZMETKQb_u-0ge(oLJJ09p>rQL$f0;6AZ0qn
zDikr9z(TTU8RF4`Qq#CAIe}+Pbh<~JTDZTOpjAyEn_-2^vUKMyhM?X=RVE#{Lz^<$
z7{&^8b#}e*bqB)v=+4Kjvn__JNl2>Ulk`X4^>G{iZ`5p{yOsa$@BbkEPxAlz2Dh32
zM$HEDCjS+l`9CUDEPemSCkPZb`3dq^Q2lGNd`z|w=Zhfa@BGH$RsMUdq4&~<SN%`z
zY5%K{Opy5B7x1wEvnaDZ91KPFJW{|&J;{@`*?oC=_;5%=l7nKhP=0<0y5e*cIe#Nc
zn#_Q-m`DzQ5wa9d8tT_ffowLVa}on*_$axib&s}O#qQg4Q@E~xN#G?b!wbZm1?q%O
zkxq$blOM{^l+Gs9aHlgRL!^IV0C!PLu!tmLKQ2|$;~PXdB*nYZ)hUzs6qu70!qvie
zj>Ow@s>R_T4U=b3W;sVgXu*Q9F!Tao;~ovkd1w3IL~^_;MD*y~M=Z!2|Eog@5B^tb
zw9@+T69mj`(MddU^!DpR4jQh|4H~RXvW00f)FT!86b&^tB}_YH<Vfw{QS^)GWw)gc
zV<LrbbNQY5YIWImMW^P+KDW(?h&f++Bu#b{#|t;*tr!?gm=g9E7N5tT<Chf`r?%g>
z{w;0n+-4Q8YN9Gj4;|bv``oORueJ1xUJO@1)@4*sRbExe>F1XR59#r*4SPnPFM6rv
z;;5`6N2V*rt?N;-{Da;nmVEN&q#w)hj~xYJ@BDYyMWP#fApFD1Q75{}PQ>eiJFAjk
z?Sel8M)dx8Q(8vbz7+)u>yW>cJ#lP&^^`?79liHnFL=3X%B5Xhbl+EYK@aNqq3Ej#
zeytwxz&|AL&i~5$HUWRN|4)TPg0%nNC%BvWzu#bxH~Ej|-b4PY)GF!wPd-6|@gH&8
z>xX}0oF8Nq-wV;fmT1j@tQjH`q2bUECYg?p0`7+Y@7EdRjsI0jPy0`$(MtJ0K7p`L
z{}$)DIPJJBu+Ar6$HWXy3PEKik{4nFf)8FGh=V#BjhtvRIo}gtAt{yvJR>9vT1bu)
zQw7ma8)IeN4tP$eEK~xK02Av;;zEK12@)hokRU;V1PKx(NRS{wf&>W?BuJ1Tp;7RE
LkUR>*0C)fZJ*e(i

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/frobnitz/.helmignore b/internal/chart/v3/util/testdata/frobnitz/.helmignore
new file mode 100644
index 000000000..9973a57b8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/.helmignore
@@ -0,0 +1 @@
+ignore/
diff --git a/internal/chart/v3/util/testdata/frobnitz/Chart.lock b/internal/chart/v3/util/testdata/frobnitz/Chart.lock
new file mode 100644
index 000000000..6fcc2ed9f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/Chart.lock
@@ -0,0 +1,8 @@
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
+digest: invalid
diff --git a/internal/chart/v3/util/testdata/frobnitz/Chart.yaml b/internal/chart/v3/util/testdata/frobnitz/Chart.yaml
new file mode 100644
index 000000000..1b63fc3e2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v3
+name: frobnitz
+description: This is a frobnitz.
+version: "1.2.3"
+keywords:
+  - frobnitz
+  - sprocket
+  - dodad
+maintainers:
+  - name: The Helm Team
+    email: helm@example.com
+  - name: Someone Else
+    email: nobody@example.com
+sources:
+  - https://example.com/foo/bar
+home: http://example.com
+icon: https://example.com/64x64.png
+annotations:
+  extrakey: extravalue
+  anotherkey: anothervalue
+dependencies:
+  - name: alpine
+    version: "0.1.0"
+    repository: https://example.com/charts
+  - name: mariner
+    version: "4.3.2"
+    repository: https://example.com/charts
diff --git a/internal/chart/v3/util/testdata/frobnitz/INSTALL.txt b/internal/chart/v3/util/testdata/frobnitz/INSTALL.txt
new file mode 100644
index 000000000..2010438c2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/INSTALL.txt
@@ -0,0 +1 @@
+This is an install document. The client may display this.
diff --git a/internal/chart/v3/util/testdata/frobnitz/LICENSE b/internal/chart/v3/util/testdata/frobnitz/LICENSE
new file mode 100644
index 000000000..6121943b1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/LICENSE
@@ -0,0 +1 @@
+LICENSE placeholder.
diff --git a/internal/chart/v3/util/testdata/frobnitz/README.md b/internal/chart/v3/util/testdata/frobnitz/README.md
new file mode 100644
index 000000000..8cf4cc3d7
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/README.md
@@ -0,0 +1,11 @@
+# Frobnitz
+
+This is an example chart.
+
+## Usage
+
+This is an example. It has no usage.
+
+## Development
+
+For developer info, see the top-level repository.
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/_ignore_me b/internal/chart/v3/util/testdata/frobnitz/charts/_ignore_me
new file mode 100644
index 000000000..2cecca682
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/_ignore_me
@@ -0,0 +1 @@
+This should be ignored by the loader, but may be included in a chart.
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/Chart.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/Chart.yaml
new file mode 100644
index 000000000..2a2c9c883
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: alpine
+description: Deploy a basic Alpine Linux pod
+version: 0.1.0
+home: https://helm.sh/helm
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/README.md b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/README.md
new file mode 100644
index 000000000..b30b949dd
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/README.md
@@ -0,0 +1,9 @@
+This example was generated using the command `helm create alpine`.
+
+The `templates/` directory contains a very simple pod resource with a
+couple of parameters.
+
+The `values.toml` file contains the default values for the
+`alpine-pod.yaml` template.
+
+You can install this example using `helm install ./alpine`.
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
new file mode 100644
index 000000000..aea109c75
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: mast1
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
new file mode 100644
index 000000000..42c39c262
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml
@@ -0,0 +1,4 @@
+# Default values for mast1.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name = "value"
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53
GIT binary patch
literal 252
zcmV<Y00aLYiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y
zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~<N~<hSB&N8`Snq>z
z37$S{+}wvSU9}|VtF|fRpv9Ve>8dWo|9?5B+RE}Y9CFh-x#(Bq8Vck^V=NUiPLCKa
z8z5CF#JgK!4>;$4Fm+FUst4d+{(+nP|0&J+e}(;l^U4@w-{=?s0RR8vgVbLD3;+OM
Cs&R<`

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
new file mode 100644
index 000000000..5bbae10af
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{.Release.Name}}-{{.Chart.Name}}
+  labels:
+    app.kubernetes.io/managed-by: {{.Release.Service}}
+    chartName: {{.Chart.Name}}
+    chartVersion: {{.Chart.Version | quote}}
+spec:
+  restartPolicy: {{default "Never" .restart_policy}}
+  containers:
+  - name: waiter
+    image: "alpine:3.3"
+    command: ["/bin/sleep","9000"]
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/alpine/values.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/values.yaml
new file mode 100644
index 000000000..6c2aab7ba
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/alpine/values.yaml
@@ -0,0 +1,2 @@
+# The pod name
+name: "my-alpine"
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/mariner/Chart.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/Chart.yaml
new file mode 100644
index 000000000..4d3eea730
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v3
+name: mariner
+description: A Helm chart for Kubernetes
+version: 4.3.2
+home: ""
+dependencies:
+  - name: albatross
+    repository: https://example.com/mariner/charts
+    version: "0.1.0"
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
new file mode 100644
index 000000000..da605991b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: albatross
+description: A Helm chart for Kubernetes
+version: 0.1.0
+home: ""
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
new file mode 100644
index 000000000..3121cd7ce
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml
@@ -0,0 +1,4 @@
+albatross: "true"
+
+global:
+  author: Coleridge
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
new file mode 100644
index 000000000..29c11843a
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/templates/placeholder.tpl
@@ -0,0 +1 @@
+# This is a placeholder.
diff --git a/internal/chart/v3/util/testdata/frobnitz/charts/mariner/values.yaml b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/values.yaml
new file mode 100644
index 000000000..b0ccb0086
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/charts/mariner/values.yaml
@@ -0,0 +1,7 @@
+# Default values for <CHARTNAME>.
+# This is a YAML-formatted file. https://github.com/toml-lang/toml
+# Declare name/value pairs to be passed into your templates.
+# name: "value"
+
+<CHARTNAME>:
+  test: true
diff --git a/internal/chart/v3/util/testdata/frobnitz/docs/README.md b/internal/chart/v3/util/testdata/frobnitz/docs/README.md
new file mode 100644
index 000000000..d40747caf
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/docs/README.md
@@ -0,0 +1 @@
+This is a placeholder for documentation.
diff --git a/internal/chart/v3/util/testdata/frobnitz/icon.svg b/internal/chart/v3/util/testdata/frobnitz/icon.svg
new file mode 100644
index 000000000..892130606
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    version="1.0" width="256" height="256" id="test">
+  <desc>Example icon</desc>
+  <rect id="first" x="2" y="2" width="40" height="60" fill="navy"/>
+  <rect id="second" x="15" y="4" width="40" height="60" fill="red"/>
+</svg>
diff --git a/internal/chart/v3/util/testdata/frobnitz/ignore/me.txt b/internal/chart/v3/util/testdata/frobnitz/ignore/me.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/frobnitz/templates/template.tpl b/internal/chart/v3/util/testdata/frobnitz/templates/template.tpl
new file mode 100644
index 000000000..c651ee6a0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/templates/template.tpl
@@ -0,0 +1 @@
+Hello {{.Name | default "world"}}
diff --git a/internal/chart/v3/util/testdata/frobnitz/values.yaml b/internal/chart/v3/util/testdata/frobnitz/values.yaml
new file mode 100644
index 000000000..61f501258
--- /dev/null
+++ b/internal/chart/v3/util/testdata/frobnitz/values.yaml
@@ -0,0 +1,6 @@
+# A values file contains configuration.
+
+name: "Some Name"
+
+section:
+  name: "Name in a section"
diff --git a/internal/chart/v3/util/testdata/frobnitz_backslash-1.2.3.tgz b/internal/chart/v3/util/testdata/frobnitz_backslash-1.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6929659514d35d2a2fe1098c1c097194378cc3b5
GIT binary patch
literal 3496
zcmV;Z4Oj9XiwFRyACz1G1MOT3ToiR4hwMx@-;eUlKKvc@#1m$BXJ3MVAdnJ>5AaC}
z!|bp-F}t(P%mOQNsF;#^q^4=viQaXWhmSHfO;b_pG9Ou5mZz3yDwMB$rz`CJXLdnY
zR~K|!wdVT~XLkO-`Tzejzxn<Czt>DQ%Ve1;enLhTPULVj&KczazJ@}f&}lS4+-kMr
zR)MLVTNi**rB<tSI;C2n1q!7`rPc)ijn8M|0alL3SvVD(B}tCFGaV$$&b~`OuIs4V
zJ|f7zo&U*+aS17@3BDV{EB`T#$bXGOsTBy}My1gN0EO?SaA*9^`R`&ju+TU`8W~zo
zvZ(AqPfCK{;6eW5j5y1qHrzz}Xbdm%uT;Vx4dq{l>9msk`vbUz8cDJo#h4>Nu2N>k
zO=JYP{h^TQNseGC3ojC;87U6He|Q}wD$A|y1yQ0HszPKrq%DtO^<0DufUr73@dsyN
z86t<|#UFY`kLzV7oHFz95BB0b!8wyOBMAnPv<ak<xCtHyfP|EE1TeybF=Re&vd|<-
zFs6Fvq%tOwF_R#H=E(Y|n3*g_Z)<Q8$5>f{bd6}_c?%aIm)9eZXETgE3uk3UM(A0f
zXh<NV2;rJNovKymYt^X5Y>?q*GsEM;trJHg^LZABcPGNRmy6R@VV*c7GLo#=;M#XK
z=}8M|){|y}A{*QroVLLGC0^mJo3B8Xr~(lWvZRIKD4t<$o+n5Ma?aK3(1f!B1KfI4
zqbd|@QjZV%nU>Iac+me&F8a_7XsrFOR%x}EQX$xXT1+F^|Nejn{tGG%<#G)^8^as_
zHSnO@`ma!_r1jq)i0q$lqHDE%6e27h{i9`(ko^EQzy%BLMIo+*FE1|-%~PQaYmj5`
zBIU3RagyDYL|i+Zz2(!CImZ*RGCVw7F18}|*B|GMKpv&%jZp}u(IRl=rwm5k^@Gw!
zAw0?PNHjbvQZQ1Y6PybY5FX=5xp+uuV@ZM+$+IaI(t~{10|IQ~|E})Uid(&F;eIwn
z(@}^S&$S`)hJA1(>|8H)qST1JsJ-;Ul6s+&Na2P=KSV2}2l-D-NllAQPDc5B-Zx`-
z)&Dx|Hv1n_O7iay)S2>TK$+n+(lj*439E@T^QdTj6Ep?)p>1dbdWy5qaLdDUq#(g>
z10Lib^52)%U*qjROp9sN8ceYNME_s1|9*XV;6Ez()|A1_uy?r~O@UYbD;4hgU#(M1
z`rjXL@>wov^WP~v$p7$!*!aN-s7dduF}%q?rc%1+f8a_W$-h4k44$iv%*yK7g083@
z5Mx28OcoprMsT=+^hAV$L>?G%4wxBW6^NYl@nkMZGZw*;l*yiBSfF<vAX#W>W;3CH
zBS~mV!av3mMhk8A;){}b=_lMV|3foGj*rIhCjTmhyZq}gtwNH2f8dczF6b!($?*|T
zhveckrI+-?{lSC$^CZ0II8XY_32eImr-Q#F|IZ)rz<)98$oa4Uz#IRS>f7|cMukcG
z-yaADvB1f2Ay5qsK1NK#bHYwGWw5eh-WpnTPA!fI$#swd_Ys+lBMGq{0IF|StIz;7
zGr)nX4UzQo!;QP@|Jps2x7?2^@T&jSZt;IisZ&Vtf4^W5Nz)7{C_qKgod}(@Y}`uo
z0Lf!mT8|VKN&@_w#+~B-z6=6+m4D6c>%T^d|M&&BO8M$l0E28HT;oaux(t8^Jy8k2
z3hrG0<%|IM!Ut@u|EJdJFqIPef0#lktpAe#_v_=%{LgTvhB8d|odxvj|0&$+zc7VX
zEBSwZfvEpEBV(oYAPf3#BG2KjO$^P`3=WrrP>^MHR)7c;W`efrA&Kbbx$*-K`YI&c
zEAA}+u7GWr7@|da!-RVt!;AbwXRprx(`hvd!T(chbdvo013@!e1S|`h_d-CkvkS%<
zI}Pks(e|;}r`{e=9vwenN5b1<-#@gux-T~(ZbH`quZ>PGjnC<xa_$s6)Bg3L4>M<J
zkHszjcUtI5Q&0Jbkgf^s3*Q^ir@f{Gk!=Hov-h*zpa1iechn<(I5Ym-piYBLT(9Fd
zM=w0O>5!u+x2BAUS@A}TQP*W9phfqD!0(ooe;4xj$uoTe+w~mtde0H9XFS#}KCxAK
z^pZ~Ou<+q+CND()kTtd2<uf*ZEOMb+c*pPO1ZA|J)zUt2Zo7_KI(EIW=kyZ$(p?wV
zoRz;a#@=VjvW=xk$&4jCqrsk=!xx{@tna^eUG~&x_hLJi#GObsE>SGB$k5Wax*VjB
zSEoPu(;V}pg{MORj(;)x#kg<d9}j<FV9L}zNfT!$ja@Y_W|Hi^Ie#3OogA04u-TFh
z`pz+%TX&$t+f=s>m__gYvgGA{J3wN|*{RFRzxb2!+lb@D>%-<>8aBjwb^b@&CsoY+
zsNJ#gSEIL-Cm%h$ect4!_c`7VZ9b+(-aOpiF@8tu{iD%IPu@(oCoP>F@?`lUN5U(I
zwuYQI^L^lzPOR)eKyrp-ey`J8drTW$EpOgAv*+^_^HO3CHv4GTmeAoD_F=r$bfCO*
z<fy>EC+-crJSB6SDV6B?H#}y*&~81{W0zj)xoKSRXK9N@t$u~9njfJ)yt&`!BRU-T
zu}#6r{-<*)rghB?SRJ#d;C$b-#o7BmP3iM;Z1l4q-dGbAS5XjF@zQG}E3bCqJG5*z
zCACBoDF6Jx^|Cg~d228C-5$BxfIO4@v_l=3{8tBv3Y3M`%-nXOYB6nlD(T%PhFo@B
zFCO#Hyj8~&?WY{?5*vS6@b$!-)6+gV>xi4N>!+e&KNp4X&Z}_j?X_j@m)n|Onx%M$
z-?6T9<p&E^^!}#L(A}$xi__09K*#=arS#}O0LNTiwZAxNke=SVq34yVuZv!I@r)^I
z9k^KYjNN|v>9%ECk-r>S*YR4R#ZZ~~!+%bG+V93w<9}K1V8`9OG;L1d;BWR_;3^$M
z4^AL<=2vE2x12w_yqU&;y>T$4Y>TC8{pwW*><-)V>jzgR?;gE&)A7S6*&%DseX;Xu
z|DxV@`|xXDUI;F$uBqPJhgobqbnV9pHIqJhHmR)Yv!83aJ9d^%FL-n7GP`mEyXN}Q
zDHnHdHUvezm0FD-Iv!m>+26Nm(sNQun}51#+Bff(M*dvAaeaD{eL8byWy-5t3v`^l
z7n!-QqTt5s>;89e%;cq)=dL+?>Po-q(|7HYhrO{esqIfI$|@J%*mdpdZe@q!ZJCNL
zt(w<vE(F<H1$_`26cBR1^6%CD_rcqMUhO}v%FX`66e_9y%P;Ww{+}!P+u)tQc+x^M
zHfZu?;T%PPSdj!IQ)X*EurT^t@BfKO;(9O433*(hq7a3TmavtK#fJ%A<=+QygEiX!
zuYLauQ>wI*|L+%g<-ZRC!QS|<aj*Xo_%HeYeu3!!*H-)G;T$lK(CNc@=-^v9%4`tB
z00d();buL^6!bSBSQ56o7Kuz$C<!D%=B=z@CeTyDn^FvGyOmDHg`yuD;3#n*xL^R5
zbiREJ@+jU2a2df^g(fB&Sa23DLp)qiYCCt8B=C%h&UDLD3-hZ@TGb}98CEzf%XCgL
z42~umFqxn(p(&G%VXT0t_tpzv|3)}3-Fdn7UW?&s3zBN3BlD3DeR!3BA5;T1R{z(1
z{|CdQ_^+SfmH$4d2J*^(_xc|U!?e=(fBb@A@g+Y&9}A{`ZIzG77UpEXRKN2ZM-%kF
z+iKeQF}&J;DtG^1166<||NelR|DQvd^$}nw^yi@ghU;-2zg68=P=F36X%gp1u~?|E
zFbp1XhKHQLAtjAxk+fJy4uFwlDIPa8JTsMKb1A|}44mnsl-l0i`f@ebO|Oo^bp%WV
zFIgF0Am%J2Aq)y_O2|!qC___(O*o^joGFEb_9p^R7e$6eBoW7PnUZc_9?HWh-c_zn
znZ&C=oB|M`625LEPS0r;M}Txho<*7E98HoIBoqmU4*)Xm(a@ZY_5V#c$75k)Y^TY&
zAaC-o(z$*A3sY$o()#Zg1kG&GN!)St4(Njq8m=G)4b~>x!Zlf{kqUjPh8mk1t{pOR
zq;~Kq`bGG#+tP+HQNkCw0?vH3x_rB$Q}bh=+h#<@o-aF+E<1{%Q#KW>7#ONHCGMY6
zavpt-Usha_)_&jmx3qC{n^nH5iLNR;ba2D$bF)^y)-oVwF}eD&E~7%K3#v;`KfgS5
zNRNMQ*faWk@k=ciN9P<lGF>rlU60D;AM`%4<dZii{#cHF>?jI<=fArys=KiVB0j7d
zb)u{6L;?}o8B2M!3;GNg(fi{~=~-?2Ru(C&L;h0!#If-;lNa4|^xk{D=;i9kmv(g_
zzOU*6FVyiv@mCoEtsd}=e@M_2`B&bf3)uAd9|qk($^Y{Qn#TWoO9px4Kjgie{#UEi
z()XYI0+0D0k=YH?Ke5iwFp5uu7+_1XW|6F!gpPsd)DI%Lj*kMGCja*q4Du%bn9|+<
zQ)_fm{f}QDyr+L#@LXgzDhsanq1Q37gOkHxn+fNI+<*{+7YO1>f`)fa^qHJb2e9B2
z%K@GdiUln=$BCta@TZNjvULG?PB>XO2}A)zJWo;=5+q2FAVGoz2@)hokRU;V1PKx(
WNRS{wf&>XZ!T$k(as0gicmMzx5%RPE

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/genfrob.sh b/internal/chart/v3/util/testdata/genfrob.sh
new file mode 100755
index 000000000..35fdd59f2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/genfrob.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Pack the albatross chart into the mariner chart.
+echo "Packing albatross into mariner"
+tar -zcvf mariner/charts/albatross-0.1.0.tgz albatross
+
+echo "Packing mariner into frobnitz"
+tar -zcvf frobnitz/charts/mariner-4.3.2.tgz mariner
+tar -zcvf frobnitz_backslash/charts/mariner-4.3.2.tgz mariner
+
+# Pack the frobnitz chart.
+echo "Packing frobnitz"
+tar --exclude=ignore/* -zcvf frobnitz-1.2.3.tgz frobnitz
+tar --exclude=ignore/* -zcvf frobnitz_backslash-1.2.3.tgz frobnitz_backslash
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
new file mode 100644
index 000000000..b2f17fb39
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock
@@ -0,0 +1,9 @@
+dependencies:
+- name: dev
+  repository: file://envs/dev
+  version: v0.1.0
+- name: prod
+  repository: file://envs/prod
+  version: v0.1.0
+digest: sha256:9403fc24f6cf9d6055820126cf7633b4bd1fed3c77e4880c674059f536346182
+generated: "2020-02-03T10:38:51.180474+01:00"
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
new file mode 100644
index 000000000..0b3e9958b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml
@@ -0,0 +1,22 @@
+apiVersion: v3
+name: parent-chart
+version: v0.1.0
+appVersion: v0.1.0
+dependencies:
+  - name: dev
+    repository: "file://envs/dev"
+    version: ">= 0.0.1"
+    condition: dev.enabled,global.dev.enabled
+    tags:
+      - dev
+    import-values:
+      - data
+
+  - name: prod
+    repository: "file://envs/prod"
+    version: ">= 0.0.1"
+    condition: prod.enabled,global.prod.enabled
+    tags:
+      - prod
+    import-values:
+      - data
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..d28e1621c86a56affb0617a912930d982ee5d09c
GIT binary patch
literal 333
zcmV-T0kZxdiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PK}PYr`-Mg>%lY5bWGeZqs!5+TB+M-CZQ2GbE0Y9n<aCkF;!|
zxeQjaG4OX0dOBDJzvr6c{qB_{EZ?YYvRObxEQ{h?5ph}(w?(GbrP^%E4Q`4ImD-j?
z1~|_;*YrM+WO(yg)64x6$e9-wZ#t_Xu5xm2Y;mcUm|JRDL(MUdlgVH2p17UC|B;%W
z{d@uNo&VQ3_5W(6%H;pw;0_)+!sP{kBVijB)$kvjeg70$#MG>>MvEZ~_~beXUgrQc
z1sW=Vu<v@Q*k4)z>O<!%YFIuMfY#V&c8#gXYfz(1r%_&i$${j^VYfdVf@#b<1=HC*
fOT{+Oku^M|97-e-iJ$Nh009602C+si01N;C&hD82

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a0c5aa84b6a8ef23c8f60fd5345bdb6f96faa880
GIT binary patch
literal 336
zcmV-W0k8faiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PK~)YJ)%!hCTZf13f1l6W36$d4NhGy$?F13%a|^u9EiYi-y+X
zrIcVxVZX~T{~R1){(qg==KlCX61K0@waFSFA{Kc*RYY7?#Dhw*eUYg{p-|-sX1h%7
z6TnrrS<w4HlHkqXTK?QWft-G3@!FaahFwa|%`I-TEvAM#E@8ZrbXbi3diluBO#UCJ
z?b)vu0N?q4kHymeITq3Xzrh_;VjH+#05}phVN;Lq!DRf$fkkvP2EdomW=aFTI4i-I
zDL_Mk#tI<pZ7((ZYYRYqu)e02<wF7Jw0UCJ>Y98ByIH2oEUQmBkeoRjtJ5jyR=-iu
i)>JGtn?PqS;UNZ5Boc}Ioc90#0RR69wG({+3;+PL5}8~8

literal 0
HcmV?d00001

diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
new file mode 100644
index 000000000..72427c097
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+name: dev
+version: v0.1.0
+appVersion: v0.1.0
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
new file mode 100644
index 000000000..38f03484d
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml
@@ -0,0 +1,9 @@
+# Dev values parent-chart
+nameOverride: parent-chart-dev
+exports:
+  data:
+    resources:
+      autoscaler:
+        minReplicas: 1
+        maxReplicas: 3
+        targetCPUUtilizationPercentage: 80
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
new file mode 100644
index 000000000..058ab3942
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+name: prod
+version: v0.1.0
+appVersion: v0.1.0
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
new file mode 100644
index 000000000..10cc756b2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml
@@ -0,0 +1,9 @@
+# Prod values parent-chart
+nameOverride: parent-chart-prod
+exports:
+  data:
+    resources:
+      autoscaler:
+        minReplicas: 2
+        maxReplicas: 5
+        targetCPUUtilizationPercentage: 90
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
new file mode 100644
index 000000000..976e5a8f1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml
@@ -0,0 +1,16 @@
+###################################################################################################
+# parent-chart horizontal pod autoscaler
+###################################################################################################
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Release.Name }}-autoscaler
+  namespace: {{ .Release.Namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1beta1
+    kind: Deployment
+    name: {{ .Release.Name }}
+  minReplicas: {{ required "A valid .Values.resources.autoscaler.minReplicas entry required!" .Values.resources.autoscaler.minReplicas }}
+  maxReplicas: {{ required "A valid .Values.resources.autoscaler.maxReplicas entry required!" .Values.resources.autoscaler.maxReplicas }}
+  targetCPUUtilizationPercentage: {{ required "A valid .Values.resources.autoscaler.targetCPUUtilizationPercentage!" .Values.resources.autoscaler.targetCPUUtilizationPercentage }}
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
new file mode 100644
index 000000000..b812f0a33
--- /dev/null
+++ b/internal/chart/v3/util/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml
@@ -0,0 +1,10 @@
+# Default values for parent-chart.
+nameOverride: parent-chart
+tags:
+  dev: false
+  prod: true
+resources:
+  autoscaler:
+    minReplicas: 0
+    maxReplicas: 0
+    targetCPUUtilizationPercentage: 99
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/joonix/Chart.yaml b/internal/chart/v3/util/testdata/joonix/Chart.yaml
new file mode 100644
index 000000000..1860a3df1
--- /dev/null
+++ b/internal/chart/v3/util/testdata/joonix/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: joonix
+version: 1.2.3
diff --git a/internal/chart/v3/util/testdata/joonix/charts/.gitkeep b/internal/chart/v3/util/testdata/joonix/charts/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/internal/chart/v3/util/testdata/subpop/Chart.yaml b/internal/chart/v3/util/testdata/subpop/Chart.yaml
new file mode 100644
index 000000000..53e9ec502
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/Chart.yaml
@@ -0,0 +1,41 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: parentchart
+version: 0.1.0
+dependencies:
+  - name: subchart1
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchart1.enabled
+    tags:
+      - front-end
+      - subchart1
+    import-values:
+      - child: SC1data
+        parent: imported-chart1
+      - child: SC1data
+        parent: overridden-chart1
+      - child: imported-chartA
+        parent: imported-chartA
+      - child: imported-chartA-B
+        parent: imported-chartA-B
+      - child: overridden-chartA-B
+        parent: overridden-chartA-B
+      - child: SCBexported1A
+        parent: .
+      - SCBexported2
+      - SC1exported1
+
+  - name: subchart2
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchart2.enabled
+    tags:
+      - back-end
+      - subchart2
+
+  - name: subchart2
+    alias: subchart2alias
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchart2alias.enabled
diff --git a/internal/chart/v3/util/testdata/subpop/README.md b/internal/chart/v3/util/testdata/subpop/README.md
new file mode 100644
index 000000000..e43fbfe9c
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/README.md
@@ -0,0 +1,18 @@
+## Subpop 
+
+This chart is for testing the processing of enabled/disabled charts  
+via conditions and tags.
+
+Currently there are three levels:
+
+````
+parent
+-1 tags: front-end, subchart1
+--A tags: front-end, subchartA
+--B tags: front-end, subchartB
+-2 tags: back-end, subchart2
+--B tags: back-end, subchartB
+--C tags: back-end, subchartC
+````
+
+Tags and conditions are currently in requirements.yaml files.
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/Chart.yaml
new file mode 100644
index 000000000..1539fb97d
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/Chart.yaml
@@ -0,0 +1,36 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subchart1
+version: 0.1.0
+dependencies:
+  - name: subcharta
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subcharta.enabled
+    tags:
+      - front-end
+      - subcharta
+    import-values:
+      - child: SCAdata
+        parent: imported-chartA
+      - child: SCAdata
+        parent: overridden-chartA
+      - child: SCAdata
+        parent: imported-chartA-B
+
+  - name: subchartb
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchartb.enabled
+    import-values:
+      - child: SCBdata
+        parent: imported-chartB
+      - child: SCBdata
+        parent: imported-chartA-B
+      - child: exports.SCBexported2
+        parent: exports.SCBexported2
+      - SCBexported1
+
+    tags:
+      - front-end
+      - subchartb
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
new file mode 100644
index 000000000..2755a821b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subcharta
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
new file mode 100644
index 000000000..27501e1e0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
new file mode 100644
index 000000000..f0381ae6a
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml
@@ -0,0 +1,17 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+# subchartA
+service:
+  name: apache
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+SCAdata:
+  SCAbool: false
+  SCAfloat: 3.1
+  SCAint: 55
+  SCAstring: "jabba"
+  SCAnested1:
+    SCAnested2: true
+
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
new file mode 100644
index 000000000..bf12fe8f3
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subchartb
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
new file mode 100644
index 000000000..27501e1e0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
new file mode 100644
index 000000000..774fdd75c
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml
@@ -0,0 +1,35 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+
+SCBdata:
+  SCBbool: true
+  SCBfloat: 7.77
+  SCBint: 33
+  SCBstring: "boba"
+
+exports:
+  SCBexported1:
+    SCBexported1A:
+      SCBexported1B: 1965
+
+  SCBexported2:
+    SCBexported2A: "blaster"
+
+global:
+  kolla:
+    nova:
+      api:
+        all:
+          port: 8774
+      metadata:
+        all:
+          port: 8775
+
+
+
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/crds/crdA.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
new file mode 100644
index 000000000..fca77fd4b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/crds/crdA.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: testCRDs
+spec:
+  group: testCRDGroups
+  names:
+    kind: TestCRD
+    listKind: TestCRDList
+    plural: TestCRDs
+    shortNames:
+      - tc
+    singular: authconfig
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/NOTES.txt b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
new file mode 100644
index 000000000..4bdf443f6
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/NOTES.txt
@@ -0,0 +1 @@
+Sample notes for {{ .Chart.Name }}
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/service.yaml
new file mode 100644
index 000000000..fee94dced
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/service.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+    kube-version/major: "{{ .Capabilities.KubeVersion.Major }}"
+    kube-version/minor: "{{ .Capabilities.KubeVersion.Minor }}"
+    kube-version/version: "v{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}.0"
+{{- if .Capabilities.APIVersions.Has "helm.k8s.io/test" }}
+    kube-api-version/test: v1
+{{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
new file mode 100644
index 000000000..91b954e5f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/role.yaml
@@ -0,0 +1,7 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Chart.Name }}-role
+rules:
+- resources: ["*"]
+  verbs: ["get","list","watch"]
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
new file mode 100644
index 000000000..5d193f1a6
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Chart.Name }}-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Chart.Name }}-role
+subjects:
+- kind: ServiceAccount
+  name: {{ .Chart.Name }}-sa
+  namespace: default
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
new file mode 100644
index 000000000..7126c7d89
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Chart.Name }}-sa
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart1/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart1/values.yaml
new file mode 100644
index 000000000..a974e316a
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart1/values.yaml
@@ -0,0 +1,55 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+# subchart1
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+
+
+SC1data:
+  SC1bool: true
+  SC1float: 3.14
+  SC1int: 100
+  SC1string: "dollywood"
+  SC1extra1: 11
+
+imported-chartA:
+  SC1extra2: 1.337
+
+overridden-chartA:
+  SCAbool: true
+  SCAfloat: 3.14
+  SCAint: 100
+  SCAstring: "jabbathehut"
+  SC1extra3: true
+
+imported-chartA-B:
+  SC1extra5: "tiller"
+
+overridden-chartA-B:
+  SCAbool: true
+  SCAfloat: 3.33
+  SCAint: 555
+  SCAstring: "wormwood"
+  SCAextra1: 23
+
+  SCBbool: true
+  SCBfloat: 0.25
+  SCBint: 98
+  SCBstring: "murkwood"
+  SCBextra1: 13
+
+  SC1extra6: 77
+
+SCBexported1A:
+  SC1extra7: true
+
+exports:
+  SC1exported1:
+    global:
+      SC1exported2:
+        all:
+          SC1exported3: "SC1expstr"
\ No newline at end of file
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/Chart.yaml
new file mode 100644
index 000000000..e77657040
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/Chart.yaml
@@ -0,0 +1,19 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subchart2
+version: 0.1.0
+dependencies:
+  - name: subchartb
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchartb.enabled
+    tags:
+      - back-end
+      - subchartb
+  - name: subchartc
+    repository: http://localhost:10191
+    version: 0.1.0
+    condition: subchartc.enabled
+    tags:
+      - back-end
+      - subchartc
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
new file mode 100644
index 000000000..bf12fe8f3
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subchartb
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
new file mode 100644
index 000000000..fb3dfc445
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: subchart2-{{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: subchart2-{{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
new file mode 100644
index 000000000..5e5b21065
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml
@@ -0,0 +1,21 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
new file mode 100644
index 000000000..e8c0ef5e5
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: subchartc
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
new file mode 100644
index 000000000..27501e1e0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
new file mode 100644
index 000000000..5e5b21065
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml
@@ -0,0 +1,21 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/templates/service.yaml
new file mode 100644
index 000000000..27501e1e0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/charts/subchart2/values.yaml b/internal/chart/v3/util/testdata/subpop/charts/subchart2/values.yaml
new file mode 100644
index 000000000..5e5b21065
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/charts/subchart2/values.yaml
@@ -0,0 +1,21 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
diff --git a/internal/chart/v3/util/testdata/subpop/noreqs/Chart.yaml b/internal/chart/v3/util/testdata/subpop/noreqs/Chart.yaml
new file mode 100644
index 000000000..09eb05a96
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/noreqs/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+name: parentchart
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/subpop/noreqs/templates/service.yaml b/internal/chart/v3/util/testdata/subpop/noreqs/templates/service.yaml
new file mode 100644
index 000000000..27501e1e0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/noreqs/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Chart.Name }}
+  labels:
+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    protocol: TCP
+    name: {{ .Values.service.name }}
+  selector:
+    app.kubernetes.io/name: {{ .Chart.Name }}
diff --git a/internal/chart/v3/util/testdata/subpop/noreqs/values.yaml b/internal/chart/v3/util/testdata/subpop/noreqs/values.yaml
new file mode 100644
index 000000000..4ed3b7ad3
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/noreqs/values.yaml
@@ -0,0 +1,26 @@
+# Default values for subchart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+replicaCount: 1
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+service:
+  name: nginx
+  type: ClusterIP
+  externalPort: 80
+  internalPort: 80
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+
+
+# switch-like
+tags:
+  front-end: true
+  back-end: false
diff --git a/internal/chart/v3/util/testdata/subpop/values.yaml b/internal/chart/v3/util/testdata/subpop/values.yaml
new file mode 100644
index 000000000..ba70ed406
--- /dev/null
+++ b/internal/chart/v3/util/testdata/subpop/values.yaml
@@ -0,0 +1,45 @@
+# parent/values.yaml
+
+imported-chart1:
+  SPextra1: "helm rocks"
+
+overridden-chart1:
+  SC1bool: false
+  SC1float: 3.141592
+  SC1int: 99
+  SC1string: "pollywog"
+  SPextra2: 42
+
+
+imported-chartA:
+  SPextra3: 1.337
+
+overridden-chartA:
+  SCAbool: true
+  SCAfloat: 41.3
+  SCAint: 808
+  SCAstring: "jabberwocky"
+  SPextra4: true
+
+imported-chartA-B:
+  SPextra5: "k8s"
+
+overridden-chartA-B:
+  SCAbool: true
+  SCAfloat: 41.3
+  SCAint: 808
+  SCAstring: "jabberwocky"
+  SCBbool: false
+  SCBfloat: 1.99
+  SCBint: 77
+  SCBstring: "jango"
+  SPextra6: 111
+
+tags:
+  front-end: true
+  back-end: false
+
+subchart2alias:
+  enabled: false
+
+ensurenull: null
diff --git a/internal/chart/v3/util/testdata/test-values-invalid.schema.json b/internal/chart/v3/util/testdata/test-values-invalid.schema.json
new file mode 100644
index 000000000..35a16a2c4
--- /dev/null
+++ b/internal/chart/v3/util/testdata/test-values-invalid.schema.json
@@ -0,0 +1 @@
+   1E1111111           
diff --git a/internal/chart/v3/util/testdata/test-values-negative.yaml b/internal/chart/v3/util/testdata/test-values-negative.yaml
new file mode 100644
index 000000000..5a1250bff
--- /dev/null
+++ b/internal/chart/v3/util/testdata/test-values-negative.yaml
@@ -0,0 +1,14 @@
+firstname: John
+lastname: Doe
+age: -5
+likesCoffee: true
+addresses:
+  - city: Springfield
+    street: Main
+    number: 12345
+  - city: New York
+    street: Broadway
+    number: 67890
+phoneNumbers:
+  - "(888) 888-8888"
+  - "(555) 555-5555"
diff --git a/internal/chart/v3/util/testdata/test-values.schema.json b/internal/chart/v3/util/testdata/test-values.schema.json
new file mode 100644
index 000000000..4df89bbe8
--- /dev/null
+++ b/internal/chart/v3/util/testdata/test-values.schema.json
@@ -0,0 +1,67 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "addresses": {
+      "description": "List of addresses",
+      "items": {
+        "properties": {
+          "city": {
+            "type": "string"
+          },
+          "number": {
+            "type": "number"
+          },
+          "street": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "type": "array"
+    },
+    "age": {
+      "description": "Age",
+      "minimum": 0,
+      "type": "integer"
+    },
+    "employmentInfo": {
+      "properties": {
+        "salary": {
+          "minimum": 0,
+          "type": "number"
+        },
+        "title": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "salary"
+      ],
+      "type": "object"
+    },
+    "firstname": {
+      "description": "First name",
+      "type": "string"
+    },
+    "lastname": {
+      "type": "string"
+    },
+    "likesCoffee": {
+      "type": "boolean"
+    },
+    "phoneNumbers": {
+      "items": {
+        "type": "string"
+      },
+      "type": "array"
+    }
+  },
+  "required": [
+    "firstname",
+    "lastname",
+    "addresses",
+    "employmentInfo"
+  ],
+  "title": "Values",
+  "type": "object"
+}
diff --git a/internal/chart/v3/util/testdata/test-values.yaml b/internal/chart/v3/util/testdata/test-values.yaml
new file mode 100644
index 000000000..042dea664
--- /dev/null
+++ b/internal/chart/v3/util/testdata/test-values.yaml
@@ -0,0 +1,17 @@
+firstname: John
+lastname: Doe
+age: 25
+likesCoffee: true
+employmentInfo:
+  title: Software Developer
+  salary: 100000
+addresses:
+  - city: Springfield
+    street: Main
+    number: 12345
+  - city: New York
+    street: Broadway
+    number: 67890
+phoneNumbers:
+  - "(888) 888-8888"
+  - "(555) 555-5555"
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/README.md b/internal/chart/v3/util/testdata/three-level-dependent-chart/README.md
new file mode 100644
index 000000000..536bb9792
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/README.md
@@ -0,0 +1,16 @@
+# Three Level Dependent Chart
+
+This chart is for testing the processing of multi-level dependencies.
+
+Consists of the following charts:
+
+- Library Chart
+- App Chart (Uses Library Chart as dependency, 2x: app1/app2)
+- Umbrella Chart (Has all the app charts as dependencies)
+
+The precedence is as follows: `library < app < umbrella`
+
+Catches two use-cases:
+
+- app overwriting library (app2)
+- umbrella overwriting app and library (app1)
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
new file mode 100644
index 000000000..1026f8901
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/Chart.yaml
@@ -0,0 +1,19 @@
+apiVersion: v3
+name: umbrella
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+
+dependencies:
+- name: app1
+  version: 0.1.0
+  condition: app1.enabled
+- name: app2
+  version: 0.1.0
+  condition: app2.enabled
+- name: app3
+  version: 0.1.0
+  condition: app3.enabled
+- name: app4
+  version: 0.1.0
+  condition: app4.enabled
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
new file mode 100644
index 000000000..5bdf21570
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v3
+name: app1
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
+  import-values:
+    - defaults
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
new file mode 100644
index 000000000..9bc306361
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: library
+description: A Helm chart for Kubernetes
+type: library
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
new file mode 100644
index 000000000..3fd398b53
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
new file mode 100644
index 000000000..0c08b6cd2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml
@@ -0,0 +1,5 @@
+exports:
+  defaults:
+    service:
+      type: ClusterIP
+      port: 9090
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
new file mode 100644
index 000000000..8ed8ddf1f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml
@@ -0,0 +1 @@
+{{- include "library.service" . }}
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
new file mode 100644
index 000000000..3728aa930
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml
@@ -0,0 +1,3 @@
+service:
+  type: ClusterIP
+  port: 1234
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
new file mode 100644
index 000000000..1313ce4e9
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v3
+name: app2
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
+  import-values:
+    - defaults
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
new file mode 100644
index 000000000..9bc306361
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: library
+description: A Helm chart for Kubernetes
+type: library
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
new file mode 100644
index 000000000..3fd398b53
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
new file mode 100644
index 000000000..0c08b6cd2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml
@@ -0,0 +1,5 @@
+exports:
+  defaults:
+    service:
+      type: ClusterIP
+      port: 9090
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
new file mode 100644
index 000000000..8ed8ddf1f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml
@@ -0,0 +1 @@
+{{- include "library.service" . }}
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
new file mode 100644
index 000000000..98bd6d24b
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml
@@ -0,0 +1,3 @@
+service:
+  type: ClusterIP
+  port: 8080
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
new file mode 100644
index 000000000..1a80533d0
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml
@@ -0,0 +1,11 @@
+apiVersion: v3
+name: app3
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
+  import-values:
+    - defaults
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
new file mode 100644
index 000000000..9bc306361
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: library
+description: A Helm chart for Kubernetes
+type: library
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
new file mode 100644
index 000000000..3fd398b53
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
new file mode 100644
index 000000000..0c08b6cd2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml
@@ -0,0 +1,5 @@
+exports:
+  defaults:
+    service:
+      type: ClusterIP
+      port: 9090
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
new file mode 100644
index 000000000..8ed8ddf1f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml
@@ -0,0 +1 @@
+{{- include "library.service" . }}
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
new file mode 100644
index 000000000..b738e2a57
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml
@@ -0,0 +1,2 @@
+service:
+  type: ClusterIP
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
new file mode 100644
index 000000000..886b4b1e4
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v3
+name: app4
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
new file mode 100644
index 000000000..9bc306361
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: library
+description: A Helm chart for Kubernetes
+type: library
+version: 0.1.0
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
new file mode 100644
index 000000000..3fd398b53
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
new file mode 100644
index 000000000..0c08b6cd2
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml
@@ -0,0 +1,5 @@
+exports:
+  defaults:
+    service:
+      type: ClusterIP
+      port: 9090
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
new file mode 100644
index 000000000..8ed8ddf1f
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml
@@ -0,0 +1 @@
+{{- include "library.service" . }}
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
new file mode 100644
index 000000000..3728aa930
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml
@@ -0,0 +1,3 @@
+service:
+  type: ClusterIP
+  port: 1234
diff --git a/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/values.yaml b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/values.yaml
new file mode 100644
index 000000000..de0bafa51
--- /dev/null
+++ b/internal/chart/v3/util/testdata/three-level-dependent-chart/umbrella/values.yaml
@@ -0,0 +1,14 @@
+app1:
+  enabled: true
+  service:
+    type: ClusterIP
+    port: 3456
+
+app2:
+  enabled: true
+
+app3:
+  enabled: true
+
+app4:
+  enabled: true
diff --git a/internal/chart/v3/util/validate_name.go b/internal/chart/v3/util/validate_name.go
new file mode 100644
index 000000000..6595e085d
--- /dev/null
+++ b/internal/chart/v3/util/validate_name.go
@@ -0,0 +1,111 @@
+/*
+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 util
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+)
+
+// validName is a regular expression for resource names.
+//
+// According to the Kubernetes help text, the regular expression it uses is:
+//
+//	[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*
+//
+// This follows the above regular expression (but requires a full string match, not partial).
+//
+// The Kubernetes documentation is here, though it is not entirely correct:
+// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+var validName = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
+
+var (
+	// errMissingName indicates that a release (name) was not provided.
+	errMissingName = errors.New("no name provided")
+
+	// errInvalidName indicates that an invalid release name was provided
+	errInvalidName = fmt.Errorf(
+		"invalid release name, must match regex %s and the length must not be longer than 53",
+		validName.String())
+
+	// errInvalidKubernetesName indicates that the name does not meet the Kubernetes
+	// restrictions on metadata names.
+	errInvalidKubernetesName = fmt.Errorf(
+		"invalid metadata name, must match regex %s and the length must not be longer than 253",
+		validName.String())
+)
+
+const (
+	// According to the Kubernetes docs (https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#rfc-1035-label-names)
+	// some resource names have a max length of 63 characters while others have a max
+	// length of 253 characters. As we cannot be sure the resources used in a chart, we
+	// therefore need to limit it to 63 chars and reserve 10 chars for additional part to name
+	// of the resource. The reason is that chart maintainers can use release name as part of
+	// the resource name (and some additional chars).
+	maxReleaseNameLen = 53
+	// maxMetadataNameLen is the maximum length Kubernetes allows for any name.
+	maxMetadataNameLen = 253
+)
+
+// ValidateReleaseName performs checks for an entry for a Helm release name
+//
+// For Helm to allow a name, it must be below a certain character count (53) and also match
+// a regular expression.
+//
+// According to the Kubernetes help text, the regular expression it uses is:
+//
+//	[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*
+//
+// This follows the above regular expression (but requires a full string match, not partial).
+//
+// The Kubernetes documentation is here, though it is not entirely correct:
+// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+func ValidateReleaseName(name string) error {
+	// This case is preserved for backwards compatibility
+	if name == "" {
+		return errMissingName
+
+	}
+	if len(name) > maxReleaseNameLen || !validName.MatchString(name) {
+		return errInvalidName
+	}
+	return nil
+}
+
+// ValidateMetadataName validates the name field of a Kubernetes metadata object.
+//
+// Empty strings, strings longer than 253 chars, or strings that don't match the regexp
+// will fail.
+//
+// According to the Kubernetes help text, the regular expression it uses is:
+//
+//	[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*
+//
+// This follows the above regular expression (but requires a full string match, not partial).
+//
+// The Kubernetes documentation is here, though it is not entirely correct:
+// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+//
+// Deprecated: remove in Helm 4.  Name validation now uses rules defined in
+// pkg/lint/rules.validateMetadataNameFunc()
+func ValidateMetadataName(name string) error {
+	if name == "" || len(name) > maxMetadataNameLen || !validName.MatchString(name) {
+		return errInvalidKubernetesName
+	}
+	return nil
+}
diff --git a/internal/chart/v3/util/validate_name_test.go b/internal/chart/v3/util/validate_name_test.go
new file mode 100644
index 000000000..cfc62a0f7
--- /dev/null
+++ b/internal/chart/v3/util/validate_name_test.go
@@ -0,0 +1,91 @@
+/*
+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 util
+
+import "testing"
+
+// TestValidateReleaseName is a regression test for ValidateName
+//
+// Kubernetes has strict naming conventions for resource names. This test represents
+// those conventions.
+//
+// See https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+//
+// NOTE: At the time of this writing, the docs above say that names cannot begin with
+// digits. However, `kubectl`'s regular expression explicit allows this, and
+// Kubernetes (at least as of 1.18) also accepts resources whose names begin with digits.
+func TestValidateReleaseName(t *testing.T) {
+	names := map[string]bool{
+		"":                          false,
+		"foo":                       true,
+		"foo.bar1234baz.seventyone": true,
+		"FOO":                       false,
+		"123baz":                    true,
+		"foo.BAR.baz":               false,
+		"one-two":                   true,
+		"-two":                      false,
+		"one_two":                   false,
+		"a..b":                      false,
+		"%^&#$%*@^*@&#^":            false,
+		"example:com":               false,
+		"example%%com":              false,
+		"a1111111111111111111111111111111111111111111111111111111111z": false,
+	}
+	for input, expectPass := range names {
+		if err := ValidateReleaseName(input); (err == nil) != expectPass {
+			st := "fail"
+			if expectPass {
+				st = "succeed"
+			}
+			t.Errorf("Expected %q to %s", input, st)
+		}
+	}
+}
+
+func TestValidateMetadataName(t *testing.T) {
+	names := map[string]bool{
+		"":                          false,
+		"foo":                       true,
+		"foo.bar1234baz.seventyone": true,
+		"FOO":                       false,
+		"123baz":                    true,
+		"foo.BAR.baz":               false,
+		"one-two":                   true,
+		"-two":                      false,
+		"one_two":                   false,
+		"a..b":                      false,
+		"%^&#$%*@^*@&#^":            false,
+		"example:com":               false,
+		"example%%com":              false,
+		"a1111111111111111111111111111111111111111111111111111111111z": true,
+		"a1111111111111111111111111111111111111111111111111111111111z" +
+			"a1111111111111111111111111111111111111111111111111111111111z" +
+			"a1111111111111111111111111111111111111111111111111111111111z" +
+			"a1111111111111111111111111111111111111111111111111111111111z" +
+			"a1111111111111111111111111111111111111111111111111111111111z" +
+			"a1111111111111111111111111111111111111111111111111111111111z": false,
+	}
+	for input, expectPass := range names {
+		if err := ValidateMetadataName(input); (err == nil) != expectPass {
+			st := "fail"
+			if expectPass {
+				st = "succeed"
+			}
+			t.Errorf("Expected %q to %s", input, st)
+		}
+	}
+}
diff --git a/internal/chart/v3/util/values.go b/internal/chart/v3/util/values.go
new file mode 100644
index 000000000..8e1a14b45
--- /dev/null
+++ b/internal/chart/v3/util/values.go
@@ -0,0 +1,220 @@
+/*
+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 util
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"strings"
+
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+// GlobalKey is the name of the Values key that is used for storing global vars.
+const GlobalKey = "global"
+
+// Values represents a collection of chart values.
+type Values map[string]interface{}
+
+// YAML encodes the Values into a YAML string.
+func (v Values) YAML() (string, error) {
+	b, err := yaml.Marshal(v)
+	return string(b), err
+}
+
+// Table gets a table (YAML subsection) from a Values object.
+//
+// The table is returned as a Values.
+//
+// Compound table names may be specified with dots:
+//
+//	foo.bar
+//
+// The above will be evaluated as "The table bar inside the table
+// foo".
+//
+// An ErrNoTable is returned if the table does not exist.
+func (v Values) Table(name string) (Values, error) {
+	table := v
+	var err error
+
+	for _, n := range parsePath(name) {
+		if table, err = tableLookup(table, n); err != nil {
+			break
+		}
+	}
+	return table, err
+}
+
+// AsMap is a utility function for converting Values to a map[string]interface{}.
+//
+// It protects against nil map panics.
+func (v Values) AsMap() map[string]interface{} {
+	if len(v) == 0 {
+		return map[string]interface{}{}
+	}
+	return v
+}
+
+// Encode writes serialized Values information to the given io.Writer.
+func (v Values) Encode(w io.Writer) error {
+	out, err := yaml.Marshal(v)
+	if err != nil {
+		return err
+	}
+	_, err = w.Write(out)
+	return err
+}
+
+func tableLookup(v Values, simple string) (Values, error) {
+	v2, ok := v[simple]
+	if !ok {
+		return v, ErrNoTable{simple}
+	}
+	if vv, ok := v2.(map[string]interface{}); ok {
+		return vv, nil
+	}
+
+	// This catches a case where a value is of type Values, but doesn't (for some
+	// reason) match the map[string]interface{}. This has been observed in the
+	// wild, and might be a result of a nil map of type Values.
+	if vv, ok := v2.(Values); ok {
+		return vv, nil
+	}
+
+	return Values{}, ErrNoTable{simple}
+}
+
+// ReadValues will parse YAML byte data into a Values.
+func ReadValues(data []byte) (vals Values, err error) {
+	err = yaml.Unmarshal(data, &vals)
+	if len(vals) == 0 {
+		vals = Values{}
+	}
+	return vals, err
+}
+
+// ReadValuesFile will parse a YAML file into a map of values.
+func ReadValuesFile(filename string) (Values, error) {
+	data, err := os.ReadFile(filename)
+	if err != nil {
+		return map[string]interface{}{}, err
+	}
+	return ReadValues(data)
+}
+
+// ReleaseOptions represents the additional release options needed
+// for the composition of the final values struct
+type ReleaseOptions struct {
+	Name      string
+	Namespace string
+	Revision  int
+	IsUpgrade bool
+	IsInstall bool
+}
+
+// ToRenderValues composes the struct from the data coming from the Releases, Charts and Values files
+//
+// This takes both ReleaseOptions and Capabilities to merge into the render values.
+func ToRenderValues(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities) (Values, error) {
+	return ToRenderValuesWithSchemaValidation(chrt, chrtVals, options, caps, false)
+}
+
+// ToRenderValuesWithSchemaValidation composes the struct from the data coming from the Releases, Charts and Values files
+//
+// This takes both ReleaseOptions and Capabilities to merge into the render values.
+func ToRenderValuesWithSchemaValidation(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities, skipSchemaValidation bool) (Values, error) {
+	if caps == nil {
+		caps = DefaultCapabilities
+	}
+	top := map[string]interface{}{
+		"Chart":        chrt.Metadata,
+		"Capabilities": caps,
+		"Release": map[string]interface{}{
+			"Name":      options.Name,
+			"Namespace": options.Namespace,
+			"IsUpgrade": options.IsUpgrade,
+			"IsInstall": options.IsInstall,
+			"Revision":  options.Revision,
+			"Service":   "Helm",
+		},
+	}
+
+	vals, err := CoalesceValues(chrt, chrtVals)
+	if err != nil {
+		return top, err
+	}
+
+	if !skipSchemaValidation {
+		if err := ValidateAgainstSchema(chrt, vals); err != nil {
+			return top, fmt.Errorf("values don't meet the specifications of the schema(s) in the following chart(s):\n%w", err)
+		}
+	}
+
+	top["Values"] = vals
+	return top, nil
+}
+
+// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
+func istable(v interface{}) bool {
+	_, ok := v.(map[string]interface{})
+	return ok
+}
+
+// PathValue takes a path that traverses a YAML structure and returns the value at the end of that path.
+// The path starts at the root of the YAML structure and is comprised of YAML keys separated by periods.
+// Given the following YAML data the value at path "chapter.one.title" is "Loomings".
+//
+//	chapter:
+//	  one:
+//	    title: "Loomings"
+func (v Values) PathValue(path string) (interface{}, error) {
+	if path == "" {
+		return nil, errors.New("YAML path cannot be empty")
+	}
+	return v.pathValue(parsePath(path))
+}
+
+func (v Values) pathValue(path []string) (interface{}, error) {
+	if len(path) == 1 {
+		// if exists must be root key not table
+		if _, ok := v[path[0]]; ok && !istable(v[path[0]]) {
+			return v[path[0]], nil
+		}
+		return nil, ErrNoValue{path[0]}
+	}
+
+	key, path := path[len(path)-1], path[:len(path)-1]
+	// get our table for table path
+	t, err := v.Table(joinPath(path...))
+	if err != nil {
+		return nil, ErrNoValue{key}
+	}
+	// check table for key and ensure value is not a table
+	if k, ok := t[key]; ok && !istable(k) {
+		return k, nil
+	}
+	return nil, ErrNoValue{key}
+}
+
+func parsePath(key string) []string { return strings.Split(key, ".") }
+
+func joinPath(path ...string) string { return strings.Join(path, ".") }
diff --git a/internal/chart/v3/util/values_test.go b/internal/chart/v3/util/values_test.go
new file mode 100644
index 000000000..34c664581
--- /dev/null
+++ b/internal/chart/v3/util/values_test.go
@@ -0,0 +1,293 @@
+/*
+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 util
+
+import (
+	"bytes"
+	"fmt"
+	"testing"
+	"text/template"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+)
+
+func TestReadValues(t *testing.T) {
+	doc := `# Test YAML parse
+poet: "Coleridge"
+title: "Rime of the Ancient Mariner"
+stanza:
+  - "at"
+  - "length"
+  - "did"
+  - cross
+  - an
+  - Albatross
+
+mariner:
+  with: "crossbow"
+  shot: "ALBATROSS"
+
+water:
+  water:
+    where: "everywhere"
+    nor: "any drop to drink"
+`
+
+	data, err := ReadValues([]byte(doc))
+	if err != nil {
+		t.Fatalf("Error parsing bytes: %s", err)
+	}
+	matchValues(t, data)
+
+	tests := []string{`poet: "Coleridge"`, "# Just a comment", ""}
+
+	for _, tt := range tests {
+		data, err = ReadValues([]byte(tt))
+		if err != nil {
+			t.Fatalf("Error parsing bytes (%s): %s", tt, err)
+		}
+		if data == nil {
+			t.Errorf(`YAML string "%s" gave a nil map`, tt)
+		}
+	}
+}
+
+func TestToRenderValues(t *testing.T) {
+
+	chartValues := map[string]interface{}{
+		"name": "al Rashid",
+		"where": map[string]interface{}{
+			"city":  "Basrah",
+			"title": "caliph",
+		},
+	}
+
+	overrideValues := map[string]interface{}{
+		"name": "Haroun",
+		"where": map[string]interface{}{
+			"city": "Baghdad",
+			"date": "809 CE",
+		},
+	}
+
+	c := &chart.Chart{
+		Metadata:  &chart.Metadata{Name: "test"},
+		Templates: []*chart.File{},
+		Values:    chartValues,
+		Files: []*chart.File{
+			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+		},
+	}
+	c.AddDependency(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "where"},
+	})
+
+	o := ReleaseOptions{
+		Name:      "Seven Voyages",
+		Namespace: "default",
+		Revision:  1,
+		IsInstall: true,
+	}
+
+	res, err := ToRenderValuesWithSchemaValidation(c, overrideValues, o, nil, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Ensure that the top-level values are all set.
+	if name := res["Chart"].(*chart.Metadata).Name; name != "test" {
+		t.Errorf("Expected chart name 'test', got %q", name)
+	}
+	relmap := res["Release"].(map[string]interface{})
+	if name := relmap["Name"]; name.(string) != "Seven Voyages" {
+		t.Errorf("Expected release name 'Seven Voyages', got %q", name)
+	}
+	if namespace := relmap["Namespace"]; namespace.(string) != "default" {
+		t.Errorf("Expected namespace 'default', got %q", namespace)
+	}
+	if revision := relmap["Revision"]; revision.(int) != 1 {
+		t.Errorf("Expected revision '1', got %d", revision)
+	}
+	if relmap["IsUpgrade"].(bool) {
+		t.Error("Expected upgrade to be false.")
+	}
+	if !relmap["IsInstall"].(bool) {
+		t.Errorf("Expected install to be true.")
+	}
+	if !res["Capabilities"].(*Capabilities).APIVersions.Has("v1") {
+		t.Error("Expected Capabilities to have v1 as an API")
+	}
+	if res["Capabilities"].(*Capabilities).KubeVersion.Major != "1" {
+		t.Error("Expected Capabilities to have a Kube version")
+	}
+
+	vals := res["Values"].(Values)
+	if vals["name"] != "Haroun" {
+		t.Errorf("Expected 'Haroun', got %q (%v)", vals["name"], vals)
+	}
+	where := vals["where"].(map[string]interface{})
+	expects := map[string]string{
+		"city":  "Baghdad",
+		"date":  "809 CE",
+		"title": "caliph",
+	}
+	for field, expect := range expects {
+		if got := where[field]; got != expect {
+			t.Errorf("Expected %q, got %q (%v)", expect, got, where)
+		}
+	}
+}
+
+func TestReadValuesFile(t *testing.T) {
+	data, err := ReadValuesFile("./testdata/coleridge.yaml")
+	if err != nil {
+		t.Fatalf("Error reading YAML file: %s", err)
+	}
+	matchValues(t, data)
+}
+
+func ExampleValues() {
+	doc := `
+title: "Moby Dick"
+chapter:
+  one:
+    title: "Loomings"
+  two:
+    title: "The Carpet-Bag"
+  three:
+    title: "The Spouter Inn"
+`
+	d, err := ReadValues([]byte(doc))
+	if err != nil {
+		panic(err)
+	}
+	ch1, err := d.Table("chapter.one")
+	if err != nil {
+		panic("could not find chapter one")
+	}
+	fmt.Print(ch1["title"])
+	// Output:
+	// Loomings
+}
+
+func TestTable(t *testing.T) {
+	doc := `
+title: "Moby Dick"
+chapter:
+  one:
+    title: "Loomings"
+  two:
+    title: "The Carpet-Bag"
+  three:
+    title: "The Spouter Inn"
+`
+	d, err := ReadValues([]byte(doc))
+	if err != nil {
+		t.Fatalf("Failed to parse the White Whale: %s", err)
+	}
+
+	if _, err := d.Table("title"); err == nil {
+		t.Fatalf("Title is not a table.")
+	}
+
+	if _, err := d.Table("chapter"); err != nil {
+		t.Fatalf("Failed to get the chapter table: %s\n%v", err, d)
+	}
+
+	if v, err := d.Table("chapter.one"); err != nil {
+		t.Errorf("Failed to get chapter.one: %s", err)
+	} else if v["title"] != "Loomings" {
+		t.Errorf("Unexpected title: %s", v["title"])
+	}
+
+	if _, err := d.Table("chapter.three"); err != nil {
+		t.Errorf("Chapter three is missing: %s\n%v", err, d)
+	}
+
+	if _, err := d.Table("chapter.OneHundredThirtySix"); err == nil {
+		t.Errorf("I think you mean 'Epilogue'")
+	}
+}
+
+func matchValues(t *testing.T, data map[string]interface{}) {
+	t.Helper()
+	if data["poet"] != "Coleridge" {
+		t.Errorf("Unexpected poet: %s", data["poet"])
+	}
+
+	if o, err := ttpl("{{len .stanza}}", data); err != nil {
+		t.Errorf("len stanza: %s", err)
+	} else if o != "6" {
+		t.Errorf("Expected 6, got %s", o)
+	}
+
+	if o, err := ttpl("{{.mariner.shot}}", data); err != nil {
+		t.Errorf(".mariner.shot: %s", err)
+	} else if o != "ALBATROSS" {
+		t.Errorf("Expected that mariner shot ALBATROSS")
+	}
+
+	if o, err := ttpl("{{.water.water.where}}", data); err != nil {
+		t.Errorf(".water.water.where: %s", err)
+	} else if o != "everywhere" {
+		t.Errorf("Expected water water everywhere")
+	}
+}
+
+func ttpl(tpl string, v map[string]interface{}) (string, error) {
+	var b bytes.Buffer
+	tt := template.Must(template.New("t").Parse(tpl))
+	err := tt.Execute(&b, v)
+	return b.String(), err
+}
+
+func TestPathValue(t *testing.T) {
+	doc := `
+title: "Moby Dick"
+chapter:
+  one:
+    title: "Loomings"
+  two:
+    title: "The Carpet-Bag"
+  three:
+    title: "The Spouter Inn"
+`
+	d, err := ReadValues([]byte(doc))
+	if err != nil {
+		t.Fatalf("Failed to parse the White Whale: %s", err)
+	}
+
+	if v, err := d.PathValue("chapter.one.title"); err != nil {
+		t.Errorf("Got error instead of title: %s\n%v", err, d)
+	} else if v != "Loomings" {
+		t.Errorf("No error but got wrong value for title: %s\n%v", err, d)
+	}
+	if _, err := d.PathValue("chapter.one.doesnotexist"); err == nil {
+		t.Errorf("Non-existent key should return error: %s\n%v", err, d)
+	}
+	if _, err := d.PathValue("chapter.doesnotexist.one"); err == nil {
+		t.Errorf("Non-existent key in middle of path should return error: %s\n%v", err, d)
+	}
+	if _, err := d.PathValue(""); err == nil {
+		t.Error("Asking for the value from an empty path should yield an error")
+	}
+	if v, err := d.PathValue("title"); err == nil {
+		if v != "Moby Dick" {
+			t.Errorf("Failed to return values for root key title")
+		}
+	}
+}

From 7007d4d485a89e8c9364311b7aee6276ab038d0a Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <mikel@olasagasti.info>
Date: Fri, 25 Jul 2025 22:14:17 +0200
Subject: [PATCH 099/211] chore(deps): remove phayes/freeport module

Replaces the `phayes/freeport` module with the standard library's
`net.Listen("tcp", "127.0.0.1:0")` idiom. This removes an unnecessary
dependency and simplifies the codebase.

Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>
---
 go.mod                      | 1 -
 go.sum                      | 2 --
 pkg/registry/utils_test.go  | 7 ++++---
 pkg/repo/repotest/server.go | 8 +++++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index e7978c530..9b23f4b9d 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,6 @@ require (
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/moby/term v0.5.2
 	github.com/opencontainers/image-spec v1.1.1
-	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.9.1
diff --git a/go.sum b/go.sum
index 464ad8590..f7789cbbb 100644
--- a/go.sum
+++ b/go.sum
@@ -249,8 +249,6 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI=
-github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index b270e51cc..f4ff5bd58 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -37,7 +37,6 @@ import (
 	_ "github.com/distribution/distribution/v3/registry/auth/htpasswd"
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	"github.com/foxcpp/go-mockdns"
-	"github.com/phayes/freeport"
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/crypto/bcrypt"
 
@@ -127,12 +126,14 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
 
 	// Registry config
 	config := &configuration.Configuration{}
-	port, err := freeport.GetFreePort()
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	suite.Nil(err, "no error finding free port for test registry")
+	defer ln.Close()
 
 	// Change the registry host to another host which is not localhost.
 	// This is required because Docker enforces HTTP if the registry
 	// host is localhost/127.0.0.1.
+	port := ln.Addr().(*net.TCPAddr).Port
 	suite.DockerRegistryHost = fmt.Sprintf("helm-test-registry:%d", port)
 	suite.srv, err = mockdns.NewServer(map[string]mockdns.Zone{
 		"helm-test-registry.": {
@@ -142,7 +143,7 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
 	suite.Nil(err, "no error creating mock DNS server")
 	suite.srv.PatchNet(net.DefaultResolver)
 
-	config.HTTP.Addr = fmt.Sprintf("127.0.0.1:%d", port)
+	config.HTTP.Addr = ln.Addr().String()
 	config.HTTP.DrainTimeout = time.Duration(10) * time.Second
 	config.Storage = map[string]configuration.Parameters{"inmemory": map[string]interface{}{}}
 
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index ea9d5290c..7ff028b90 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -18,6 +18,7 @@ package repotest
 import (
 	"crypto/tls"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -29,7 +30,6 @@ import (
 	"github.com/distribution/distribution/v3/registry"
 	_ "github.com/distribution/distribution/v3/registry/auth/htpasswd"           // used for docker test registry
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" // used for docker test registry
-	"github.com/phayes/freeport"
 	"golang.org/x/crypto/bcrypt"
 	"sigs.k8s.io/yaml"
 
@@ -176,12 +176,14 @@ func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) {
 
 	// Registry config
 	config := &configuration.Configuration{}
-	port, err := freeport.GetFreePort()
+	ln, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("error finding free port for test registry")
 	}
+	defer ln.Close()
 
-	config.HTTP.Addr = fmt.Sprintf("127.0.0.1:%d", port)
+	port := ln.Addr().(*net.TCPAddr).Port
+	config.HTTP.Addr = ln.Addr().String()
 	config.HTTP.DrainTimeout = time.Duration(10) * time.Second
 	config.Storage = map[string]configuration.Parameters{"inmemory": map[string]interface{}{}}
 	config.Auth = configuration.Auth{

From 0c64ad1c9740b11379d7941816e0d57e9874b29c Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Tue, 29 Jul 2025 13:18:29 -0400
Subject: [PATCH 100/211] fix Chart.yaml handling

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 internal/chart/v3/util/dependencies.go |  5 +++--
 pkg/chart/v2/util/dependencies.go      |  5 +++--
 pkg/lint/rules/chartfile.go            |  3 +++
 pkg/lint/rules/chartfile_test.go       | 10 ++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/internal/chart/v3/util/dependencies.go b/internal/chart/v3/util/dependencies.go
index bd5032ce4..129c46372 100644
--- a/internal/chart/v3/util/dependencies.go
+++ b/internal/chart/v3/util/dependencies.go
@@ -16,6 +16,7 @@ limitations under the License.
 package util
 
 import (
+	"fmt"
 	"log/slog"
 	"strings"
 
@@ -265,8 +266,8 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		for _, riv := range r.ImportValues {
 			switch iv := riv.(type) {
 			case map[string]interface{}:
-				child := iv["child"].(string)
-				parent := iv["parent"].(string)
+				child := fmt.Sprintf("%v", iv["child"])
+				parent := fmt.Sprintf("%v", iv["parent"])
 
 				outiv = append(outiv, map[string]string{
 					"child":  child,
diff --git a/pkg/chart/v2/util/dependencies.go b/pkg/chart/v2/util/dependencies.go
index f34144526..1a2aa1c95 100644
--- a/pkg/chart/v2/util/dependencies.go
+++ b/pkg/chart/v2/util/dependencies.go
@@ -16,6 +16,7 @@ limitations under the License.
 package util
 
 import (
+	"fmt"
 	"log/slog"
 	"strings"
 
@@ -265,8 +266,8 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		for _, riv := range r.ImportValues {
 			switch iv := riv.(type) {
 			case map[string]interface{}:
-				child := iv["child"].(string)
-				parent := iv["parent"].(string)
+				child := fmt.Sprintf("%v", iv["child"])
+				parent := fmt.Sprintf("%v", iv["parent"])
 
 				outiv = append(outiv, map[string]string{
 					"child":  child,
diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go
index 724c3f2ea..103c28374 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/lint/rules/chartfile.go
@@ -160,6 +160,9 @@ func validateChartVersion(cf *chart.Metadata) error {
 
 func validateChartMaintainer(cf *chart.Metadata) error {
 	for _, maintainer := range cf.Maintainers {
+		if maintainer == nil {
+			return errors.New("a maintainer entry is empty")
+		}
 		if maintainer.Name == "" {
 			return errors.New("each maintainer requires a name")
 		} else if maintainer.Email != "" && !govalidator.IsEmail(maintainer.Email) {
diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go
index bbb14a5e8..1719a2011 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/lint/rules/chartfile_test.go
@@ -142,6 +142,16 @@ func TestValidateChartMaintainer(t *testing.T) {
 			t.Errorf("validateChartMaintainer(%s, %s) to return no error, got %s", test.Name, test.Email, err.Error())
 		}
 	}
+
+	// Testing for an empty maintainer
+	badChart.Maintainers = []*chart.Maintainer{nil}
+	err := validateChartMaintainer(badChart)
+	if err == nil {
+		t.Errorf("validateChartMaintainer did not return error for nil maintainer as expected")
+	}
+	if err.Error() != "a maintainer entry is empty" {
+		t.Errorf("validateChartMaintainer returned unexpected error for nil maintainer: %s", err.Error())
+	}
 }
 
 func TestValidateChartSources(t *testing.T) {

From 69efc0d4fbcc143e0b196253f6e82808aaa57fc3 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Tue, 29 Jul 2025 15:37:57 -0400
Subject: [PATCH 101/211] Handle messy index files

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 pkg/repo/index.go      | 5 +++--
 pkg/repo/index_test.go | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/repo/index.go b/pkg/repo/index.go
index c26d7581c..4de8bb463 100644
--- a/pkg/repo/index.go
+++ b/pkg/repo/index.go
@@ -355,7 +355,8 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
 	for name, cvs := range i.Entries {
 		for idx := len(cvs) - 1; idx >= 0; idx-- {
 			if cvs[idx] == nil {
-				slog.Warn("skipping loading invalid entry for chart %q from %s: empty entry", name, source)
+				slog.Warn(fmt.Sprintf("skipping loading invalid entry for chart %q from %s: empty entry", name, source))
+				cvs = append(cvs[:idx], cvs[idx+1:]...)
 				continue
 			}
 			// When metadata section missing, initialize with no data
@@ -366,7 +367,7 @@ func loadIndex(data []byte, source string) (*IndexFile, error) {
 				cvs[idx].APIVersion = chart.APIVersionV1
 			}
 			if err := cvs[idx].Validate(); ignoreSkippableChartValidationError(err) != nil {
-				slog.Warn("skipping loading invalid entry for chart %q %q from %s: %s", name, cvs[idx].Version, source, err)
+				slog.Warn(fmt.Sprintf("skipping loading invalid entry for chart %q %q from %s: %s", name, cvs[idx].Version, source, err))
 				cvs = append(cvs[:idx], cvs[idx+1:]...)
 			}
 		}
diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go
index d40719b12..7810d3ac0 100644
--- a/pkg/repo/index_test.go
+++ b/pkg/repo/index_test.go
@@ -68,6 +68,7 @@ entries:
   grafana:
   - apiVersion: v2
     name: grafana
+  - null
   foo:
   -
   bar:

From 85243914a4dcb179b997e277f42d412329fbdf9a Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Wed, 30 Jul 2025 12:14:09 +0100
Subject: [PATCH 102/211] feat: switch yaml library to go.yaml.in/yaml/v3

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 go.mod              | 4 ++--
 pkg/action/hooks.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index e7978c530..a8991569e 100644
--- a/go.mod
+++ b/go.mod
@@ -31,10 +31,10 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.10.0
+	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.40.0
 	golang.org/x/term v0.33.0
 	golang.org/x/text v0.27.0
-	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -156,7 +156,6 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/mod v0.25.0 // indirect
 	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
@@ -171,6 +170,7 @@ 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.33.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 1213e87e2..d01ec84a0 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -25,7 +25,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/kube"
 
-	"gopkg.in/yaml.v3"
+	"go.yaml.in/yaml/v3"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	release "helm.sh/helm/v4/pkg/release/v1"

From 008bd7fc8298c9f2e29e64c0ba4f63abf7bedb12 Mon Sep 17 00:00:00 2001
From: Atish Kumar <allolro@gmail.com>
Date: Fri, 1 Aug 2025 12:31:07 +0530
Subject: [PATCH 103/211] test(pkg/kube/client): add test for isReachable

Signed-off-by: Atish Kumar <allolro@gmail.com>
---
 pkg/kube/client_test.go | 105 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index cd83a7f9e..5ffa0972b 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -18,6 +18,7 @@ package kube
 
 import (
 	"bytes"
+	"errors"
 	"io"
 	"net/http"
 	"strings"
@@ -34,7 +35,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	jsonserializer "k8s.io/apimachinery/pkg/runtime/serializer/json"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/client-go/kubernetes"
 	k8sfake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest/fake"
@@ -1079,3 +1082,105 @@ func TestCreatePatchCustomResourceSpec(t *testing.T) {
 	testCase.expectedPatch = `{}`
 	t.Run(testCase.name, testCase.run)
 }
+
+type errorFactory struct {
+	*cmdtesting.TestFactory
+	err error
+}
+
+func (f *errorFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {
+	return nil, f.err
+}
+
+func newTestClientWithDiscoveryError(t *testing.T, err error) *Client {
+	t.Helper()
+	c := newTestClient(t)
+	c.Factory.(*cmdtesting.TestFactory).Client = &fake.RESTClient{
+		NegotiatedSerializer: unstructuredSerializer,
+		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
+			if req.URL.Path == "/version" {
+				return nil, err
+			}
+			resp, respErr := newResponse(http.StatusOK, &v1.Pod{})
+			return resp, respErr
+		}),
+	}
+	return c
+}
+
+func TestIsReachable(t *testing.T) {
+	const (
+		expectedUnreachableMsg = "kubernetes cluster unreachable"
+	)
+	tests := []struct {
+		name          string
+		setupClient   func(*testing.T) *Client
+		expectError   bool
+		errorContains string
+	}{
+		{
+			name: "successful reachability test",
+			setupClient: func(t *testing.T) *Client {
+				t.Helper()
+				client := newTestClient(t)
+				client.kubeClient = k8sfake.NewSimpleClientset()
+				return client
+			},
+			expectError: false,
+		},
+		{
+			name: "client creation error with ErrEmptyConfig",
+			setupClient: func(t *testing.T) *Client {
+				t.Helper()
+				client := newTestClient(t)
+				client.Factory = &errorFactory{err: genericclioptions.ErrEmptyConfig}
+				return client
+			},
+			expectError:   true,
+			errorContains: expectedUnreachableMsg,
+		},
+		{
+			name: "client creation error with general error",
+			setupClient: func(t *testing.T) *Client {
+				t.Helper()
+				client := newTestClient(t)
+				client.Factory = &errorFactory{err: errors.New("connection refused")}
+				return client
+			},
+			expectError:   true,
+			errorContains: "kubernetes cluster unreachable: connection refused",
+		},
+		{
+			name: "discovery error with cluster unreachable",
+			setupClient: func(t *testing.T) *Client {
+				t.Helper()
+				return newTestClientWithDiscoveryError(t, http.ErrServerClosed)
+			},
+			expectError:   true,
+			errorContains: expectedUnreachableMsg,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client := tt.setupClient(t)
+			err := client.IsReachable()
+
+			if tt.expectError {
+				if err == nil {
+					t.Error("expected error but got nil")
+					return
+				}
+
+				if !strings.Contains(err.Error(), tt.errorContains) {
+					t.Errorf("expected error message to contain '%s', got: %v", tt.errorContains, err)
+				}
+
+			} else {
+				if err != nil {
+					t.Errorf("expected no error but got: %v", err)
+				}
+			}
+		})
+	}
+}

From 4e483d36bd3ab9e197acc98c702f3e5c8b43ca8a Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <carlos@apache.org>
Date: Thu, 20 Mar 2025 19:04:49 +0000
Subject: [PATCH 104/211] fix: prevent panic when ChartDownloader.getOciURI

needs to lookup tags because no version is provided
but no RegistryClient is provided

Signed-off-by: Carlos Sanchez <carlos@apache.org>
---
 pkg/downloader/chart_downloader.go      | 4 ++++
 pkg/downloader/chart_downloader_test.go | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index 04c56e614..529fd788e 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -164,6 +164,10 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
 	}
 
 	if registry.IsOCI(u.String()) {
+		if c.RegistryClient == nil {
+			return nil, fmt.Errorf("unable to lookup ref %s at version '%s', missing registry client", ref, version)
+		}
+
 		return c.RegistryClient.ValidateReference(ref, version, u)
 	}
 
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index 766afede1..a2e09eae5 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -23,6 +23,7 @@ import (
 	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
+	"helm.sh/helm/v4/pkg/registry"
 	"helm.sh/helm/v4/pkg/repo"
 	"helm.sh/helm/v4/pkg/repo/repotest"
 )
@@ -60,10 +61,17 @@ func TestResolveChartRef(t *testing.T) {
 		{name: "oci ref with sha256 and version mismatch", ref: "oci://example.com/install/by/sha:0.1.1@sha256:d234555386402a5867ef0169fefe5486858b6d8d209eaf32fd26d29b16807fd6", version: "0.1.2", fail: true},
 	}
 
+	// Create a mock registry client for OCI references
+	registryClient, err := registry.NewClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	c := ChartDownloader{
 		Out:              os.Stderr,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		RegistryClient:   registryClient,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,

From d4ed9210df1e5e940f6b6495b631641c464a23d4 Mon Sep 17 00:00:00 2001
From: Pavani Pogula <pogulapavani@gmail.com>
Date: Wed, 6 Aug 2025 21:56:06 +0530
Subject: [PATCH 105/211] test(pkg/kube/roundtripper): Add unit tests for
 roundtripper.go

Signed-off-by: Pavani Pogula <pogulapavani@gmail.com>
---
 pkg/kube/roundtripper_test.go | 161 ++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 pkg/kube/roundtripper_test.go

diff --git a/pkg/kube/roundtripper_test.go b/pkg/kube/roundtripper_test.go
new file mode 100644
index 000000000..96602c1f4
--- /dev/null
+++ b/pkg/kube/roundtripper_test.go
@@ -0,0 +1,161 @@
+/*
+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 kube
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type fakeRoundTripper struct {
+	resp  *http.Response
+	err   error
+	calls int
+}
+
+func (f *fakeRoundTripper) RoundTrip(_ *http.Request) (*http.Response, error) {
+	f.calls++
+	return f.resp, f.err
+}
+
+func newRespWithBody(statusCode int, contentType, body string) *http.Response {
+	return &http.Response{
+		StatusCode: statusCode,
+		Header:     http.Header{"Content-Type": []string{contentType}},
+		Body:       io.NopCloser(strings.NewReader(body)),
+	}
+}
+
+func TestRetryingRoundTripper_RoundTrip(t *testing.T) {
+	marshalErr := func(code int, msg string) string {
+		b, _ := json.Marshal(kubernetesError{
+			Code:    code,
+			Message: msg,
+		})
+		return string(b)
+	}
+
+	tests := []struct {
+		name          string
+		resp          *http.Response
+		err           error
+		expectedCalls int
+		expectedErr   string
+		expectedCode  int
+	}{
+		{
+			name:          "no retry, status < 500 returns response",
+			resp:          newRespWithBody(200, "application/json", `{"message":"ok","code":200}`),
+			err:           nil,
+			expectedCalls: 1,
+			expectedCode:  200,
+		},
+		{
+			name:          "error from wrapped RoundTripper propagates",
+			resp:          nil,
+			err:           errors.New("wrapped error"),
+			expectedCalls: 1,
+			expectedErr:   "wrapped error",
+		},
+		{
+			name:          "no retry, content-type not application/json",
+			resp:          newRespWithBody(500, "text/plain", "server error"),
+			err:           nil,
+			expectedCalls: 1,
+			expectedCode:  500,
+		},
+		{
+			name: "error reading body returns error",
+			resp: &http.Response{
+				StatusCode: http.StatusInternalServerError,
+				Header:     http.Header{"Content-Type": []string{"application/json"}},
+				Body:       &errReader{},
+			},
+			err:           nil,
+			expectedCalls: 1,
+			expectedErr:   "read error",
+		},
+		{
+			name:          "error decoding JSON returns error",
+			resp:          newRespWithBody(500, "application/json", `invalid-json`),
+			err:           nil,
+			expectedCalls: 1,
+			expectedErr:   "invalid character",
+		},
+		{
+			name:          "retry on etcdserver leader changed message",
+			resp:          newRespWithBody(500, "application/json", marshalErr(500, "some error etcdserver: leader changed")),
+			err:           nil,
+			expectedCalls: 2,
+			expectedCode:  500,
+		},
+		{
+			name:          "retry on raft proposal dropped message",
+			resp:          newRespWithBody(500, "application/json", marshalErr(500, "rpc error: code = Unknown desc = raft proposal dropped")),
+			err:           nil,
+			expectedCalls: 2,
+			expectedCode:  500,
+		},
+		{
+			name:          "no retry on other error message",
+			resp:          newRespWithBody(500, "application/json", marshalErr(500, "other server error")),
+			err:           nil,
+			expectedCalls: 1,
+			expectedCode:  500,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			fakeRT := &fakeRoundTripper{
+				resp: tt.resp,
+				err:  tt.err,
+			}
+			rt := RetryingRoundTripper{
+				Wrapped: fakeRT,
+			}
+			req, _ := http.NewRequest(http.MethodGet, "http://example.com", nil)
+			resp, err := rt.RoundTrip(req)
+
+			if tt.expectedErr != "" {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.expectedErr)
+				return
+			}
+			assert.NoError(t, err)
+
+			assert.Equal(t, tt.expectedCode, resp.StatusCode)
+			assert.Equal(t, tt.expectedCalls, fakeRT.calls)
+		})
+	}
+}
+
+type errReader struct{}
+
+func (e *errReader) Read(_ []byte) (int, error) {
+	return 0, errors.New("read error")
+}
+
+func (e *errReader) Close() error {
+	return nil
+}

From 6597fecce392481407ad60d6ee5ce2000d7b5cab Mon Sep 17 00:00:00 2001
From: Pavani Pogula <pogulapavani@gmail.com>
Date: Wed, 6 Aug 2025 21:56:33 +0530
Subject: [PATCH 106/211] test(pkg/kube/wait): Add unit tests for
 waitForPodSuccess, waitForJob and SelectorsForObject.

Signed-off-by: Pavani Pogula <pogulapavani@gmail.com>
---
 pkg/kube/wait_test.go | 467 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 467 insertions(+)
 create mode 100644 pkg/kube/wait_test.go

diff --git a/pkg/kube/wait_test.go b/pkg/kube/wait_test.go
new file mode 100644
index 000000000..d96f2c486
--- /dev/null
+++ b/pkg/kube/wait_test.go
@@ -0,0 +1,467 @@
+/*
+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 kube
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	appsv1 "k8s.io/api/apps/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/cli-runtime/pkg/resource"
+)
+
+func TestSelectorsForObject(t *testing.T) {
+	tests := []struct {
+		name           string
+		object         interface{}
+		expectError    bool
+		errorContains  string
+		expectedLabels map[string]string
+	}{
+		{
+			name: "appsv1 ReplicaSet",
+			object: &appsv1.ReplicaSet{
+				Spec: appsv1.ReplicaSetSpec{
+					Selector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{"app": "test"},
+					},
+				},
+			},
+			expectError:    false,
+			expectedLabels: map[string]string{"app": "test"},
+		},
+		{
+			name: "extensionsv1beta1 ReplicaSet",
+			object: &extensionsv1beta1.ReplicaSet{
+				Spec: extensionsv1beta1.ReplicaSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "ext-rs"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "ext-rs"},
+		},
+		{
+			name: "appsv1beta2 ReplicaSet",
+			object: &appsv1beta2.ReplicaSet{
+				Spec: appsv1beta2.ReplicaSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "beta2-rs"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "beta2-rs"},
+		},
+		{
+			name: "corev1 ReplicationController",
+			object: &corev1.ReplicationController{
+				Spec: corev1.ReplicationControllerSpec{
+					Selector: map[string]string{"rc": "test"},
+				},
+			},
+			expectError:    false,
+			expectedLabels: map[string]string{"rc": "test"},
+		},
+		{
+			name: "appsv1 StatefulSet",
+			object: &appsv1.StatefulSet{
+				Spec: appsv1.StatefulSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "statefulset-v1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "statefulset-v1"},
+		},
+		{
+			name: "appsv1beta1 StatefulSet",
+			object: &appsv1beta1.StatefulSet{
+				Spec: appsv1beta1.StatefulSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "statefulset-beta1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "statefulset-beta1"},
+		},
+		{
+			name: "appsv1beta2 StatefulSet",
+			object: &appsv1beta2.StatefulSet{
+				Spec: appsv1beta2.StatefulSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "statefulset-beta2"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "statefulset-beta2"},
+		},
+		{
+			name: "extensionsv1beta1 DaemonSet",
+			object: &extensionsv1beta1.DaemonSet{
+				Spec: extensionsv1beta1.DaemonSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "daemonset-ext-beta1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "daemonset-ext-beta1"},
+		},
+		{
+			name: "appsv1 DaemonSet",
+			object: &appsv1.DaemonSet{
+				Spec: appsv1.DaemonSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "daemonset-v1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "daemonset-v1"},
+		},
+		{
+			name: "appsv1beta2 DaemonSet",
+			object: &appsv1beta2.DaemonSet{
+				Spec: appsv1beta2.DaemonSetSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "daemonset-beta2"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "daemonset-beta2"},
+		},
+		{
+			name: "extensionsv1beta1 Deployment",
+			object: &extensionsv1beta1.Deployment{
+				Spec: extensionsv1beta1.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "deployment-ext-beta1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "deployment-ext-beta1"},
+		},
+		{
+			name: "appsv1 Deployment",
+			object: &appsv1.Deployment{
+				Spec: appsv1.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "deployment-v1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "deployment-v1"},
+		},
+		{
+			name: "appsv1beta1 Deployment",
+			object: &appsv1beta1.Deployment{
+				Spec: appsv1beta1.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "deployment-beta1"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "deployment-beta1"},
+		},
+		{
+			name: "appsv1beta2 Deployment",
+			object: &appsv1beta2.Deployment{
+				Spec: appsv1beta2.DeploymentSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "deployment-beta2"}},
+				},
+			},
+			expectedLabels: map[string]string{"app": "deployment-beta2"},
+		},
+		{
+			name: "batchv1 Job",
+			object: &batchv1.Job{
+				Spec: batchv1.JobSpec{
+					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"job": "batch-job"}},
+				},
+			},
+			expectedLabels: map[string]string{"job": "batch-job"},
+		},
+		{
+			name: "corev1 Service with selector",
+			object: &corev1.Service{
+				ObjectMeta: metav1.ObjectMeta{Name: "svc"},
+				Spec: corev1.ServiceSpec{
+					Selector: map[string]string{"svc": "yes"},
+				},
+			},
+			expectError:    false,
+			expectedLabels: map[string]string{"svc": "yes"},
+		},
+		{
+			name: "corev1 Service without selector",
+			object: &corev1.Service{
+				ObjectMeta: metav1.ObjectMeta{Name: "svc"},
+				Spec:       corev1.ServiceSpec{Selector: map[string]string{}},
+			},
+			expectError:   true,
+			errorContains: "invalid service 'svc': Service is defined without a selector",
+		},
+		{
+			name: "invalid label selector",
+			object: &appsv1.ReplicaSet{
+				Spec: appsv1.ReplicaSetSpec{
+					Selector: &metav1.LabelSelector{
+						MatchExpressions: []metav1.LabelSelectorRequirement{
+							{
+								Key:      "foo",
+								Operator: "InvalidOperator",
+								Values:   []string{"bar"},
+							},
+						},
+					},
+				},
+			},
+			expectError:   true,
+			errorContains: "invalid label selector:",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			selector, err := SelectorsForObject(tt.object.(runtime.Object))
+			if tt.expectError {
+				assert.Error(t, err)
+				assert.Contains(t, err.Error(), tt.errorContains)
+			} else {
+				assert.NoError(t, err)
+				expected := labels.Set(tt.expectedLabels)
+				assert.True(t, selector.Matches(expected), "expected selector to match")
+			}
+		})
+	}
+}
+
+func TestLegacyWaiter_waitForPodSuccess(t *testing.T) {
+	lw := &legacyWaiter{}
+
+	tests := []struct {
+		name       string
+		obj        runtime.Object
+		wantDone   bool
+		wantErr    bool
+		errMessage string
+	}{
+		{
+			name: "pod succeeded",
+			obj: &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "pod1"},
+				Status:     corev1.PodStatus{Phase: corev1.PodSucceeded},
+			},
+			wantDone: true,
+			wantErr:  false,
+		},
+		{
+			name: "pod failed",
+			obj: &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "pod2"},
+				Status:     corev1.PodStatus{Phase: corev1.PodFailed},
+			},
+			wantDone:   true,
+			wantErr:    true,
+			errMessage: "pod pod2 failed",
+		},
+		{
+			name: "pod pending",
+			obj: &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "pod3"},
+				Status:     corev1.PodStatus{Phase: corev1.PodPending},
+			},
+			wantDone: false,
+			wantErr:  false,
+		},
+		{
+			name: "pod running",
+			obj: &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "pod4"},
+				Status:     corev1.PodStatus{Phase: corev1.PodRunning},
+			},
+			wantDone: false,
+			wantErr:  false,
+		},
+		{
+			name:       "wrong object type",
+			obj:        &metav1.Status{},
+			wantDone:   true,
+			wantErr:    true,
+			errMessage: "expected foo to be a *v1.Pod, got *v1.Status",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			done, err := lw.waitForPodSuccess(tt.obj, "foo")
+			if tt.wantErr {
+				if err == nil {
+					t.Errorf("expected error, got none")
+				} else if !strings.Contains(err.Error(), tt.errMessage) {
+					t.Errorf("expected error to contain %q, got %q", tt.errMessage, err.Error())
+				}
+			} else if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+			if done != tt.wantDone {
+				t.Errorf("got done=%v, want %v", done, tt.wantDone)
+			}
+		})
+	}
+}
+
+func TestLegacyWaiter_waitForJob(t *testing.T) {
+	lw := &legacyWaiter{}
+
+	tests := []struct {
+		name       string
+		obj        runtime.Object
+		wantDone   bool
+		wantErr    bool
+		errMessage string
+	}{
+		{
+			name: "job complete",
+			obj: &batchv1.Job{
+				Status: batchv1.JobStatus{
+					Conditions: []batchv1.JobCondition{
+						{
+							Type:   batchv1.JobComplete,
+							Status: "True",
+						},
+					},
+				},
+			},
+			wantDone: true,
+			wantErr:  false,
+		},
+		{
+			name: "job failed",
+			obj: &batchv1.Job{
+				Status: batchv1.JobStatus{
+					Conditions: []batchv1.JobCondition{
+						{
+							Type:   batchv1.JobFailed,
+							Status: "True",
+							Reason: "FailedReason",
+						},
+					},
+				},
+			},
+			wantDone:   true,
+			wantErr:    true,
+			errMessage: "job test-job failed: FailedReason",
+		},
+		{
+			name: "job in progress",
+			obj: &batchv1.Job{
+				Status: batchv1.JobStatus{
+					Active:    1,
+					Failed:    0,
+					Succeeded: 0,
+					Conditions: []batchv1.JobCondition{
+						{
+							Type:   batchv1.JobComplete,
+							Status: "False",
+						},
+						{
+							Type:   batchv1.JobFailed,
+							Status: "False",
+						},
+					},
+				},
+			},
+			wantDone: false,
+			wantErr:  false,
+		},
+		{
+			name:       "wrong object type",
+			obj:        &metav1.Status{},
+			wantDone:   true,
+			wantErr:    true,
+			errMessage: "expected test-job to be a *batch.Job, got *v1.Status",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			done, err := lw.waitForJob(tt.obj, "test-job")
+			if tt.wantErr {
+				if err == nil {
+					t.Errorf("expected error, got none")
+				} else if !strings.Contains(err.Error(), tt.errMessage) {
+					t.Errorf("expected error to contain %q, got %q", tt.errMessage, err.Error())
+				}
+			} else if err != nil {
+				t.Errorf("unexpected error: %v", err)
+			}
+
+			if done != tt.wantDone {
+				t.Errorf("got done=%v, want %v", done, tt.wantDone)
+			}
+		})
+	}
+}
+
+func TestLegacyWaiter_isRetryableError(t *testing.T) {
+	lw := &legacyWaiter{}
+
+	info := &resource.Info{
+		Name: "test-resource",
+	}
+
+	tests := []struct {
+		name        string
+		err         error
+		wantRetry   bool
+		description string
+	}{
+		{
+			name:      "nil error",
+			err:       nil,
+			wantRetry: false,
+		},
+		{
+			name:      "status error - 0 code",
+			err:       &apierrors.StatusError{ErrStatus: metav1.Status{Code: 0}},
+			wantRetry: true,
+		},
+		{
+			name:      "status error - 429 (TooManyRequests)",
+			err:       &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusTooManyRequests}},
+			wantRetry: true,
+		},
+		{
+			name:      "status error - 503",
+			err:       &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusServiceUnavailable}},
+			wantRetry: true,
+		},
+		{
+			name:      "status error - 501 (NotImplemented)",
+			err:       &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusNotImplemented}},
+			wantRetry: false,
+		},
+		{
+			name:      "status error - 400 (Bad Request)",
+			err:       &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusBadRequest}},
+			wantRetry: false,
+		},
+		{
+			name:      "non-status error",
+			err:       fmt.Errorf("some generic error"),
+			wantRetry: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := lw.isRetryableError(tt.err, info)
+			if got != tt.wantRetry {
+				t.Errorf("isRetryableError() = %v, want %v", got, tt.wantRetry)
+			}
+		})
+	}
+}

From 5e6a411c1f2d0e75600aa0bef1b2f30cffb8ce83 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 12:22:01 +0100
Subject: [PATCH 107/211] fix: use username and password if provided

Ref: #31114

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 go.mod                 | 2 +-
 pkg/registry/client.go | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index e2f8536a1..b0fef95bc 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
+	github.com/fatih/color v1.13.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3
@@ -70,7 +71,6 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 3ea68f181..042f06065 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -128,7 +128,13 @@ func NewClient(options ...ClientOption) (*Client, error) {
 		}
 		authorizer.SetUserAgent(version.GetUserAgent())
 
-		authorizer.Credential = credentials.Credential(client.credentialsStore)
+		if client.username != "" && client.password != "" {
+			authorizer.Credential = func(_ context.Context, hostport string) (auth.Credential, error) {
+				return auth.Credential{Username: client.username, Password: client.password}, nil
+			}
+		} else {
+			authorizer.Credential = credentials.Credential(client.credentialsStore)
+		}
 
 		if client.enableCache {
 			authorizer.Cache = auth.NewCache()

From 0dae3d6e886dd2007ca447c85582a7faabf72eb1 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 12:34:26 +0100
Subject: [PATCH 108/211] chore: check if go modules are tidy before build

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 .github/workflows/build-test.yml | 2 ++
 Makefile                         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 11a5c49ec..0c3ff6596 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -28,6 +28,8 @@ jobs:
           check-latest: true
       - name: Test source headers are present
         run: make test-source-headers
+      - name: Check if go mod is tidy
+        run: go mod tidy -diff
       - name: Run unit tests
         run: make test-coverage
       - name: Test build
diff --git a/Makefile b/Makefile
index 0785fdb2e..6624c12bb 100644
--- a/Makefile
+++ b/Makefile
@@ -246,3 +246,7 @@ info:
 	 @echo "Git Tag:           ${GIT_TAG}"
 	 @echo "Git Commit:        ${GIT_COMMIT}"
 	 @echo "Git Tree State:    ${GIT_DIRTY}"
+
+.PHONY: tidy
+tidy:
+	go mod tidy

From 0b367e8404b5679737a7898d06b2a858e21aaf0a Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 12:47:35 +0100
Subject: [PATCH 109/211] Run go mod tidy

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index e2f8536a1..b0fef95bc 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
+	github.com/fatih/color v1.13.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3
@@ -70,7 +71,6 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect

From 9e1cbbebcb9c6fa5ff919133daf69197862b60a6 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 12:50:54 +0100
Subject: [PATCH 110/211] fix linting warning

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 pkg/registry/client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 042f06065..c86215beb 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -129,7 +129,7 @@ func NewClient(options ...ClientOption) (*Client, error) {
 		authorizer.SetUserAgent(version.GetUserAgent())
 
 		if client.username != "" && client.password != "" {
-			authorizer.Credential = func(_ context.Context, hostport string) (auth.Credential, error) {
+			authorizer.Credential = func(_ context.Context, _ string) (auth.Credential, error) {
 				return auth.Credential{Username: client.username, Password: client.password}, nil
 			}
 		} else {

From 5e86e43edadce10aa798f632050850b1f89680df Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 13:16:07 +0100
Subject: [PATCH 111/211] Add tests for pull command using OCI registry

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 pkg/cmd/pull_test.go | 184 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 138 insertions(+), 46 deletions(-)

diff --git a/pkg/cmd/pull_test.go b/pkg/cmd/pull_test.go
index c30c94b49..b8e7eff82 100644
--- a/pkg/cmd/pull_test.go
+++ b/pkg/cmd/pull_test.go
@@ -256,6 +256,77 @@ func TestPullCmd(t *testing.T) {
 	}
 }
 
+// runPullTests is a helper function to run pull command tests with common logic
+func runPullTests(t *testing.T, tests []struct {
+	name         string
+	args         string
+	existFile    string
+	existDir     string
+	wantError    bool
+	wantErrorMsg string
+	expectFile   string
+	expectDir    bool
+}, outdir string, additionalFlags string) {
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cmd := fmt.Sprintf("pull %s -d '%s' --repository-config %s --repository-cache %s --registry-config %s %s",
+				tt.args,
+				outdir,
+				filepath.Join(outdir, "repositories.yaml"),
+				outdir,
+				filepath.Join(outdir, "config.json"),
+				additionalFlags,
+			)
+			// Create file or Dir before helm pull --untar, see: https://github.com/helm/helm/issues/7182
+			if tt.existFile != "" {
+				file := filepath.Join(outdir, tt.existFile)
+				_, err := os.Create(file)
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+			if tt.existDir != "" {
+				file := filepath.Join(outdir, tt.existDir)
+				err := os.Mkdir(file, 0755)
+				if err != nil {
+					t.Fatal(err)
+				}
+			}
+			_, _, err := executeActionCommand(cmd)
+			if err != nil {
+				if tt.wantError {
+					if tt.wantErrorMsg != "" && tt.wantErrorMsg == err.Error() {
+						t.Fatalf("Actual error %s, not equal to expected error %s", err, tt.wantErrorMsg)
+					}
+					return
+				}
+				t.Fatalf("%q reported error: %s", tt.name, err)
+			}
+
+			ef := filepath.Join(outdir, tt.expectFile)
+			fi, err := os.Stat(ef)
+			if err != nil {
+				t.Errorf("%q: expected a file at %s. %s", tt.name, ef, err)
+			}
+			if fi.IsDir() != tt.expectDir {
+				t.Errorf("%q: expected directory=%t, but it's not.", tt.name, tt.expectDir)
+			}
+		})
+	}
+}
+
+// buildOCIURL is a helper function to build OCI URLs with credentials
+func buildOCIURL(registryURL, chartName, version, username, password string) string {
+	baseURL := fmt.Sprintf("oci://%s/u/ocitestuser/%s", registryURL, chartName)
+	if version != "" {
+		baseURL += fmt.Sprintf(" --version %s", version)
+	}
+	if username != "" && password != "" {
+		baseURL += fmt.Sprintf(" --username %s --password %s", username, password)
+	}
+	return baseURL
+}
+
 func TestPullWithCredentialsCmd(t *testing.T) {
 	srv := repotest.NewTempServer(
 		t,
@@ -311,52 +382,7 @@ func TestPullWithCredentialsCmd(t *testing.T) {
 		},
 	}
 
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			outdir := srv.Root()
-			cmd := fmt.Sprintf("pull %s -d '%s' --repository-config %s --repository-cache %s --registry-config %s",
-				tt.args,
-				outdir,
-				filepath.Join(outdir, "repositories.yaml"),
-				outdir,
-				filepath.Join(outdir, "config.json"),
-			)
-			// Create file or Dir before helm pull --untar, see: https://github.com/helm/helm/issues/7182
-			if tt.existFile != "" {
-				file := filepath.Join(outdir, tt.existFile)
-				_, err := os.Create(file)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			if tt.existDir != "" {
-				file := filepath.Join(outdir, tt.existDir)
-				err := os.Mkdir(file, 0755)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			_, _, err := executeActionCommand(cmd)
-			if err != nil {
-				if tt.wantError {
-					if tt.wantErrorMsg != "" && tt.wantErrorMsg == err.Error() {
-						t.Fatalf("Actual error %s, not equal to expected error %s", err, tt.wantErrorMsg)
-					}
-					return
-				}
-				t.Fatalf("%q reported error: %s", tt.name, err)
-			}
-
-			ef := filepath.Join(outdir, tt.expectFile)
-			fi, err := os.Stat(ef)
-			if err != nil {
-				t.Errorf("%q: expected a file at %s. %s", tt.name, ef, err)
-			}
-			if fi.IsDir() != tt.expectDir {
-				t.Errorf("%q: expected directory=%t, but it's not.", tt.name, tt.expectDir)
-			}
-		})
-	}
+	runPullTests(t, tests, srv.Root(), "")
 }
 
 func TestPullVersionCompletion(t *testing.T) {
@@ -389,6 +415,72 @@ func TestPullVersionCompletion(t *testing.T) {
 	runTestCmd(t, tests)
 }
 
+func TestPullWithCredentialsCmdOCIRegistry(t *testing.T) {
+	srv := repotest.NewTempServer(
+		t,
+		repotest.WithChartSourceGlob("testdata/testcharts/*.tgz*"),
+	)
+	defer srv.Stop()
+
+	ociSrv, err := repotest.NewOCIServer(t, srv.Root())
+	if err != nil {
+		t.Fatal(err)
+	}
+	ociSrv.Run(t)
+
+	if err := srv.LinkIndices(); err != nil {
+		t.Fatal(err)
+	}
+
+	// all flags will get "-d outdir" appended.
+	tests := []struct {
+		name         string
+		args         string
+		existFile    string
+		existDir     string
+		wantError    bool
+		wantErrorMsg string
+		expectFile   string
+		expectDir    bool
+	}{
+		{
+			name:       "OCI Chart fetch with credentials",
+			args:       buildOCIURL(ociSrv.RegistryURL, "oci-dependent-chart", "0.1.0", ociSrv.TestUsername, ociSrv.TestPassword),
+			expectFile: "./oci-dependent-chart-0.1.0.tgz",
+		},
+		{
+			name:       "OCI Chart fetch with credentials and untar",
+			args:       buildOCIURL(ociSrv.RegistryURL, "oci-dependent-chart", "0.1.0", ociSrv.TestUsername, ociSrv.TestPassword) + " --untar",
+			expectFile: "./oci-dependent-chart",
+			expectDir:  true,
+		},
+		{
+			name:       "OCI Chart fetch with credentials and untardir",
+			args:       buildOCIURL(ociSrv.RegistryURL, "oci-dependent-chart", "0.1.0", ociSrv.TestUsername, ociSrv.TestPassword) + " --untar --untardir ocitest-credentials",
+			expectFile: "./ocitest-credentials",
+			expectDir:  true,
+		},
+		{
+			name:      "Fail fetching OCI chart with wrong credentials",
+			args:      buildOCIURL(ociSrv.RegistryURL, "oci-dependent-chart", "0.1.0", "wronguser", "wrongpass"),
+			wantError: true,
+		},
+		{
+			name:      "Fail fetching non-existent OCI chart with credentials",
+			args:      buildOCIURL(ociSrv.RegistryURL, "nosuchthing", "0.1.0", ociSrv.TestUsername, ociSrv.TestPassword),
+			wantError: true,
+		},
+		{
+			name:         "Fail fetching OCI chart without version specified",
+			args:         buildOCIURL(ociSrv.RegistryURL, "nosuchthing", "", ociSrv.TestUsername, ociSrv.TestPassword),
+			wantErrorMsg: "Error: --version flag is explicitly required for OCI registries",
+			wantError:    true,
+		},
+	}
+
+	runPullTests(t, tests, srv.Root(), "--plain-http")
+}
+
 func TestPullFileCompletion(t *testing.T) {
 	checkFileCompletion(t, "pull", false)
 	checkFileCompletion(t, "pull repo/chart", false)

From 97af5a5e85036d951db7de6f788309bca4c68e60 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 13:31:18 +0100
Subject: [PATCH 112/211] Fix linter warning

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 pkg/cmd/pull_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/cmd/pull_test.go b/pkg/cmd/pull_test.go
index b8e7eff82..6a1d3ec0d 100644
--- a/pkg/cmd/pull_test.go
+++ b/pkg/cmd/pull_test.go
@@ -267,6 +267,7 @@ func runPullTests(t *testing.T, tests []struct {
 	expectFile   string
 	expectDir    bool
 }, outdir string, additionalFlags string) {
+	t.Helper()
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			cmd := fmt.Sprintf("pull %s -d '%s' --repository-config %s --repository-cache %s --registry-config %s %s",

From af1c9570f518c0a2631d21e88170b41dfbafe8de Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 13:42:27 +0100
Subject: [PATCH 113/211] Rename go mod tidy check task

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 0c3ff6596..5456b143f 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -28,7 +28,7 @@ jobs:
           check-latest: true
       - name: Test source headers are present
         run: make test-source-headers
-      - name: Check if go mod is tidy
+      - name: Check if go modules need to be tidied
         run: go mod tidy -diff
       - name: Run unit tests
         run: make test-coverage

From ded25c1908b1dc1baab0b7e5a33a809e81133a7d Mon Sep 17 00:00:00 2001
From: Khwaja Faraz Ahmed <khwajafarazahmed@gmail.com>
Date: Thu, 7 Aug 2025 18:30:19 +0500
Subject: [PATCH 114/211] Add tests for alias

Signed-off-by: Khwaja Faraz Ahmed <khwajafarazahmed@gmail.com>
---
 pkg/action/get_metadata_test.go | 183 ++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index c8e77fc0b..20642f07a 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -142,6 +142,136 @@ func TestGetMetadata_Run_WithDependencies(t *testing.T) {
 	assert.Equal(t, "redis", result.Dependencies[1].Name)
 }
 
+func TestGetMetadata_Run_WithDependenciesAliases(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	dependencies := []*chart.Dependency{
+		{
+			Name:       "mysql",
+			Version:    "8.0.25",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Alias:      "database",
+		},
+		{
+			Name:       "redis",
+			Version:    "6.2.4",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Alias:      "cache",
+		},
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:         "test-chart",
+				Version:      "1.0.0",
+				AppVersion:   "v1.2.3",
+				Dependencies: dependencies,
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, "1.0.0", result.Version)
+	assert.Equal(t, dependencies, result.Dependencies)
+	assert.Len(t, result.Dependencies, 2)
+	assert.Equal(t, "mysql", result.Dependencies[0].Name)
+	assert.Equal(t, "database", result.Dependencies[0].Alias)
+	assert.Equal(t, "redis", result.Dependencies[1].Name)
+	assert.Equal(t, "cache", result.Dependencies[1].Alias)
+}
+
+func TestGetMetadata_Run_WithMixedDependencies(t *testing.T) {
+	cfg := actionConfigFixture(t)
+	client := NewGetMetadata(cfg)
+
+	releaseName := "test-release"
+	deployedTime := helmtime.Now()
+
+	dependencies := []*chart.Dependency{
+		{
+			Name:       "mysql",
+			Version:    "8.0.25",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Alias:      "database",
+		},
+		{
+			Name:       "nginx",
+			Version:    "1.20.0",
+			Repository: "https://charts.bitnami.com/bitnami",
+		},
+		{
+			Name:       "redis",
+			Version:    "6.2.4",
+			Repository: "https://charts.bitnami.com/bitnami",
+			Alias:      "cache",
+		},
+		{
+			Name:       "postgresql",
+			Version:    "11.0.0",
+			Repository: "https://charts.bitnami.com/bitnami",
+		},
+	}
+
+	rel := &release.Release{
+		Name: releaseName,
+		Info: &release.Info{
+			Status:       release.StatusDeployed,
+			LastDeployed: deployedTime,
+		},
+		Chart: &chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:         "test-chart",
+				Version:      "1.0.0",
+				AppVersion:   "v1.2.3",
+				Dependencies: dependencies,
+			},
+		},
+		Version:   1,
+		Namespace: "default",
+	}
+
+	cfg.Releases.Create(rel)
+
+	result, err := client.Run(releaseName)
+	require.NoError(t, err)
+
+	assert.Equal(t, releaseName, result.Name)
+	assert.Equal(t, "test-chart", result.Chart)
+	assert.Equal(t, "1.0.0", result.Version)
+	assert.Equal(t, dependencies, result.Dependencies)
+	assert.Len(t, result.Dependencies, 4)
+	
+	// Verify dependencies with aliases
+	assert.Equal(t, "mysql", result.Dependencies[0].Name)
+	assert.Equal(t, "database", result.Dependencies[0].Alias)
+	assert.Equal(t, "redis", result.Dependencies[2].Name)
+	assert.Equal(t, "cache", result.Dependencies[2].Alias)
+	
+	// Verify dependencies without aliases
+	assert.Equal(t, "nginx", result.Dependencies[1].Name)
+	assert.Equal(t, "", result.Dependencies[1].Alias)
+	assert.Equal(t, "postgresql", result.Dependencies[3].Name)
+	assert.Equal(t, "", result.Dependencies[3].Alias)
+}
+
 func TestGetMetadata_Run_WithAnnotations(t *testing.T) {
 	cfg := actionConfigFixture(t)
 	client := NewGetMetadata(cfg)
@@ -434,6 +564,59 @@ func TestMetadata_FormattedDepNames_WithComplexDependencies(t *testing.T) {
 	assert.Equal(t, "apache,mysql,zookeeper", result)
 }
 
+func TestMetadata_FormattedDepNames_WithAliases(t *testing.T) {
+	testCases := []struct {
+		name         string
+		dependencies []*chart.Dependency
+		expected     string
+	}{
+		{
+			name: "dependencies with aliases",
+			dependencies: []*chart.Dependency{
+				{Name: "mysql", Alias: "database"},
+				{Name: "redis", Alias: "cache"},
+			},
+			expected: "mysql,redis",
+		},
+		{
+			name: "mixed dependencies with and without aliases",
+			dependencies: []*chart.Dependency{
+				{Name: "mysql", Alias: "database"},
+				{Name: "nginx"},
+				{Name: "redis", Alias: "cache"},
+			},
+			expected: "mysql,nginx,redis",
+		},
+		{
+			name: "empty alias should use name",
+			dependencies: []*chart.Dependency{
+				{Name: "mysql", Alias: ""},
+				{Name: "redis", Alias: "cache"},
+			},
+			expected: "mysql,redis",
+		},
+		{
+			name: "sorted by name not alias",
+			dependencies: []*chart.Dependency{
+				{Name: "zookeeper", Alias: "a-service"},
+				{Name: "apache", Alias: "z-service"},
+			},
+			expected: "apache,zookeeper",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			metadata := &Metadata{
+				Dependencies: tc.dependencies,
+			}
+
+			result := metadata.FormattedDepNames()
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}
+
 func TestGetMetadata_Labels(t *testing.T) {
 	rel := releaseStub()
 	rel.Info.Status = release.StatusDeployed

From 85164e5705e81b5ec175002600c4008195799c2b Mon Sep 17 00:00:00 2001
From: Khwaja Faraz Ahmed <khwajafarazahmed@gmail.com>
Date: Thu, 7 Aug 2025 19:35:36 +0500
Subject: [PATCH 115/211] fix lint errors

Signed-off-by: Khwaja Faraz Ahmed <khwajafarazahmed@gmail.com>
---
 pkg/action/get_metadata_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index 20642f07a..6ceb34951 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -258,13 +258,13 @@ func TestGetMetadata_Run_WithMixedDependencies(t *testing.T) {
 	assert.Equal(t, "1.0.0", result.Version)
 	assert.Equal(t, dependencies, result.Dependencies)
 	assert.Len(t, result.Dependencies, 4)
-	
+
 	// Verify dependencies with aliases
 	assert.Equal(t, "mysql", result.Dependencies[0].Name)
 	assert.Equal(t, "database", result.Dependencies[0].Alias)
 	assert.Equal(t, "redis", result.Dependencies[2].Name)
 	assert.Equal(t, "cache", result.Dependencies[2].Alias)
-	
+
 	// Verify dependencies without aliases
 	assert.Equal(t, "nginx", result.Dependencies[1].Name)
 	assert.Equal(t, "", result.Dependencies[1].Alias)

From 46c8caa4103a4cf19e80004abb552046db6e505c Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 19:11:17 +0300
Subject: [PATCH 116/211] Add info target as part of build

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6624c12bb..64780b0d8 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ all: build
 #  build
 
 .PHONY: build
-build: $(BINDIR)/$(BINNAME)
+build: $(BINDIR)/$(BINNAME) info
 
 $(BINDIR)/$(BINNAME): $(SRC)
 	CGO_ENABLED=$(CGO_ENABLED) go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/helm

From 064a18ff79c74f1d0ffa0a68ea501fdb97b42d11 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Thu, 7 Aug 2025 17:50:26 +0100
Subject: [PATCH 117/211] Update Makefile

Co-authored-by: Terry Howe <terrylhowe@gmail.com>
Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 64780b0d8..d1d6d0982 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ all: build
 #  build
 
 .PHONY: build
-build: $(BINDIR)/$(BINNAME) info
+build: $(BINDIR)/$(BINNAME) tidy
 
 $(BINDIR)/$(BINNAME): $(SRC)
 	CGO_ENABLED=$(CGO_ENABLED) go build $(GOFLAGS) -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o '$(BINDIR)'/$(BINNAME) ./cmd/helm

From bdfa36da170a3e64ff887a17c350b25387e4f4d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 21:35:58 +0000
Subject: [PATCH 118/211] chore(deps): bump golang.org/x/term from 0.33.0 to
 0.34.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.33.0 to 0.34.0.
- [Commits](https://github.com/golang/term/compare/v0.33.0...v0.34.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 6 +++---
 go.sum | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index e2f8536a1..04d9ef9ab 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
+	github.com/fatih/color v1.13.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3
@@ -32,7 +33,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.40.0
-	golang.org/x/term v0.33.0
+	golang.org/x/term v0.34.0
 	golang.org/x/text v0.27.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
@@ -70,7 +71,6 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
@@ -159,7 +159,7 @@ require (
 	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
diff --git a/go.sum b/go.sum
index f7789cbbb..5aa02ee3d 100644
--- a/go.sum
+++ b/go.sum
@@ -447,8 +447,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -456,8 +456,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
-golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
-golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

From b3568a67a8a9ac2adba6308bf12e5c10daee119d Mon Sep 17 00:00:00 2001
From: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
Date: Fri, 19 Apr 2024 21:39:24 +0200
Subject: [PATCH 119/211] helm uninstall

The goal is to have the same behaviour with or without dry-run with --ignore-not-found

close #12970

Signed-off-by: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
---
 pkg/action/uninstall.go      |  9 ++++++---
 pkg/action/uninstall_test.go | 12 +++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 61e10b2c8..6306a93b4 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -66,12 +66,15 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 	}
 
 	if u.DryRun {
-		// In the dry run case, just see if the release exists
 		r, err := u.cfg.releaseContent(name, 0)
-		if err != nil {
+		switch {
+		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
+			fallthrough
+		case err == nil:
+			return &release.UninstallReleaseResponse{Release: r}, nil
+		default:
 			return &release.UninstallReleaseResponse{}, err
 		}
-		return &release.UninstallReleaseResponse{Release: r}, nil
 	}
 
 	if err := chartutil.ValidateReleaseName(name); err != nil {
diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go
index 8b148522c..8e8af7493 100644
--- a/pkg/action/uninstall_test.go
+++ b/pkg/action/uninstall_test.go
@@ -34,6 +34,17 @@ func uninstallAction(t *testing.T) *Uninstall {
 	return unAction
 }
 
+func TestUninstallRelease_dryRun_ignoreNotFound(t *testing.T) {
+	unAction := uninstallAction(t)
+	unAction.DryRun = true
+	unAction.IgnoreNotFound = true
+
+	is := assert.New(t)
+	res, err := unAction.Run("release-non-exist")
+	is.NotNil(res)
+	is.NoError(err)
+}
+
 func TestUninstallRelease_ignoreNotFound(t *testing.T) {
 	unAction := uninstallAction(t)
 	unAction.DryRun = false
@@ -44,7 +55,6 @@ func TestUninstallRelease_ignoreNotFound(t *testing.T) {
 	is.Nil(res)
 	is.NoError(err)
 }
-
 func TestUninstallRelease_deleteRelease(t *testing.T) {
 	is := assert.New(t)
 

From 65209bed54189bb316c03d92c52bb91c85484998 Mon Sep 17 00:00:00 2001
From: Stephane Jeandeaux <sjeandeaux@users.noreply.github.com>
Date: Mon, 13 May 2024 20:17:38 +0200
Subject: [PATCH 120/211] Update pkg/action/uninstall.go

Co-authored-by: Eddy Moulton <eddy@moulton.com.au>
Signed-off-by: Stephane Jeandeaux <sjeandeaux@users.noreply.github.com>
---
 pkg/action/uninstall.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 6306a93b4..2a47510d7 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -68,10 +68,10 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 	if u.DryRun {
 		r, err := u.cfg.releaseContent(name, 0)
 		switch {
-		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
-			fallthrough
 		case err == nil:
 			return &release.UninstallReleaseResponse{Release: r}, nil
+		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
+			fallthrough
 		default:
 			return &release.UninstallReleaseResponse{}, err
 		}

From 8434935a3dae47a6cdc94388f19e52709d4ea54f Mon Sep 17 00:00:00 2001
From: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
Date: Mon, 13 May 2024 20:40:00 +0200
Subject: [PATCH 121/211] fix fallthrough

Signed-off-by: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
---
 pkg/action/uninstall.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 2a47510d7..6de570753 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -69,9 +69,9 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 		r, err := u.cfg.releaseContent(name, 0)
 		switch {
 		case err == nil:
-			return &release.UninstallReleaseResponse{Release: r}, nil
-		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
 			fallthrough
+		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
+			return &release.UninstallReleaseResponse{Release: r}, nil
 		default:
 			return &release.UninstallReleaseResponse{}, err
 		}

From da43d4746623c2e5bbe97381469b273b33480308 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 22:27:25 +0000
Subject: [PATCH 122/211] chore(deps): bump golang.org/x/text from 0.27.0 to
 0.28.0

Bumps [golang.org/x/text](https://github.com/golang/text) from 0.27.0 to 0.28.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.27.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-version: 0.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  8 ++++----
 go.sum | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 04d9ef9ab..53cb85c71 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.40.0
 	golang.org/x/term v0.34.0
-	golang.org/x/text v0.27.0
+	golang.org/x/text v0.28.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -155,13 +155,13 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/mod v0.26.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	golang.org/x/tools v0.35.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.68.1 // indirect
diff --git a/go.sum b/go.sum
index 5aa02ee3d..89e8193fc 100644
--- a/go.sum
+++ b/go.sum
@@ -395,8 +395,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -410,8 +410,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -465,8 +465,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -477,8 +477,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 14d698481dfcca028e6411ab04fe3181ba9d54d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 22:27:33 +0000
Subject: [PATCH 123/211] chore(deps): bump golang.org/x/crypto from 0.40.0 to
 0.41.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.40.0 to 0.41.0.
- [Commits](https://github.com/golang/crypto/compare/v0.40.0...v0.41.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 10 +++++-----
 go.sum | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index 04d9ef9ab..410b3c5df 100644
--- a/go.mod
+++ b/go.mod
@@ -32,9 +32,9 @@ require (
 	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.10.0
 	go.yaml.in/yaml/v3 v3.0.4
-	golang.org/x/crypto v0.40.0
+	golang.org/x/crypto v0.41.0
 	golang.org/x/term v0.34.0
-	golang.org/x/text v0.27.0
+	golang.org/x/text v0.28.0
 	k8s.io/api v0.33.3
 	k8s.io/apiextensions-apiserver v0.33.3
 	k8s.io/apimachinery v0.33.3
@@ -155,13 +155,13 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/mod v0.26.0 // indirect
+	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	golang.org/x/tools v0.35.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
 	google.golang.org/grpc v1.68.1 // indirect
diff --git a/go.sum b/go.sum
index 5aa02ee3d..8f0319aa4 100644
--- a/go.sum
+++ b/go.sum
@@ -387,16 +387,16 @@ 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.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
 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=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -410,8 +410,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -465,8 +465,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -477,8 +477,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
+golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From f3c9407052534356522e8fb9729a6af447701b4b Mon Sep 17 00:00:00 2001
From: Paolo Gallina <paologallina1992@gmail.com>
Date: Fri, 8 Aug 2025 12:35:23 +0200
Subject: [PATCH 124/211] fix(transport): leverage same tls config

Signed-off-by: Paolo Gallina <paologallina1992@gmail.com>
---
 pkg/getter/httpgetter.go | 3 +++
 pkg/getter/ocigetter.go  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 925df201e..4cf528797 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -122,6 +122,9 @@ func (g *HTTPGetter) httpClient() (*http.Client, error) {
 		g.transport = &http.Transport{
 			DisableCompression: true,
 			Proxy:              http.ProxyFromEnvironment,
+			// Being nil would cause the tls.Config default to be used
+			// "NewTLSConfig" modifies an empty TLS config, not the default one
+			TLSClientConfig: &tls.Config{},
 		}
 	})
 
diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go
index 2a611e13a..7e8bcfcfb 100644
--- a/pkg/getter/ocigetter.go
+++ b/pkg/getter/ocigetter.go
@@ -17,6 +17,7 @@ package getter
 
 import (
 	"bytes"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
@@ -124,6 +125,9 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
 			TLSHandshakeTimeout:   10 * time.Second,
 			ExpectContinueTimeout: 1 * time.Second,
 			Proxy:                 http.ProxyFromEnvironment,
+			// Being nil would cause the tls.Config default to be used
+			// "NewTLSConfig" modifies an empty TLS config, not the default one
+			TLSClientConfig: &tls.Config{},
 		}
 	})
 

From 44a594fef5693aff44b9ff0f1ea38dacc7fcb880 Mon Sep 17 00:00:00 2001
From: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
Date: Fri, 2 Aug 2024 11:21:23 +0200
Subject: [PATCH 125/211] review

Signed-off-by: Stephane Jeandeaux <stephane.jeandeaux@gmail.com>
---
 pkg/action/uninstall.go      | 13 +++++++------
 pkg/action/uninstall_test.go |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 6de570753..163af290e 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -17,6 +17,7 @@ limitations under the License.
 package action
 
 import (
+	"errors"
 	"fmt"
 	"log/slog"
 	"strings"
@@ -28,6 +29,7 @@ import (
 	"helm.sh/helm/v4/pkg/kube"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	"helm.sh/helm/v4/pkg/storage/driver"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
@@ -67,14 +69,13 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 
 	if u.DryRun {
 		r, err := u.cfg.releaseContent(name, 0)
-		switch {
-		case err == nil:
-			fallthrough
-		case u.IgnoreNotFound && errors.As(err, &driver.ErrReleaseNotFound):
-			return &release.UninstallReleaseResponse{Release: r}, nil
-		default:
+		if err != nil {
+			if u.IgnoreNotFound && errors.Is(err, driver.ErrReleaseNotFound) {
+				return nil, nil
+			}
 			return &release.UninstallReleaseResponse{}, err
 		}
+		return &release.UninstallReleaseResponse{Release: r}, nil
 	}
 
 	if err := chartutil.ValidateReleaseName(name); err != nil {
diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go
index 8e8af7493..44bd66d96 100644
--- a/pkg/action/uninstall_test.go
+++ b/pkg/action/uninstall_test.go
@@ -41,7 +41,7 @@ func TestUninstallRelease_dryRun_ignoreNotFound(t *testing.T) {
 
 	is := assert.New(t)
 	res, err := unAction.Run("release-non-exist")
-	is.NotNil(res)
+	is.Nil(res)
 	is.NoError(err)
 }
 

From be375c389262eaa74d12a1f4525a7663a765d858 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:29:49 +0000
Subject: [PATCH 126/211] chore(deps): bump github.com/fatih/color from 1.13.0
 to 1.18.0

Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.13.0 to 1.18.0.
- [Release notes](https://github.com/fatih/color/releases)
- [Commits](https://github.com/fatih/color/compare/v1.13.0...v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/fatih/color
  dependency-version: 1.18.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 410b3c5df..688094670 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
-	github.com/fatih/color v1.13.0
+	github.com/fatih/color v1.18.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3
@@ -102,7 +102,7 @@ require (
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/miekg/dns v1.1.57 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
diff --git a/go.sum b/go.sum
index 8f0319aa4..5ac66f328 100644
--- a/go.sum
+++ b/go.sum
@@ -83,8 +83,8 @@ github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjT
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fluxcd/cli-utils v0.36.0-flux.14 h1:I//AMVUXTc+M04UtIXArMXQZCazGMwfemodV1j/yG8c=
@@ -198,14 +198,11 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
@@ -431,18 +428,16 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

From 78436b2d0e4b857a9c825de668e55ae786d85d23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 05:19:39 +0000
Subject: [PATCH 127/211] chore(deps): bump actions/checkout from 4.2.2 to
 5.0.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/11bd71901bbe5b1630ceea73d27597364c9af683...08c6903cd8c0fde910a37f88322edcfb5dd907a8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-test.yml      | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/golangci-lint.yml   | 2 +-
 .github/workflows/govulncheck.yml     | 2 +-
 .github/workflows/release.yml         | 4 ++--
 .github/workflows/scorecards.yml      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 11a5c49ec..6a9d217b0 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
       - name: Add variables to environment file
         run: cat ".github/env" >> "$GITHUB_ENV"
       - name: Setup Go
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9a6aeb582..c1a2bff20 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -43,7 +43,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 3059b05a2..0d5b4e969 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
       - name: Add variables to environment file
         run: cat ".github/env" >> "$GITHUB_ENV"
       - name: Setup Go
diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
index 67cfa4c36..84d260a8f 100644
--- a/.github/workflows/govulncheck.yml
+++ b/.github/workflows/govulncheck.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
       - name: Add variables to environment file
         run: cat ".github/env" >> "$GITHUB_ENV"
       - name: Setup Go
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96138caf1..21c527442 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest-16-cores
     steps:
       - name: Checkout source code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
         with:
           fetch-depth: 0
 
@@ -79,7 +79,7 @@ jobs:
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout source code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # pin@v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # pin@v5.0.0
 
       - name: Add variables to environment file
         run: cat ".github/env" >> "$GITHUB_ENV"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 4b135bb2a..6a44c8afb 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

From 45141451b48503565ecc13b8805bbe85a2c6d6af Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Thu, 3 Jul 2025 12:59:23 -0700
Subject: [PATCH 128/211] Kube client support server-side apply

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/hooks.go      |   4 +-
 pkg/action/install.go    |  24 +-
 pkg/action/rollback.go   |   6 +-
 pkg/action/upgrade.go    |   6 +-
 pkg/kube/client.go       | 519 ++++++++++++++++-----
 pkg/kube/client_test.go  | 949 +++++++++++++++++++++++++++++++--------
 pkg/kube/fake/fake.go    |  16 +-
 pkg/kube/fake/printer.go |   4 +-
 pkg/kube/interface.go    |  12 +-
 pkg/kube/wait.go         |  21 -
 10 files changed, 1213 insertions(+), 348 deletions(-)

diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index d01ec84a0..95260e0e4 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -73,7 +73,9 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 		h.LastRun.Phase = release.HookPhaseUnknown
 
 		// Create hook resources
-		if _, err := cfg.KubeClient.Create(resources); err != nil {
+		if _, err := cfg.KubeClient.Create(
+			resources,
+			kube.ClientCreateOptionServerSideApply(false)); err != nil {
 			h.LastRun.CompletedAt = helmtime.Now()
 			h.LastRun.Phase = release.HookPhaseFailed
 			return fmt.Errorf("warning: Hook %s %s failed: %w", hook, h.Path, err)
diff --git a/pkg/action/install.go b/pkg/action/install.go
index d8efa5d5d..9a9101f5d 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -173,7 +173,9 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 		}
 
 		// Send them to Kube
-		if _, err := i.cfg.KubeClient.Create(res); err != nil {
+		if _, err := i.cfg.KubeClient.Create(
+			res,
+			kube.ClientCreateOptionServerSideApply(false)); err != nil {
 			// If the error is CRD already exists, continue.
 			if apierrors.IsAlreadyExists(err) {
 				crdName := res[0].Name
@@ -399,7 +401,9 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		if err != nil {
 			return nil, err
 		}
-		if _, err := i.cfg.KubeClient.Create(resourceList); err != nil && !apierrors.IsAlreadyExists(err) {
+		if _, err := i.cfg.KubeClient.Create(
+			resourceList,
+			kube.ClientCreateOptionServerSideApply(false)); err != nil && !apierrors.IsAlreadyExists(err) {
 			return nil, err
 		}
 	}
@@ -468,13 +472,17 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	// do an update, but it's not clear whether we WANT to do an update if the reuse is set
 	// to true, since that is basically an upgrade operation.
 	if len(toBeAdopted) == 0 && len(resources) > 0 {
-		_, err = i.cfg.KubeClient.Create(resources)
+		_, err = i.cfg.KubeClient.Create(
+			resources,
+			kube.ClientCreateOptionServerSideApply(false))
 	} else if len(resources) > 0 {
-		if i.TakeOwnership {
-			_, err = i.cfg.KubeClient.(kube.InterfaceThreeWayMerge).UpdateThreeWayMerge(toBeAdopted, resources, i.ForceReplace)
-		} else {
-			_, err = i.cfg.KubeClient.Update(toBeAdopted, resources, i.ForceReplace)
-		}
+		updateThreeWayMergeForUnstructured := i.TakeOwnership
+		_, err = i.cfg.KubeClient.Update(
+			toBeAdopted,
+			resources,
+			kube.ClientUpdateOptionServerSideApply(false),
+			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured),
+			kube.ClientUpdateOptionForceReplace(i.ForceReplace))
 	}
 	if err != nil {
 		return rel, err
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index f529fa422..f60d4f4bc 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -190,7 +190,11 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 	if err != nil {
 		return targetRelease, fmt.Errorf("unable to set metadata visitor from target release: %w", err)
 	}
-	results, err := r.cfg.KubeClient.Update(current, target, r.ForceReplace)
+	results, err := r.cfg.KubeClient.Update(
+		current,
+		target,
+		kube.ClientUpdateOptionServerSideApply(false),
+		kube.ClientUpdateOptionForceReplace(r.ForceReplace))
 
 	if err != nil {
 		msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 0567c8de2..a32d6e78e 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -426,7 +426,11 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 		slog.Debug("upgrade hooks disabled", "name", upgradedRelease.Name)
 	}
 
-	results, err := u.cfg.KubeClient.Update(current, target, u.ForceReplace)
+	results, err := u.cfg.KubeClient.Update(
+		current,
+		target,
+		kube.ClientUpdateOptionServerSideApply(false),
+		kube.ClientUpdateOptionForceReplace(u.ForceReplace))
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
 		u.reportToPerformUpgrade(c, upgradedRelease, results.Created, err)
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 78ed4e088..aa7c86c9b 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"net/http"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -91,6 +92,14 @@ const (
 	HookOnlyStrategy      WaitStrategy = "hookOnly"
 )
 
+type FieldValidationDirective string
+
+const (
+	FieldValidationDirectiveIgnore FieldValidationDirective = "Ignore"
+	FieldValidationDirectiveWarn   FieldValidationDirective = "Warn"
+	FieldValidationDirectiveStrict FieldValidationDirective = "Strict"
+)
+
 func init() {
 	// Add CRDs to the scheme. They are missing by default.
 	if err := apiextv1.AddToScheme(scheme.Scheme); err != nil {
@@ -194,10 +203,101 @@ func (c *Client) IsReachable() error {
 	return nil
 }
 
+type clientCreateOptions struct {
+	serverSideApply          bool
+	forceConflicts           bool
+	dryRun                   bool
+	fieldValidationDirective FieldValidationDirective
+}
+
+type ClientCreateOption func(*clientCreateOptions) error
+
+// ClientUpdateOptionServerSideApply enables performing object apply server-side
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
+func ClientCreateOptionServerSideApply(serverSideApply bool) ClientCreateOption {
+	return func(o *clientCreateOptions) error {
+		o.serverSideApply = serverSideApply
+
+		return nil
+	}
+}
+
+// ClientCreateOptionForceConflicts forces field conflicts to be resolved
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+// Only valid when ClientUpdateOptionServerSideApply enabled
+func ClientCreateOptionForceConflicts(forceConflicts bool) ClientCreateOption {
+	return func(o *clientCreateOptions) error {
+		o.forceConflicts = forceConflicts
+
+		return nil
+	}
+}
+
+// ClientCreateOptionDryRun performs non-mutating operations only
+func ClientCreateOptionDryRun(dryRun bool) ClientCreateOption {
+	return func(o *clientCreateOptions) error {
+		o.dryRun = dryRun
+
+		return nil
+	}
+}
+
+// ClientCreateOptionFieldValidationDirective specifies show API operations validate object's schema
+//   - For client-side apply: this is ignored
+//   - For server-side apply: the directive is sent to the server to perform the validation
+//
+// Defaults to `FieldValidationDirectiveStrict`
+func ClientCreateOptionFieldValidationDirective(fieldValidationDirective FieldValidationDirective) ClientCreateOption {
+	return func(o *clientCreateOptions) error {
+		o.fieldValidationDirective = fieldValidationDirective
+
+		return nil
+	}
+}
+
 // Create creates Kubernetes resources specified in the resource list.
-func (c *Client) Create(resources ResourceList) (*Result, error) {
+func (c *Client) Create(resources ResourceList, options ...ClientCreateOption) (*Result, error) {
 	slog.Debug("creating resource(s)", "resources", len(resources))
-	if err := perform(resources, createResource); err != nil {
+
+	createOptions := clientCreateOptions{
+		serverSideApply:          true, // Default to server-side apply
+		fieldValidationDirective: FieldValidationDirectiveStrict,
+	}
+
+	for _, o := range options {
+		o(&createOptions)
+	}
+
+	if createOptions.forceConflicts && !createOptions.serverSideApply {
+		return nil, fmt.Errorf("invalid operation: force conflicts can only be used with server-side apply")
+	}
+
+	makeCreateApplyFunc := func() func(target *resource.Info) error {
+		if createOptions.serverSideApply {
+			slog.Debug("using server-side apply for resource creation", slog.Bool("forceConflicts", createOptions.forceConflicts), slog.Bool("dryRun", createOptions.dryRun), slog.String("fieldValidationDirective", string(createOptions.fieldValidationDirective)))
+			return func(target *resource.Info) error {
+				err := patchResourceServerSide(target, createOptions.dryRun, createOptions.forceConflicts, createOptions.fieldValidationDirective)
+
+				logger := slog.With(
+					slog.String("namespace", target.Namespace),
+					slog.String("name", target.Name),
+					slog.String("gvk", target.Mapping.GroupVersionKind.String()))
+				if err != nil {
+					logger.Debug("Error patching resource", slog.Any("error", err))
+					return err
+				}
+
+				logger.Debug("Patched resource")
+
+				return nil
+			}
+		}
+
+		slog.Debug("using client-side apply for resource creation")
+		return createResource
+	}
+
+	if err := perform(resources, makeCreateApplyFunc()); err != nil {
 		return nil, err
 	}
 	return &Result{Created: resources}, nil
@@ -348,96 +448,98 @@ func (c *Client) namespace() string {
 	return v1.NamespaceDefault
 }
 
-// newBuilder returns a new resource builder for structured api objects.
-func (c *Client) newBuilder() *resource.Builder {
-	return c.Factory.NewBuilder().
-		ContinueOnError().
-		NamespaceParam(c.namespace()).
-		DefaultNamespace().
-		Flatten()
-}
-
-// Build validates for Kubernetes objects and returns unstructured infos.
-func (c *Client) Build(reader io.Reader, validate bool) (ResourceList, error) {
-	validationDirective := metav1.FieldValidationIgnore
+func determineFieldValidationDirective(validate bool) FieldValidationDirective {
 	if validate {
-		validationDirective = metav1.FieldValidationStrict
+		return FieldValidationDirectiveStrict
 	}
 
-	schema, err := c.Factory.Validator(validationDirective)
+	return FieldValidationDirectiveIgnore
+}
+
+func buildResourceList(f Factory, namespace string, validationDirective FieldValidationDirective, reader io.Reader, transformRequest resource.RequestTransform) (ResourceList, error) {
+
+	schema, err := f.Validator(string(validationDirective))
 	if err != nil {
 		return nil, err
 	}
-	result, err := c.newBuilder().
+
+	builder := f.NewBuilder().
+		ContinueOnError().
+		NamespaceParam(namespace).
+		DefaultNamespace().
+		Flatten().
 		Unstructured().
 		Schema(schema).
-		Stream(reader, "").
-		Do().Infos()
+		Stream(reader, "")
+	if transformRequest != nil {
+		builder.TransformRequests(transformRequest)
+	}
+	result, err := builder.Do().Infos()
 	return result, scrubValidationError(err)
 }
 
+// Build validates for Kubernetes objects and returns unstructured infos.
+func (c *Client) Build(reader io.Reader, validate bool) (ResourceList, error) {
+	return buildResourceList(
+		c.Factory,
+		c.namespace(),
+		determineFieldValidationDirective(validate),
+		reader,
+		nil)
+}
+
 // BuildTable validates for Kubernetes objects and returns unstructured infos.
 // The returned kind is a Table.
 func (c *Client) BuildTable(reader io.Reader, validate bool) (ResourceList, error) {
-	validationDirective := metav1.FieldValidationIgnore
-	if validate {
-		validationDirective = metav1.FieldValidationStrict
-	}
-
-	schema, err := c.Factory.Validator(validationDirective)
-	if err != nil {
-		return nil, err
-	}
-	result, err := c.newBuilder().
-		Unstructured().
-		Schema(schema).
-		Stream(reader, "").
-		TransformRequests(transformRequests).
-		Do().Infos()
-	return result, scrubValidationError(err)
+	return buildResourceList(
+		c.Factory,
+		c.namespace(),
+		determineFieldValidationDirective(validate),
+		reader,
+		transformRequests)
 }
 
-func (c *Client) update(original, target ResourceList, force, threeWayMerge bool) (*Result, error) {
+func (c *Client) update(target, original ResourceList, updateApplyFunc func(target, original *resource.Info) error) (*Result, error) {
 	updateErrors := []error{}
 	res := &Result{}
 
 	slog.Debug("checking resources for changes", "resources", len(target))
-	err := target.Visit(func(info *resource.Info, err error) error {
+	err := target.Visit(func(target *resource.Info, err error) error {
 		if err != nil {
 			return err
 		}
 
-		helper := resource.NewHelper(info.Client, info.Mapping).WithFieldManager(getManagedFieldsManager())
-		if _, err := helper.Get(info.Namespace, info.Name); err != nil {
+		helper := resource.NewHelper(target.Client, target.Mapping).WithFieldManager(getManagedFieldsManager())
+		if _, err := helper.Get(target.Namespace, target.Name); err != nil {
 			if !apierrors.IsNotFound(err) {
 				return fmt.Errorf("could not get information about the resource: %w", err)
 			}
 
 			// Append the created resource to the results, even if something fails
-			res.Created = append(res.Created, info)
+			res.Created = append(res.Created, target)
 
 			// Since the resource does not exist, create it.
-			if err := createResource(info); err != nil {
+			if err := createResource(target); err != nil {
 				return fmt.Errorf("failed to create resource: %w", err)
 			}
 
-			kind := info.Mapping.GroupVersionKind.Kind
-			slog.Debug("created a new resource", "namespace", info.Namespace, "name", info.Name, "kind", kind)
+			kind := target.Mapping.GroupVersionKind.Kind
+			slog.Debug("created a new resource", "namespace", target.Namespace, "name", target.Name, "kind", kind)
 			return nil
 		}
 
-		originalInfo := original.Get(info)
-		if originalInfo == nil {
-			kind := info.Mapping.GroupVersionKind.Kind
-			return fmt.Errorf("no %s with the name %q found", kind, info.Name)
+		original := original.Get(target)
+		if original == nil {
+			kind := target.Mapping.GroupVersionKind.Kind
+			return fmt.Errorf("original object %s with the name %q not found", kind, target.Name)
 		}
 
-		if err := updateResource(c, info, originalInfo.Object, force, threeWayMerge); err != nil {
-			slog.Debug("error updating the resource", "namespace", info.Namespace, "name", info.Name, "kind", info.Mapping.GroupVersionKind.Kind, slog.Any("error", err))
+		if err := updateApplyFunc(target, original); err != nil {
 			updateErrors = append(updateErrors, err)
 		}
+
 		// Because we check for errors later, append the info regardless
-		res.Updated = append(res.Updated, info)
+		res.Updated = append(res.Updated, target)
 
 		return nil
 	})
@@ -473,18 +575,81 @@ func (c *Client) update(original, target ResourceList, force, threeWayMerge bool
 	return res, nil
 }
 
-// Update takes the current list of objects and target list of objects and
-// creates resources that don't already exist, updates resources that have been
-// modified in the target configuration, and deletes resources from the current
-// configuration that are not present in the target configuration. If an error
-// occurs, a Result will still be returned with the error, containing all
-// resource updates, creations, and deletions that were attempted. These can be
-// used for cleanup or other logging purposes.
+type clientUpdateOptions struct {
+	threeWayMergeForUnstructured bool
+	serverSideApply              bool
+	forceReplace                 bool
+	forceConflicts               bool
+	dryRun                       bool
+	fieldValidationDirective     FieldValidationDirective
+}
+
+type ClientUpdateOption func(*clientUpdateOptions) error
+
+// ClientUpdateOptionThreeWayMergeForUnstructured enables performing three-way merge for unstructured objects
+// Must not be enabled when ClientUpdateOptionServerSideApply is enabled
+func ClientUpdateOptionThreeWayMergeForUnstructured(threeWayMergeForUnstructured bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.threeWayMergeForUnstructured = threeWayMergeForUnstructured
+
+		return nil
+	}
+}
+
+// ClientUpdateOptionServerSideApply enables performing object apply server-side (default)
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
+// Must not be enabled when ClientUpdateOptionThreeWayMerge is enabled
+func ClientUpdateOptionServerSideApply(serverSideApply bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.serverSideApply = serverSideApply
+
+		return nil
+	}
+}
+
+// ClientUpdateOptionForceReplace forces objects to be replaced rather than updated via patch
+// Must not be enabled when ClientUpdateOptionForceConflicts is enabled
+func ClientUpdateOptionForceReplace(forceReplace bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.forceReplace = forceReplace
+
+		return nil
+	}
+}
+
+// ClientUpdateOptionForceConflicts forces field conflicts to be resolved
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+// Must not be enabled when ClientUpdateOptionForceReplace is enabled
+func ClientUpdateOptionForceConflicts(forceConflicts bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.forceConflicts = forceConflicts
+
+		return nil
+	}
+}
+
+// ClientUpdateOptionForceConflicts forces field conflicts to be resolved
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+// Must not be enabled when ClientUpdateOptionForceReplace is enabled
+func ClientUpdateOptionDryRun(dryRun bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.dryRun = dryRun
+
+		return nil
+	}
+}
+
+// ClientUpdateOptionFieldValidationDirective specifies show API operations validate object's schema
+//   - For client-side apply: this is ignored
+//   - For server-side apply: the directive is sent to the server to perform the validation
 //
-// The difference to Update is that UpdateThreeWayMerge does a three-way-merge
-// for unstructured objects.
-func (c *Client) UpdateThreeWayMerge(original, target ResourceList, force bool) (*Result, error) {
-	return c.update(original, target, force, true)
+// Defaults to `FieldValidationDirectiveStrict`
+func ClientUpdateOptionFieldValidationDirective(fieldValidationDirective FieldValidationDirective) ClientCreateOption {
+	return func(o *clientCreateOptions) error {
+		o.fieldValidationDirective = fieldValidationDirective
+
+		return nil
+	}
 }
 
 // Update takes the current list of objects and target list of objects and
@@ -494,8 +659,78 @@ func (c *Client) UpdateThreeWayMerge(original, target ResourceList, force bool)
 // occurs, a Result will still be returned with the error, containing all
 // resource updates, creations, and deletions that were attempted. These can be
 // used for cleanup or other logging purposes.
-func (c *Client) Update(original, target ResourceList, force bool) (*Result, error) {
-	return c.update(original, target, force, false)
+//
+// The default is to use server-side apply, equivalent to: `ClientUpdateOptionServerSideApply(true)`
+func (c *Client) Update(original, target ResourceList, options ...ClientUpdateOption) (*Result, error) {
+	updateOptions := clientUpdateOptions{
+		serverSideApply:          true, // Default to server-side apply
+		fieldValidationDirective: FieldValidationDirectiveStrict,
+	}
+
+	for _, o := range options {
+		o(&updateOptions)
+	}
+
+	if updateOptions.threeWayMergeForUnstructured && updateOptions.serverSideApply {
+		return nil, fmt.Errorf("invalid operation: cannot use three-way merge for unstructured and server-side apply together")
+	}
+
+	if updateOptions.forceConflicts && updateOptions.forceReplace {
+		return nil, fmt.Errorf("invalid operation: cannot use force conflicts and force replace together")
+	}
+
+	if updateOptions.serverSideApply && updateOptions.forceReplace {
+		return nil, fmt.Errorf("invalid operation: cannot use server-side apply and force replace together")
+	}
+
+	makeUpdateApplyFunc := func() func(target, original *resource.Info) error {
+		if updateOptions.forceReplace {
+			slog.Debug(
+				"using resource replace update strategy",
+				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)))
+			return func(target, original *resource.Info) error {
+				if err := replaceResource(target, updateOptions.fieldValidationDirective); err != nil {
+					slog.Debug("error replacing the resource", "namespace", target.Namespace, "name", target.Name, "kind", target.Mapping.GroupVersionKind.Kind, slog.Any("error", err))
+					return err
+				}
+
+				originalObject := original.Object
+				kind := target.Mapping.GroupVersionKind.Kind
+				slog.Debug("replace succeeded", "name", original.Name, "initialKind", originalObject.GetObjectKind().GroupVersionKind().Kind, "kind", kind)
+
+				return nil
+			}
+		} else if updateOptions.serverSideApply {
+			slog.Debug(
+				"using server-side apply for resource update",
+				slog.Bool("forceConflicts", updateOptions.forceConflicts),
+				slog.Bool("dryRun", updateOptions.dryRun),
+				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)))
+			return func(target, _ *resource.Info) error {
+				err := patchResourceServerSide(target, updateOptions.dryRun, updateOptions.forceConflicts, updateOptions.fieldValidationDirective)
+
+				logger := slog.With(
+					slog.String("namespace", target.Namespace),
+					slog.String("name", target.Name),
+					slog.String("gvk", target.Mapping.GroupVersionKind.String()))
+				if err != nil {
+					logger.Debug("Error patching resource", slog.Any("error", err))
+					return err
+				}
+
+				logger.Debug("Patched resource")
+
+				return nil
+			}
+		}
+
+		slog.Debug("using client-side apply for resource update", slog.Bool("threeWayMergeForUnstructured", updateOptions.threeWayMergeForUnstructured))
+		return func(target, original *resource.Info) error {
+			return patchResourceClientSide(target, original.Object, updateOptions.threeWayMergeForUnstructured)
+		}
+	}
+
+	return c.update(target, original, makeUpdateApplyFunc())
 }
 
 // Delete deletes Kubernetes resources specified in the resources list with
@@ -503,7 +738,7 @@ func (c *Client) Update(original, target ResourceList, force bool) (*Result, err
 // if one or more fail and collect any errors. All successfully deleted items
 // will be returned in the `Deleted` ResourceList that is part of the result.
 func (c *Client) Delete(resources ResourceList) (*Result, []error) {
-	return rdelete(c, resources, metav1.DeletePropagationBackground)
+	return deleteResources(resources, metav1.DeletePropagationBackground)
 }
 
 // Delete deletes Kubernetes resources specified in the resources list with
@@ -511,10 +746,10 @@ func (c *Client) Delete(resources ResourceList) (*Result, []error) {
 // if one or more fail and collect any errors. All successfully deleted items
 // will be returned in the `Deleted` ResourceList that is part of the result.
 func (c *Client) DeleteWithPropagationPolicy(resources ResourceList, policy metav1.DeletionPropagation) (*Result, []error) {
-	return rdelete(c, resources, policy)
+	return deleteResources(resources, policy)
 }
 
-func rdelete(_ *Client, resources ResourceList, propagation metav1.DeletionPropagation) (*Result, []error) {
+func deleteResources(resources ResourceList, propagation metav1.DeletionPropagation) (*Result, []error) {
 	var errs []error
 	res := &Result{}
 	mtx := sync.Mutex{}
@@ -548,6 +783,17 @@ func rdelete(_ *Client, resources ResourceList, propagation metav1.DeletionPropa
 	return res, nil
 }
 
+// https://github.com/kubernetes/kubectl/blob/197123726db24c61aa0f78d1f0ba6e91a2ec2f35/pkg/cmd/apply/apply.go#L439
+func isIncompatibleServerError(err error) bool {
+	// 415: Unsupported media type means we're talking to a server which doesn't
+	// support server-side apply.
+	if _, ok := err.(*apierrors.StatusError); !ok {
+		// Non-StatusError means the error isn't because the server is incompatible.
+		return false
+	}
+	return err.(*apierrors.StatusError).Status().Code == http.StatusUnsupportedMediaType
+}
+
 // getManagedFieldsManager returns the manager string. If one was set it will be returned.
 // Otherwise, one is calculated based on the name of the binary.
 func getManagedFieldsManager() string {
@@ -568,18 +814,41 @@ func getManagedFieldsManager() string {
 	return filepath.Base(os.Args[0])
 }
 
+func perform(infos ResourceList, fn func(*resource.Info) error) error {
+	var result error
+
+	if len(infos) == 0 {
+		return ErrNoObjectsVisited
+	}
+
+	errs := make(chan error)
+	go batchPerform(infos, fn, errs)
+
+	for range infos {
+		err := <-errs
+		if err != nil {
+			result = errors.Join(result, err)
+		}
+	}
+
+	return result
+}
+
 func batchPerform(infos ResourceList, fn func(*resource.Info) error, errs chan<- error) {
 	var kind string
 	var wg sync.WaitGroup
+	defer wg.Wait()
+
 	for _, info := range infos {
 		currentKind := info.Object.GetObjectKind().GroupVersionKind().Kind
 		if kind != currentKind {
 			wg.Wait()
 			kind = currentKind
 		}
+
 		wg.Add(1)
-		go func(i *resource.Info) {
-			errs <- fn(i)
+		go func(info *resource.Info) {
+			errs <- fn(info)
 			wg.Done()
 		}(info)
 	}
@@ -597,6 +866,7 @@ func createResource(info *resource.Info) error {
 			if err != nil {
 				return err
 			}
+
 			return info.Refresh(obj, true)
 		})
 }
@@ -674,48 +944,95 @@ func createPatch(target *resource.Info, current runtime.Object, threeWayMergeFor
 	return patch, types.StrategicMergePatchType, err
 }
 
-func updateResource(_ *Client, target *resource.Info, currentObj runtime.Object, force, threeWayMergeForUnstructured bool) error {
-	var (
-		obj    runtime.Object
-		helper = resource.NewHelper(target.Client, target.Mapping).WithFieldManager(getManagedFieldsManager())
-		kind   = target.Mapping.GroupVersionKind.Kind
-	)
+func replaceResource(target *resource.Info, fieldValidationDirective FieldValidationDirective) error {
 
-	// if --force is applied, attempt to replace the existing resource with the new object.
-	if force {
-		var err error
-		obj, err = helper.Replace(target.Namespace, target.Name, true, target.Object)
-		if err != nil {
-			return fmt.Errorf("failed to replace object: %w", err)
-		}
-		slog.Debug("replace succeeded", "name", target.Name, "initialKind", currentObj.GetObjectKind().GroupVersionKind().Kind, "kind", kind)
-	} else {
-		patch, patchType, err := createPatch(target, currentObj, threeWayMergeForUnstructured)
-		if err != nil {
-			return fmt.Errorf("failed to create patch: %w", err)
-		}
+	helper := resource.NewHelper(target.Client, target.Mapping).
+		WithFieldValidation(string(fieldValidationDirective)).
+		WithFieldManager(getManagedFieldsManager())
 
-		if patch == nil || string(patch) == "{}" {
-			slog.Debug("no changes detected", "kind", kind, "name", target.Name)
-			// This needs to happen to make sure that Helm has the latest info from the API
-			// Otherwise there will be no labels and other functions that use labels will panic
-			if err := target.Get(); err != nil {
-				return fmt.Errorf("failed to refresh resource information: %w", err)
-			}
-			return nil
-		}
-		// send patch to server
-		slog.Debug("patching resource", "kind", kind, "name", target.Name, "namespace", target.Namespace)
-		obj, err = helper.Patch(target.Namespace, target.Name, patchType, patch, nil)
-		if err != nil {
-			return fmt.Errorf("cannot patch %q with kind %s: %w", target.Name, kind, err)
+	obj, err := helper.Replace(target.Namespace, target.Name, true, target.Object)
+	if err != nil {
+		return fmt.Errorf("failed to replace object: %w", err)
+	}
+
+	if err := target.Refresh(obj, true); err != nil {
+		return fmt.Errorf("failed to refresh object after replace: %w", err)
+	}
+
+	return nil
+
+}
+
+func patchResourceClientSide(target *resource.Info, original runtime.Object, threeWayMergeForUnstructured bool) error {
+
+	patch, patchType, err := createPatch(target, original, threeWayMergeForUnstructured)
+	if err != nil {
+		return fmt.Errorf("failed to create patch: %w", err)
+	}
+
+	kind := target.Mapping.GroupVersionKind.Kind
+	if patch == nil || string(patch) == "{}" {
+		slog.Debug("no changes detected", "kind", kind, "name", target.Name)
+		// This needs to happen to make sure that Helm has the latest info from the API
+		// Otherwise there will be no labels and other functions that use labels will panic
+		if err := target.Get(); err != nil {
+			return fmt.Errorf("failed to refresh resource information: %w", err)
 		}
+		return nil
+	}
+
+	// send patch to server
+	slog.Debug("patching resource", "kind", kind, "name", target.Name, "namespace", target.Namespace)
+	helper := resource.NewHelper(target.Client, target.Mapping).WithFieldManager(getManagedFieldsManager())
+	obj, err := helper.Patch(target.Namespace, target.Name, patchType, patch, nil)
+	if err != nil {
+		return fmt.Errorf("cannot patch %q with kind %s: %w", target.Name, kind, err)
 	}
 
 	target.Refresh(obj, true)
+
 	return nil
 }
 
+// Patch reource using server-side apply
+func patchResourceServerSide(info *resource.Info, dryRun bool, forceConflicts bool, fieldValidationDirective FieldValidationDirective) error {
+	helper := resource.NewHelper(
+		info.Client,
+		info.Mapping).
+		DryRun(dryRun).
+		WithFieldManager(ManagedFieldsManager).
+		WithFieldValidation(string(fieldValidationDirective))
+
+	// Send the full object to be applied on the server side.
+	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, info.Object)
+	if err != nil {
+		return fmt.Errorf("failed to encode object %s/%s with kind %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.Kind, err)
+	}
+	options := metav1.PatchOptions{
+		Force: &forceConflicts,
+	}
+	obj, err := helper.Patch(
+		info.Namespace,
+		info.Name,
+		types.ApplyPatchType,
+		data,
+		&options,
+	)
+	if err != nil {
+		if isIncompatibleServerError(err) {
+			return fmt.Errorf("server-side apply not available on the server: %v", err)
+		}
+
+		if apierrors.IsConflict(err) {
+			return fmt.Errorf("conflict occurred while applying %s/%s with kind %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.Kind, err)
+		}
+
+		return err
+	}
+
+	return info.Refresh(obj, true)
+}
+
 // GetPodList uses the kubernetes interface to get the list of pods filtered by listOptions
 func (c *Client) GetPodList(namespace string, listOptions metav1.ListOptions) (*v1.PodList, error) {
 	podList, err := c.kubeClient.CoreV1().Pods(namespace).List(context.Background(), listOptions)
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 5ffa0972b..8de856a5a 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -19,15 +19,19 @@ package kube
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	v1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -117,210 +121,209 @@ func newTestClient(t *testing.T) *Client {
 	t.Cleanup(testFactory.Cleanup)
 
 	return &Client{
-		Factory: testFactory.WithNamespace("default"),
+		Factory: testFactory.WithNamespace(v1.NamespaceDefault),
 	}
 }
 
-func TestCreate(t *testing.T) {
-	// Note: c.Create with the fake client can currently only test creation of a single pod in the same list. When testing
-	// with more than one pod, c.Create will run into a data race as it calls perform->batchPerform which performs creation
-	// in batches. The first data race is on accessing var actions and can be fixed easily with a mutex lock in the Client
-	// function. The second data race though is something in the fake client itself in  func (c *RESTClient) do(...)
-	// when it stores the req: c.Req = req and cannot (?) be fixed easily.
-	listA := newPodList("starfish")
-	listB := newPodList("dolphin")
+type RequestResponseAction struct {
+	Request  http.Request
+	Response http.Response
+	Error    error
+}
 
-	var actions []string
-	var iterationCounter int
+type RoundTripperTestFunc func(previous []RequestResponseAction, req *http.Request) (*http.Response, error)
 
-	c := newTestClient(t)
-	c.Factory.(*cmdtesting.TestFactory).UnstructuredClient = &fake.RESTClient{
-		NegotiatedSerializer: unstructuredSerializer,
-		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
-			path, method := req.URL.Path, req.Method
-			bodyReader := new(strings.Builder)
-			_, _ = io.Copy(bodyReader, req.Body)
-			body := bodyReader.String()
-			actions = append(actions, path+":"+method)
-			t.Logf("got request %s %s", path, method)
-			switch {
-			case path == "/namespaces/default/pods" && method == http.MethodPost:
-				if strings.Contains(body, "starfish") {
-					if iterationCounter < 2 {
-						iterationCounter++
-						return newResponseJSON(http.StatusConflict, resourceQuotaConflict)
-					}
-					return newResponse(http.StatusOK, &listA.Items[0])
-				}
-				return newResponseJSON(http.StatusConflict, resourceQuotaConflict)
-			default:
-				t.Fatalf("unexpected request: %s %s", method, path)
-				return nil, nil
-			}
-		}),
+func NewRequestResponseLogClient(t *testing.T, cb RoundTripperTestFunc) RequestResponseLogClient {
+	t.Helper()
+	return RequestResponseLogClient{
+		t:  t,
+		cb: cb,
 	}
+}
 
-	t.Run("Create success", func(t *testing.T) {
-		list, err := c.Build(objBody(&listA), false)
-		if err != nil {
-			t.Fatal(err)
-		}
+// RequestResponseLogClient is a test client that logs requests and responses
+// Satifying http.RoundTripper interface, it can be used to mock HTTP requests in tests.
+// Forwarding requests to a callback function (cb) that can be used to simulate server responses.
+type RequestResponseLogClient struct {
+	t           *testing.T
+	cb          RoundTripperTestFunc
+	actionsLock sync.Mutex
+	Actions     []RequestResponseAction
+}
 
-		result, err := c.Create(list)
-		if err != nil {
-			t.Fatal(err)
-		}
+func (r *RequestResponseLogClient) Do(req *http.Request) (*http.Response, error) {
+	t := r.t
+	t.Helper()
 
-		if len(result.Created) != 1 {
-			t.Errorf("expected 1 resource created, got %d", len(result.Created))
+	readBodyBytes := func(body io.ReadCloser) []byte {
+		if body == nil {
+			return []byte{}
 		}
 
-		expectedActions := []string{
-			"/namespaces/default/pods:POST",
-			"/namespaces/default/pods:POST",
-			"/namespaces/default/pods:POST",
-		}
-		if len(expectedActions) != len(actions) {
-			t.Fatalf("unexpected number of requests, expected %d, got %d", len(expectedActions), len(actions))
-		}
-		for k, v := range expectedActions {
-			if actions[k] != v {
-				t.Errorf("expected %s request got %s", v, actions[k])
-			}
-		}
-	})
+		defer body.Close()
+		bodyBytes, err := io.ReadAll(body)
+		require.NoError(t, err)
 
-	t.Run("Create failure", func(t *testing.T) {
-		list, err := c.Build(objBody(&listB), false)
-		if err != nil {
-			t.Fatal(err)
-		}
+		return bodyBytes
+	}
 
-		_, err = c.Create(list)
-		if err == nil {
-			t.Errorf("expected error")
-		}
+	reqBytes := readBodyBytes(req.Body)
 
-		expectedString := "Operation cannot be fulfilled on resourcequotas \"quota\": the object has been modified; " +
-			"please apply your changes to the latest version and try again"
-		if !strings.Contains(err.Error(), expectedString) {
-			t.Errorf("Unexpected error message: %q", err)
-		}
+	t.Logf("Request: %s %s %s", req.Method, req.URL.String(), reqBytes)
+	if req.Body != nil {
+		req.Body = io.NopCloser(bytes.NewReader(reqBytes))
+	}
 
-		expectedActions := []string{
-			"/namespaces/default/pods:POST",
-		}
-		for k, v := range actions {
-			if expectedActions[0] != v {
-				t.Errorf("expected %s request got %s", v, actions[k])
-			}
-		}
+	resp, err := r.cb(r.Actions, req)
+
+	respBytes := readBodyBytes(resp.Body)
+	t.Logf("Response: %d %s", resp.StatusCode, string(respBytes))
+	if resp.Body != nil {
+		resp.Body = io.NopCloser(bytes.NewReader(respBytes))
+	}
+
+	r.actionsLock.Lock()
+	defer r.actionsLock.Unlock()
+	r.Actions = append(r.Actions, RequestResponseAction{
+		Request:  *req,
+		Response: *resp,
+		Error:    err,
 	})
+
+	return resp, err
 }
 
-func testUpdate(t *testing.T, threeWayMerge bool) {
-	t.Helper()
-	listA := newPodList("starfish", "otter", "squid")
-	listB := newPodList("starfish", "otter", "dolphin")
-	listC := newPodList("starfish", "otter", "dolphin")
-	listB.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
-	listC.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+func TestCreate(t *testing.T) {
+	// Note: c.Create with the fake client can currently only test creation of a single pod/object in the same list. When testing
+	// with more than one pod, c.Create will run into a data race as it calls perform->batchPerform which performs creation
+	// in batches. The race is something in the fake client itself in `func (c *RESTClient) do(...)`
+	// when it stores the req: c.Req = req and cannot (?) be fixed easily.
 
-	var actions []string
-	var iterationCounter int
+	type testCase struct {
+		Name                  string
+		Pods                  v1.PodList
+		Callback              func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error)
+		ServerSideApply       bool
+		ExpectedActions       []string
+		ExpectedErrorContains string
+	}
 
-	c := newTestClient(t)
-	c.Factory.(*cmdtesting.TestFactory).UnstructuredClient = &fake.RESTClient{
-		NegotiatedSerializer: unstructuredSerializer,
-		Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
-			p, m := req.URL.Path, req.Method
-			actions = append(actions, p+":"+m)
-			t.Logf("got request %s %s", p, m)
-			switch {
-			case p == "/namespaces/default/pods/starfish" && m == http.MethodGet:
-				return newResponse(http.StatusOK, &listA.Items[0])
-			case p == "/namespaces/default/pods/otter" && m == http.MethodGet:
-				return newResponse(http.StatusOK, &listA.Items[1])
-			case p == "/namespaces/default/pods/otter" && m == http.MethodPatch:
-				data, err := io.ReadAll(req.Body)
-				if err != nil {
-					t.Fatalf("could not dump request: %s", err)
-				}
-				req.Body.Close()
-				expected := `{}`
-				if string(data) != expected {
-					t.Errorf("expected patch\n%s\ngot\n%s", expected, string(data))
-				}
-				return newResponse(http.StatusOK, &listB.Items[0])
-			case p == "/namespaces/default/pods/dolphin" && m == http.MethodGet:
-				return newResponse(http.StatusNotFound, notFoundBody())
-			case p == "/namespaces/default/pods/starfish" && m == http.MethodPatch:
-				data, err := io.ReadAll(req.Body)
-				if err != nil {
-					t.Fatalf("could not dump request: %s", err)
-				}
-				req.Body.Close()
-				expected := `{"spec":{"$setElementOrder/containers":[{"name":"app:v4"}],"containers":[{"$setElementOrder/ports":[{"containerPort":443}],"name":"app:v4","ports":[{"containerPort":443,"name":"https"},{"$patch":"delete","containerPort":80}]}]}}`
-				if string(data) != expected {
-					t.Errorf("expected patch\n%s\ngot\n%s", expected, string(data))
-				}
-				return newResponse(http.StatusOK, &listB.Items[0])
-			case p == "/namespaces/default/pods" && m == http.MethodPost:
-				if iterationCounter < 2 {
-					iterationCounter++
+	testCases := map[string]testCase{
+		"Create success (client-side apply)": {
+			Pods:            newPodList("starfish"),
+			ServerSideApply: false,
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, _ *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				if len(previous) < 2 { // simulate a conflict
 					return newResponseJSON(http.StatusConflict, resourceQuotaConflict)
 				}
-				return newResponse(http.StatusOK, &listB.Items[1])
-			case p == "/namespaces/default/pods/squid" && m == http.MethodDelete:
-				return newResponse(http.StatusOK, &listB.Items[1])
-			case p == "/namespaces/default/pods/squid" && m == http.MethodGet:
-				return newResponse(http.StatusOK, &listB.Items[2])
-			default:
-				t.Fatalf("unexpected request: %s %s", req.Method, req.URL.Path)
-				return nil, nil
-			}
-		}),
-	}
-	first, err := c.Build(objBody(&listA), false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	second, err := c.Build(objBody(&listB), false)
-	if err != nil {
-		t.Fatal(err)
-	}
 
-	var result *Result
-	if threeWayMerge {
-		result, err = c.UpdateThreeWayMerge(first, second, false)
-	} else {
-		result, err = c.Update(first, second, false)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+			ExpectedActions: []string{
+				"/namespaces/default/pods:POST",
+				"/namespaces/default/pods:POST",
+				"/namespaces/default/pods:POST",
+			},
+		},
+		"Create success (server-side apply)": {
+			Pods:            newPodList("whale"),
+			ServerSideApply: true,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, _ *http.Request) (*http.Response, error) {
+				t.Helper()
 
-	if len(result.Created) != 1 {
-		t.Errorf("expected 1 resource created, got %d", len(result.Created))
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+			ExpectedActions: []string{
+				"/namespaces/default/pods/whale:PATCH",
+			},
+		},
+		"Create fail: incompatible server (server-side apply)": {
+			Pods:            newPodList("lobster"),
+			ServerSideApply: true,
+			Callback: func(t *testing.T, _ testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return &http.Response{
+					StatusCode: http.StatusUnsupportedMediaType,
+					Request:    req,
+				}, nil
+			},
+			ExpectedErrorContains: "server-side apply not available on the server:",
+			ExpectedActions: []string{
+				"/namespaces/default/pods/lobster:PATCH",
+			},
+		},
+		"Create fail: quota (server-side apply)": {
+			Pods:            newPodList("dolphin"),
+			ServerSideApply: true,
+			Callback: func(t *testing.T, _ testCase, _ []RequestResponseAction, _ *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return newResponseJSON(http.StatusConflict, resourceQuotaConflict)
+			},
+			ExpectedErrorContains: "Operation cannot be fulfilled on resourcequotas \"quota\": the object has been modified; " +
+				"please apply your changes to the latest version and try again",
+			ExpectedActions: []string{
+				"/namespaces/default/pods/dolphin:PATCH",
+			},
+		},
 	}
-	if len(result.Updated) != 2 {
-		t.Errorf("expected 2 resource updated, got %d", len(result.Updated))
+
+	c := newTestClient(t)
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+
+			client := NewRequestResponseLogClient(t, func(previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				return tc.Callback(t, tc, previous, req)
+			})
+
+			c.Factory.(*cmdtesting.TestFactory).UnstructuredClient = &fake.RESTClient{
+				NegotiatedSerializer: unstructuredSerializer,
+				Client:               fake.CreateHTTPClient(client.Do),
+			}
+
+			list, err := c.Build(objBody(&tc.Pods), false)
+			require.NoError(t, err)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			result, err := c.Create(
+				list,
+				ClientCreateOptionServerSideApply(tc.ServerSideApply))
+			if tc.ExpectedErrorContains != "" {
+				require.ErrorContains(t, err, tc.ExpectedErrorContains)
+			} else {
+				require.NoError(t, err)
+
+				// See note above about limitations in supporting more than a single object
+				assert.Len(t, result.Created, 1, "expected 1 object created, got %d", len(result.Created))
+			}
+
+			actions := []string{}
+			for _, action := range client.Actions {
+				path, method := action.Request.URL.Path, action.Request.Method
+				actions = append(actions, path+":"+method)
+			}
+
+			assert.Equal(t, tc.ExpectedActions, actions)
+
+		})
 	}
-	if len(result.Deleted) != 1 {
-		t.Errorf("expected 1 resource deleted, got %d", len(result.Deleted))
+}
+
+func TestUpdate(t *testing.T) {
+	type testCase struct {
+		OriginalPods                 v1.PodList
+		TargetPods                   v1.PodList
+		ThreeWayMergeForUnstructured bool
+		ServerSideApply              bool
+		ExpectedActions              []string
 	}
 
-	// TODO: Find a way to test methods that use Client Set
-	// Test with a wait
-	// if err := c.Update("test", objBody(codec, &listB), objBody(codec, &listC), false, 300, true); err != nil {
-	// 	t.Fatal(err)
-	// }
-	// Test with a wait should fail
-	// TODO: A way to make this not based off of an extremely short timeout?
-	// if err := c.Update("test", objBody(codec, &listC), objBody(codec, &listA), false, 2, true); err != nil {
-	// 	t.Fatal(err)
-	// }
-	expectedActions := []string{
+	expectedActionsClientSideApply := []string{
 		"/namespaces/default/pods/starfish:GET",
 		"/namespaces/default/pods/starfish:GET",
 		"/namespaces/default/pods/starfish:PATCH",
@@ -334,22 +337,152 @@ func testUpdate(t *testing.T, threeWayMerge bool) {
 		"/namespaces/default/pods/squid:GET",
 		"/namespaces/default/pods/squid:DELETE",
 	}
-	if len(expectedActions) != len(actions) {
-		t.Fatalf("unexpected number of requests, expected %d, got %d", len(expectedActions), len(actions))
+
+	expectedActionsServerSideApply := []string{
+		"/namespaces/default/pods/starfish:GET",
+		"/namespaces/default/pods/starfish:PATCH",
+		"/namespaces/default/pods/otter:GET",
+		"/namespaces/default/pods/otter:PATCH",
+		"/namespaces/default/pods/dolphin:GET",
+		"/namespaces/default/pods:POST", // create dolphin
+		"/namespaces/default/pods:POST", // retry due to 409
+		"/namespaces/default/pods:POST", // retry due to 409
+		"/namespaces/default/pods/squid:GET",
+		"/namespaces/default/pods/squid:DELETE",
 	}
-	for k, v := range expectedActions {
-		if actions[k] != v {
-			t.Errorf("expected %s request got %s", v, actions[k])
-		}
+
+	testCases := map[string]testCase{
+		"client-side apply": {
+			OriginalPods: newPodList("starfish", "otter", "squid"),
+			TargetPods: func() v1.PodList {
+				listTarget := newPodList("starfish", "otter", "dolphin")
+				listTarget.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return listTarget
+			}(),
+			ThreeWayMergeForUnstructured: false,
+			ServerSideApply:              false,
+			ExpectedActions:              expectedActionsClientSideApply,
+		},
+		"client-side apply (three-way merge for unstructured)": {
+			OriginalPods: newPodList("starfish", "otter", "squid"),
+			TargetPods: func() v1.PodList {
+				listTarget := newPodList("starfish", "otter", "dolphin")
+				listTarget.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return listTarget
+			}(),
+			ThreeWayMergeForUnstructured: true,
+			ServerSideApply:              false,
+			ExpectedActions:              expectedActionsClientSideApply,
+		},
+		"serverSideApply": {
+			OriginalPods: newPodList("starfish", "otter", "squid"),
+			TargetPods: func() v1.PodList {
+				listTarget := newPodList("starfish", "otter", "dolphin")
+				listTarget.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return listTarget
+			}(),
+			ThreeWayMergeForUnstructured: false,
+			ServerSideApply:              true,
+			ExpectedActions:              expectedActionsServerSideApply,
+		},
 	}
-}
 
-func TestUpdate(t *testing.T) {
-	testUpdate(t, false)
-}
+	c := newTestClient(t)
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+
+			listOriginal := tc.OriginalPods
+			listTarget := tc.TargetPods
+
+			iterationCounter := 0
+			cb := func(_ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				p, m := req.URL.Path, req.Method
+
+				switch {
+				case p == "/namespaces/default/pods/starfish" && m == http.MethodGet:
+					return newResponse(http.StatusOK, &listOriginal.Items[0])
+				case p == "/namespaces/default/pods/otter" && m == http.MethodGet:
+					return newResponse(http.StatusOK, &listOriginal.Items[1])
+				case p == "/namespaces/default/pods/otter" && m == http.MethodPatch:
+					if !tc.ServerSideApply {
+						defer req.Body.Close()
+						data, err := io.ReadAll(req.Body)
+						require.NoError(t, err)
+
+						assert.Equal(t, `{}`, string(data))
+					}
+
+					return newResponse(http.StatusOK, &listTarget.Items[0])
+				case p == "/namespaces/default/pods/dolphin" && m == http.MethodGet:
+					return newResponse(http.StatusNotFound, notFoundBody())
+				case p == "/namespaces/default/pods/starfish" && m == http.MethodPatch:
+					if !tc.ServerSideApply {
+						// Ensure client-side apply specifies correct patch
+						defer req.Body.Close()
+						data, err := io.ReadAll(req.Body)
+						require.NoError(t, err)
+
+						expected := `{"spec":{"$setElementOrder/containers":[{"name":"app:v4"}],"containers":[{"$setElementOrder/ports":[{"containerPort":443}],"name":"app:v4","ports":[{"containerPort":443,"name":"https"},{"$patch":"delete","containerPort":80}]}]}}`
+						assert.Equal(t, expected, string(data))
+					}
+
+					return newResponse(http.StatusOK, &listTarget.Items[0])
+				case p == "/namespaces/default/pods" && m == http.MethodPost:
+					if iterationCounter < 2 {
+						iterationCounter++
+						return newResponseJSON(http.StatusConflict, resourceQuotaConflict)
+					}
+
+					return newResponse(http.StatusOK, &listTarget.Items[1])
+				case p == "/namespaces/default/pods/squid" && m == http.MethodDelete:
+					return newResponse(http.StatusOK, &listTarget.Items[1])
+				case p == "/namespaces/default/pods/squid" && m == http.MethodGet:
+					return newResponse(http.StatusOK, &listTarget.Items[2])
+				default:
+				}
+
+				t.Fail()
+				return nil, nil
+			}
+
+			client := NewRequestResponseLogClient(t, cb)
+
+			c.Factory.(*cmdtesting.TestFactory).UnstructuredClient = &fake.RESTClient{
+				NegotiatedSerializer: unstructuredSerializer,
+				Client:               fake.CreateHTTPClient(client.Do),
+			}
+
+			first, err := c.Build(objBody(&listOriginal), false)
+			require.NoError(t, err)
+
+			second, err := c.Build(objBody(&listTarget), false)
+			require.NoError(t, err)
+
+			result, err := c.Update(
+				first,
+				second,
+				ClientUpdateOptionThreeWayMergeForUnstructured(tc.ThreeWayMergeForUnstructured),
+				ClientUpdateOptionForceReplace(false),
+				ClientUpdateOptionServerSideApply(tc.ServerSideApply))
+			require.NoError(t, err)
 
-func TestUpdateThreeWayMerge(t *testing.T) {
-	testUpdate(t, true)
+			assert.Len(t, result.Created, 1, "expected 1 resource created, got %d", len(result.Created))
+			assert.Len(t, result.Updated, 2, "expected 2 resource updated, got %d", len(result.Updated))
+			assert.Len(t, result.Deleted, 1, "expected 1 resource deleted, got %d", len(result.Deleted))
+
+			actions := []string{}
+			for _, action := range client.Actions {
+				path, method := action.Request.URL.Path, action.Request.Method
+				actions = append(actions, path+":"+method)
+			}
+
+			assert.Equal(t, tc.ExpectedActions, actions)
+		})
+	}
 }
 
 func TestBuild(t *testing.T) {
@@ -548,7 +681,11 @@ func TestWait(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	result, err := c.Create(resources)
+
+	result, err := c.Create(
+		resources,
+		ClientCreateOptionServerSideApply(false))
+
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -605,7 +742,10 @@ func TestWaitJob(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	result, err := c.Create(resources)
+	result, err := c.Create(
+		resources,
+		ClientCreateOptionServerSideApply(false))
+
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -664,7 +804,9 @@ func TestWaitDelete(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	result, err := c.Create(resources)
+	result, err := c.Create(
+		resources,
+		ClientCreateOptionServerSideApply(false))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1083,6 +1225,7 @@ func TestCreatePatchCustomResourceSpec(t *testing.T) {
 	t.Run(testCase.name, testCase.run)
 }
 
+<<<<<<< HEAD
 type errorFactory struct {
 	*cmdtesting.TestFactory
 	err error
@@ -1183,4 +1326,428 @@ func TestIsReachable(t *testing.T) {
 			}
 		})
 	}
+||||||| parent of 36a476ff4 (Kube client support server-side apply)
+=======
+func TestIsIncompatibleServerError(t *testing.T) {
+	testCases := map[string]struct {
+		Err  error
+		Want bool
+	}{
+		"Unsupported media type": {
+			Err:  &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusUnsupportedMediaType}},
+			Want: true,
+		},
+		"Not found error": {
+			Err:  &apierrors.StatusError{ErrStatus: metav1.Status{Code: http.StatusNotFound}},
+			Want: false,
+		},
+		"Generic error": {
+			Err:  fmt.Errorf("some generic error"),
+			Want: false,
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			if got := isIncompatibleServerError(tc.Err); got != tc.Want {
+				t.Errorf("isIncompatibleServerError() = %v, want %v", got, tc.Want)
+			}
+		})
+	}
+}
+
+func TestReplaceResource(t *testing.T) {
+	type testCase struct {
+		Pods                  v1.PodList
+		Callback              func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error)
+		ExpectedErrorContains string
+	}
+
+	testCases := map[string]testCase{
+		"normal": {
+			Pods: newPodList("whale"),
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				switch len(previous) {
+				case 0:
+					assert.Equal(t, "GET", req.Method)
+				case 1:
+					assert.Equal(t, "PUT", req.Method)
+				}
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"conflict": {
+			Pods: newPodList("whale"),
+			Callback: func(t *testing.T, _ testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return &http.Response{
+					StatusCode: http.StatusConflict,
+					Request:    req,
+				}, nil
+			},
+			ExpectedErrorContains: "failed to replace object: the server reported a conflict",
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+
+			testFactory := cmdtesting.NewTestFactory()
+			t.Cleanup(testFactory.Cleanup)
+
+			client := NewRequestResponseLogClient(t, func(previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return tc.Callback(t, tc, previous, req)
+			})
+
+			testFactory.UnstructuredClient = &fake.RESTClient{
+				NegotiatedSerializer: unstructuredSerializer,
+				Client:               fake.CreateHTTPClient(client.Do),
+			}
+
+			resourceList, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.Pods), nil)
+			require.NoError(t, err)
+
+			require.Len(t, resourceList, 1)
+			info := resourceList[0]
+
+			err = replaceResource(info, FieldValidationDirectiveStrict)
+			if tc.ExpectedErrorContains != "" {
+				require.ErrorContains(t, err, tc.ExpectedErrorContains)
+			} else {
+				require.NoError(t, err)
+				require.NotNil(t, info.Object)
+			}
+		})
+	}
+}
+
+func TestUpdateResourceThreeWayMerge(t *testing.T) {
+	type testCase struct {
+		OriginalPods                 v1.PodList
+		TargetPods                   v1.PodList
+		ThreeWayMergeForUnstructured bool
+		Callback                     func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error)
+		ExpectedErrorContains        string
+	}
+
+	testCases := map[string]testCase{
+		"normal": {
+			OriginalPods: newPodList("whale"),
+			TargetPods: func() v1.PodList {
+				pods := newPodList("whale")
+				pods.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return pods
+			}(),
+			ThreeWayMergeForUnstructured: false,
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				switch len(previous) {
+				case 0:
+					assert.Equal(t, "GET", req.Method)
+					return newResponse(http.StatusOK, &tc.OriginalPods.Items[0])
+				case 1:
+					assert.Equal(t, "PATCH", req.Method)
+					assert.Equal(t, "application/strategic-merge-patch+json", req.Header.Get("Content-Type"))
+					return newResponse(http.StatusOK, &tc.TargetPods.Items[0])
+				}
+
+				t.Fail()
+				return nil, nil
+			},
+		},
+		"three way merge for unstructured": {
+			OriginalPods: newPodList("whale"),
+			TargetPods: func() v1.PodList {
+				pods := newPodList("whale")
+				pods.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return pods
+			}(),
+			ThreeWayMergeForUnstructured: true,
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				switch len(previous) {
+				case 0:
+					assert.Equal(t, "GET", req.Method)
+					return newResponse(http.StatusOK, &tc.OriginalPods.Items[0])
+				case 1:
+					t.Logf("patcher: %+v", req.Header)
+					assert.Equal(t, "PATCH", req.Method)
+					assert.Equal(t, "application/strategic-merge-patch+json", req.Header.Get("Content-Type"))
+					return newResponse(http.StatusOK, &tc.TargetPods.Items[0])
+				}
+
+				t.Fail()
+				return nil, nil
+			},
+		},
+		"conflict": {
+			OriginalPods: newPodList("whale"),
+			TargetPods: func() v1.PodList {
+				pods := newPodList("whale")
+				pods.Items[0].Spec.Containers[0].Ports = []v1.ContainerPort{{Name: "https", ContainerPort: 443}}
+
+				return pods
+			}(),
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				switch len(previous) {
+				case 0:
+					assert.Equal(t, "GET", req.Method)
+					return newResponse(http.StatusOK, &tc.OriginalPods.Items[0])
+				case 1:
+					assert.Equal(t, "PATCH", req.Method)
+					return &http.Response{
+						StatusCode: http.StatusConflict,
+						Request:    req,
+					}, nil
+				}
+
+				t.Fail()
+				return nil, nil
+
+			},
+			ExpectedErrorContains: "cannot patch \"whale\" with kind Pod: the server reported a conflict",
+		},
+		"no patch": {
+			OriginalPods: newPodList("whale"),
+			TargetPods:   newPodList("whale"),
+			Callback: func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				switch len(previous) {
+				case 0:
+					assert.Equal(t, "GET", req.Method)
+					return newResponse(http.StatusOK, &tc.OriginalPods.Items[0])
+				case 1:
+					assert.Equal(t, "GET", req.Method)
+					return newResponse(http.StatusOK, &tc.TargetPods.Items[0])
+				}
+
+				t.Fail()
+				return nil, nil // newResponse(http.StatusOK, &tc.TargetPods.Items[0])
+
+			},
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+
+			testFactory := cmdtesting.NewTestFactory()
+			t.Cleanup(testFactory.Cleanup)
+
+			client := NewRequestResponseLogClient(t, func(previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				return tc.Callback(t, tc, previous, req)
+			})
+
+			testFactory.UnstructuredClient = &fake.RESTClient{
+				NegotiatedSerializer: unstructuredSerializer,
+				Client:               fake.CreateHTTPClient(client.Do),
+			}
+
+			resourceListCurrent, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.OriginalPods), nil)
+			require.NoError(t, err)
+			require.Len(t, resourceListCurrent, 1)
+
+			resourceListTarget, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.TargetPods), nil)
+			require.NoError(t, err)
+			require.Len(t, resourceListTarget, 1)
+
+			current := resourceListCurrent[0]
+			target := resourceListTarget[0]
+
+			err = patchResourceClientSide(target, current.Object, tc.ThreeWayMergeForUnstructured)
+			if tc.ExpectedErrorContains != "" {
+				require.ErrorContains(t, err, tc.ExpectedErrorContains)
+			} else {
+				require.NoError(t, err)
+				require.NotNil(t, target.Object)
+			}
+		})
+	}
+}
+
+func TestPatchResourceServerSide(t *testing.T) {
+	type testCase struct {
+		Pods                     v1.PodList
+		DryRun                   bool
+		ForceConflicts           bool
+		FieldValidationDirective FieldValidationDirective
+		Callback                 func(t *testing.T, tc testCase, previous []RequestResponseAction, req *http.Request) (*http.Response, error)
+		ExpectedErrorContains    string
+	}
+
+	testCases := map[string]testCase{
+		"normal": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   false,
+			ForceConflicts:           false,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "PATCH", req.Method)
+				assert.Equal(t, "application/apply-patch+yaml", req.Header.Get("Content-Type"))
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				assert.Equal(t, "false", req.URL.Query().Get("force"))
+				assert.Equal(t, "Strict", req.URL.Query().Get("fieldValidation"))
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"dry run": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   true,
+			ForceConflicts:           false,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "PATCH", req.Method)
+				assert.Equal(t, "application/apply-patch+yaml", req.Header.Get("Content-Type"))
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				assert.Equal(t, "All", req.URL.Query().Get("dryRun"))
+				assert.Equal(t, "false", req.URL.Query().Get("force"))
+				assert.Equal(t, "Strict", req.URL.Query().Get("fieldValidation"))
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"force conflicts": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   false,
+			ForceConflicts:           true,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "PATCH", req.Method)
+				assert.Equal(t, "application/apply-patch+yaml", req.Header.Get("Content-Type"))
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				assert.Equal(t, "true", req.URL.Query().Get("force"))
+				assert.Equal(t, "Strict", req.URL.Query().Get("fieldValidation"))
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"dry run + force conflicts": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   true,
+			ForceConflicts:           true,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "PATCH", req.Method)
+				assert.Equal(t, "application/apply-patch+yaml", req.Header.Get("Content-Type"))
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				assert.Equal(t, "All", req.URL.Query().Get("dryRun"))
+				assert.Equal(t, "true", req.URL.Query().Get("force"))
+				assert.Equal(t, "Strict", req.URL.Query().Get("fieldValidation"))
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"field validation ignore": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   false,
+			ForceConflicts:           false,
+			FieldValidationDirective: FieldValidationDirectiveIgnore,
+			Callback: func(t *testing.T, tc testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				assert.Equal(t, "PATCH", req.Method)
+				assert.Equal(t, "application/apply-patch+yaml", req.Header.Get("Content-Type"))
+				assert.Equal(t, "/namespaces/default/pods/whale", req.URL.Path)
+				assert.Equal(t, "false", req.URL.Query().Get("force"))
+				assert.Equal(t, "Ignore", req.URL.Query().Get("fieldValidation"))
+
+				return newResponse(http.StatusOK, &tc.Pods.Items[0])
+			},
+		},
+		"incompatible server": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   false,
+			ForceConflicts:           false,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, _ testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return &http.Response{
+					StatusCode: http.StatusUnsupportedMediaType,
+					Request:    req,
+				}, nil
+			},
+			ExpectedErrorContains: "server-side apply not available on the server:",
+		},
+		"conflict": {
+			Pods:                     newPodList("whale"),
+			DryRun:                   false,
+			ForceConflicts:           false,
+			FieldValidationDirective: FieldValidationDirectiveStrict,
+			Callback: func(t *testing.T, _ testCase, _ []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				t.Helper()
+
+				return &http.Response{
+					StatusCode: http.StatusConflict,
+					Request:    req,
+				}, nil
+			},
+			ExpectedErrorContains: "the server reported a conflict",
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+
+			testFactory := cmdtesting.NewTestFactory()
+			t.Cleanup(testFactory.Cleanup)
+
+			client := NewRequestResponseLogClient(t, func(previous []RequestResponseAction, req *http.Request) (*http.Response, error) {
+				return tc.Callback(t, tc, previous, req)
+			})
+
+			testFactory.UnstructuredClient = &fake.RESTClient{
+				NegotiatedSerializer: unstructuredSerializer,
+				Client:               fake.CreateHTTPClient(client.Do),
+			}
+
+			resourceList, err := buildResourceList(testFactory, v1.NamespaceDefault, tc.FieldValidationDirective, objBody(&tc.Pods), nil)
+			require.NoError(t, err)
+
+			require.Len(t, resourceList, 1)
+			info := resourceList[0]
+
+			err = patchResourceServerSide(info, tc.DryRun, tc.ForceConflicts, tc.FieldValidationDirective)
+			if tc.ExpectedErrorContains != "" {
+				require.ErrorContains(t, err, tc.ExpectedErrorContains)
+			} else {
+				require.NoError(t, err)
+				require.NotNil(t, info.Object)
+			}
+		})
+	}
+}
+
+func TestDetermineFieldValidationDirective(t *testing.T) {
+
+	assert.Equal(t, FieldValidationDirectiveIgnore, determineFieldValidationDirective(false))
+	assert.Equal(t, FieldValidationDirectiveStrict, determineFieldValidationDirective(true))
+>>>>>>> 36a476ff4 (Kube client support server-side apply)
 }
diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go
index a543a0f73..588bba83d 100644
--- a/pkg/kube/fake/fake.go
+++ b/pkg/kube/fake/fake.go
@@ -60,11 +60,11 @@ type FailingKubeWaiter struct {
 }
 
 // Create returns the configured error if set or prints
-func (f *FailingKubeClient) Create(resources kube.ResourceList) (*kube.Result, error) {
+func (f *FailingKubeClient) Create(resources kube.ResourceList, options ...kube.ClientCreateOption) (*kube.Result, error) {
 	if f.CreateError != nil {
 		return nil, f.CreateError
 	}
-	return f.PrintingKubeClient.Create(resources)
+	return f.PrintingKubeClient.Create(resources, options...)
 }
 
 // Get returns the configured error if set or prints
@@ -117,19 +117,11 @@ func (f *FailingKubeWaiter) WatchUntilReady(resources kube.ResourceList, d time.
 }
 
 // Update returns the configured error if set or prints
-func (f *FailingKubeClient) Update(r, modified kube.ResourceList, ignoreMe bool) (*kube.Result, error) {
+func (f *FailingKubeClient) Update(r, modified kube.ResourceList, options ...kube.ClientUpdateOption) (*kube.Result, error) {
 	if f.UpdateError != nil {
 		return &kube.Result{}, f.UpdateError
 	}
-	return f.PrintingKubeClient.Update(r, modified, ignoreMe)
-}
-
-// Update returns the configured error if set or prints
-func (f *FailingKubeClient) UpdateThreeWayMerge(r, modified kube.ResourceList, ignoreMe bool) (*kube.Result, error) {
-	if f.UpdateError != nil {
-		return &kube.Result{}, f.UpdateError
-	}
-	return f.PrintingKubeClient.Update(r, modified, ignoreMe)
+	return f.PrintingKubeClient.Update(r, modified, options...)
 }
 
 // Build returns the configured error if set or prints
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index f6659a904..16c93615a 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -49,7 +49,7 @@ func (p *PrintingKubeClient) IsReachable() error {
 }
 
 // Create prints the values of what would be created with a real KubeClient.
-func (p *PrintingKubeClient) Create(resources kube.ResourceList) (*kube.Result, error) {
+func (p *PrintingKubeClient) Create(resources kube.ResourceList, _ ...kube.ClientCreateOption) (*kube.Result, error) {
 	_, err := io.Copy(p.Out, bufferize(resources))
 	if err != nil {
 		return nil, err
@@ -98,7 +98,7 @@ func (p *PrintingKubeClient) Delete(resources kube.ResourceList) (*kube.Result,
 }
 
 // Update implements KubeClient Update.
-func (p *PrintingKubeClient) Update(_, modified kube.ResourceList, _ bool) (*kube.Result, error) {
+func (p *PrintingKubeClient) Update(_, modified kube.ResourceList, _ ...kube.ClientUpdateOption) (*kube.Result, error) {
 	_, err := io.Copy(p.Out, bufferize(modified))
 	if err != nil {
 		return nil, err
diff --git a/pkg/kube/interface.go b/pkg/kube/interface.go
index 6b945088e..7339ae0ff 100644
--- a/pkg/kube/interface.go
+++ b/pkg/kube/interface.go
@@ -30,14 +30,14 @@ import (
 // A KubernetesClient must be concurrency safe.
 type Interface interface {
 	// Create creates one or more resources.
-	Create(resources ResourceList) (*Result, error)
+	Create(resources ResourceList, options ...ClientCreateOption) (*Result, error)
 
 	// Delete destroys one or more resources.
 	Delete(resources ResourceList) (*Result, []error)
 
 	// Update updates one or more resources or creates the resource
 	// if it doesn't exist.
-	Update(original, target ResourceList, force bool) (*Result, error)
+	Update(original, target ResourceList, options ...ClientUpdateOption) (*Result, error)
 
 	// Build creates a resource list from a Reader.
 	//
@@ -53,13 +53,6 @@ type Interface interface {
 	GetWaiter(ws WaitStrategy) (Waiter, error)
 }
 
-// InterfaceThreeWayMerge was introduced to avoid breaking backwards compatibility for Interface implementers.
-//
-// TODO Helm 4: Remove InterfaceThreeWayMerge and integrate its method(s) into the Interface.
-type InterfaceThreeWayMerge interface {
-	UpdateThreeWayMerge(original, target ResourceList, force bool) (*Result, error)
-}
-
 // Waiter defines methods related to waiting for resource states.
 type Waiter interface {
 	// Wait waits up to the given timeout for the specified resources to be ready.
@@ -125,7 +118,6 @@ type InterfaceResources interface {
 }
 
 var _ Interface = (*Client)(nil)
-var _ InterfaceThreeWayMerge = (*Client)(nil)
 var _ InterfaceLogs = (*Client)(nil)
 var _ InterfaceDeletionPropagation = (*Client)(nil)
 var _ InterfaceResources = (*Client)(nil)
diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go
index 8a3bacdcc..9bfa1ef6d 100644
--- a/pkg/kube/wait.go
+++ b/pkg/kube/wait.go
@@ -18,7 +18,6 @@ package kube // import "helm.sh/helm/v4/pkg/kube"
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 	"net/http"
@@ -223,26 +222,6 @@ func (hw *legacyWaiter) WatchUntilReady(resources ResourceList, timeout time.Dur
 	return perform(resources, hw.watchTimeout(timeout))
 }
 
-func perform(infos ResourceList, fn func(*resource.Info) error) error {
-	var result error
-
-	if len(infos) == 0 {
-		return ErrNoObjectsVisited
-	}
-
-	errs := make(chan error)
-	go batchPerform(infos, fn, errs)
-
-	for range infos {
-		err := <-errs
-		if err != nil {
-			result = errors.Join(result, err)
-		}
-	}
-
-	return result
-}
-
 func (hw *legacyWaiter) watchUntilReady(timeout time.Duration, info *resource.Info) error {
 	kind := info.Mapping.GroupVersionKind.Kind
 	switch kind {

From 741facca434c9ae9d4c7de4c5ea1ad71d6782790 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 7 Jul 2025 10:41:40 -0700
Subject: [PATCH 129/211] Update pkg/kube/client_test.go

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/kube/client_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 8de856a5a..6fc2f1cc8 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -1428,7 +1428,7 @@ func TestReplaceResource(t *testing.T) {
 	}
 }
 
-func TestUpdateResourceThreeWayMerge(t *testing.T) {
+func TestPatchResourceClientSide(t *testing.T) {
 	type testCase struct {
 		OriginalPods                 v1.PodList
 		TargetPods                   v1.PodList

From 99dc23f00b37624ef7070aa9059cfd5bdfcff5a2 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 28 Jul 2025 22:13:49 -0700
Subject: [PATCH 130/211] switch target<->original

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/kube/client.go      | 62 ++++++++++++++++++++---------------------
 pkg/kube/client_test.go | 30 ++++++++++----------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index aa7c86c9b..b436f518f 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -499,12 +499,12 @@ func (c *Client) BuildTable(reader io.Reader, validate bool) (ResourceList, erro
 		transformRequests)
 }
 
-func (c *Client) update(target, original ResourceList, updateApplyFunc func(target, original *resource.Info) error) (*Result, error) {
+func (c *Client) update(originals, targets ResourceList, updateApplyFunc func(original, target *resource.Info) error) (*Result, error) {
 	updateErrors := []error{}
 	res := &Result{}
 
-	slog.Debug("checking resources for changes", "resources", len(target))
-	err := target.Visit(func(target *resource.Info, err error) error {
+	slog.Debug("checking resources for changes", "resources", len(targets))
+	err := targets.Visit(func(target *resource.Info, err error) error {
 		if err != nil {
 			return err
 		}
@@ -528,13 +528,13 @@ func (c *Client) update(target, original ResourceList, updateApplyFunc func(targ
 			return nil
 		}
 
-		original := original.Get(target)
+		original := originals.Get(target)
 		if original == nil {
 			kind := target.Mapping.GroupVersionKind.Kind
 			return fmt.Errorf("original object %s with the name %q not found", kind, target.Name)
 		}
 
-		if err := updateApplyFunc(target, original); err != nil {
+		if err := updateApplyFunc(original, target); err != nil {
 			updateErrors = append(updateErrors, err)
 		}
 
@@ -551,7 +551,7 @@ func (c *Client) update(target, original ResourceList, updateApplyFunc func(targ
 		return res, joinErrors(updateErrors, " && ")
 	}
 
-	for _, info := range original.Difference(target) {
+	for _, info := range originals.Difference(targets) {
 		slog.Debug("deleting resource", "namespace", info.Namespace, "name", info.Name, "kind", info.Mapping.GroupVersionKind.Kind)
 
 		if err := info.Get(); err != nil {
@@ -661,7 +661,7 @@ func ClientUpdateOptionFieldValidationDirective(fieldValidationDirective FieldVa
 // used for cleanup or other logging purposes.
 //
 // The default is to use server-side apply, equivalent to: `ClientUpdateOptionServerSideApply(true)`
-func (c *Client) Update(original, target ResourceList, options ...ClientUpdateOption) (*Result, error) {
+func (c *Client) Update(originals, targets ResourceList, options ...ClientUpdateOption) (*Result, error) {
 	updateOptions := clientUpdateOptions{
 		serverSideApply:          true, // Default to server-side apply
 		fieldValidationDirective: FieldValidationDirectiveStrict,
@@ -683,12 +683,12 @@ func (c *Client) Update(original, target ResourceList, options ...ClientUpdateOp
 		return nil, fmt.Errorf("invalid operation: cannot use server-side apply and force replace together")
 	}
 
-	makeUpdateApplyFunc := func() func(target, original *resource.Info) error {
+	makeUpdateApplyFunc := func() func(original, target *resource.Info) error {
 		if updateOptions.forceReplace {
 			slog.Debug(
 				"using resource replace update strategy",
 				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)))
-			return func(target, original *resource.Info) error {
+			return func(original, target *resource.Info) error {
 				if err := replaceResource(target, updateOptions.fieldValidationDirective); err != nil {
 					slog.Debug("error replacing the resource", "namespace", target.Namespace, "name", target.Name, "kind", target.Mapping.GroupVersionKind.Kind, slog.Any("error", err))
 					return err
@@ -706,7 +706,7 @@ func (c *Client) Update(original, target ResourceList, options ...ClientUpdateOp
 				slog.Bool("forceConflicts", updateOptions.forceConflicts),
 				slog.Bool("dryRun", updateOptions.dryRun),
 				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)))
-			return func(target, _ *resource.Info) error {
+			return func(_, target *resource.Info) error {
 				err := patchResourceServerSide(target, updateOptions.dryRun, updateOptions.forceConflicts, updateOptions.fieldValidationDirective)
 
 				logger := slog.With(
@@ -725,12 +725,12 @@ func (c *Client) Update(original, target ResourceList, options ...ClientUpdateOp
 		}
 
 		slog.Debug("using client-side apply for resource update", slog.Bool("threeWayMergeForUnstructured", updateOptions.threeWayMergeForUnstructured))
-		return func(target, original *resource.Info) error {
-			return patchResourceClientSide(target, original.Object, updateOptions.threeWayMergeForUnstructured)
+		return func(original, target *resource.Info) error {
+			return patchResourceClientSide(original.Object, target, updateOptions.threeWayMergeForUnstructured)
 		}
 	}
 
-	return c.update(target, original, makeUpdateApplyFunc())
+	return c.update(originals, targets, makeUpdateApplyFunc())
 }
 
 // Delete deletes Kubernetes resources specified in the resources list with
@@ -753,16 +753,16 @@ func deleteResources(resources ResourceList, propagation metav1.DeletionPropagat
 	var errs []error
 	res := &Result{}
 	mtx := sync.Mutex{}
-	err := perform(resources, func(info *resource.Info) error {
-		slog.Debug("starting delete resource", "namespace", info.Namespace, "name", info.Name, "kind", info.Mapping.GroupVersionKind.Kind)
-		err := deleteResource(info, propagation)
+	err := perform(resources, func(target *resource.Info) error {
+		slog.Debug("starting delete resource", "namespace", target.Namespace, "name", target.Name, "kind", target.Mapping.GroupVersionKind.Kind)
+		err := deleteResource(target, propagation)
 		if err == nil || apierrors.IsNotFound(err) {
 			if err != nil {
-				slog.Debug("ignoring delete failure", "namespace", info.Namespace, "name", info.Name, "kind", info.Mapping.GroupVersionKind.Kind, slog.Any("error", err))
+				slog.Debug("ignoring delete failure", "namespace", target.Namespace, "name", target.Name, "kind", target.Mapping.GroupVersionKind.Kind, slog.Any("error", err))
 			}
 			mtx.Lock()
 			defer mtx.Unlock()
-			res.Deleted = append(res.Deleted, info)
+			res.Deleted = append(res.Deleted, target)
 			return nil
 		}
 		mtx.Lock()
@@ -881,8 +881,8 @@ func deleteResource(info *resource.Info, policy metav1.DeletionPropagation) erro
 		})
 }
 
-func createPatch(target *resource.Info, current runtime.Object, threeWayMergeForUnstructured bool) ([]byte, types.PatchType, error) {
-	oldData, err := json.Marshal(current)
+func createPatch(original runtime.Object, target *resource.Info, threeWayMergeForUnstructured bool) ([]byte, types.PatchType, error) {
+	oldData, err := json.Marshal(original)
 	if err != nil {
 		return nil, types.StrategicMergePatchType, fmt.Errorf("serializing current configuration: %w", err)
 	}
@@ -963,9 +963,9 @@ func replaceResource(target *resource.Info, fieldValidationDirective FieldValida
 
 }
 
-func patchResourceClientSide(target *resource.Info, original runtime.Object, threeWayMergeForUnstructured bool) error {
+func patchResourceClientSide(original runtime.Object, target *resource.Info, threeWayMergeForUnstructured bool) error {
 
-	patch, patchType, err := createPatch(target, original, threeWayMergeForUnstructured)
+	patch, patchType, err := createPatch(original, target, threeWayMergeForUnstructured)
 	if err != nil {
 		return fmt.Errorf("failed to create patch: %w", err)
 	}
@@ -995,25 +995,25 @@ func patchResourceClientSide(target *resource.Info, original runtime.Object, thr
 }
 
 // Patch reource using server-side apply
-func patchResourceServerSide(info *resource.Info, dryRun bool, forceConflicts bool, fieldValidationDirective FieldValidationDirective) error {
+func patchResourceServerSide(target *resource.Info, dryRun bool, forceConflicts bool, fieldValidationDirective FieldValidationDirective) error {
 	helper := resource.NewHelper(
-		info.Client,
-		info.Mapping).
+		target.Client,
+		target.Mapping).
 		DryRun(dryRun).
 		WithFieldManager(ManagedFieldsManager).
 		WithFieldValidation(string(fieldValidationDirective))
 
 	// Send the full object to be applied on the server side.
-	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, info.Object)
+	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, target.Object)
 	if err != nil {
-		return fmt.Errorf("failed to encode object %s/%s with kind %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.Kind, err)
+		return fmt.Errorf("failed to encode object %s/%s with kind %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.Kind, err)
 	}
 	options := metav1.PatchOptions{
 		Force: &forceConflicts,
 	}
 	obj, err := helper.Patch(
-		info.Namespace,
-		info.Name,
+		target.Namespace,
+		target.Name,
 		types.ApplyPatchType,
 		data,
 		&options,
@@ -1024,13 +1024,13 @@ func patchResourceServerSide(info *resource.Info, dryRun bool, forceConflicts bo
 		}
 
 		if apierrors.IsConflict(err) {
-			return fmt.Errorf("conflict occurred while applying %s/%s with kind %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.Kind, err)
+			return fmt.Errorf("conflict occurred while applying %s/%s with kind %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.Kind, err)
 		}
 
 		return err
 	}
 
-	return info.Refresh(obj, true)
+	return target.Refresh(obj, true)
 }
 
 // GetPodList uses the kubernetes interface to get the list of pods filtered by listOptions
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 6fc2f1cc8..bdc5a9d7f 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -1083,8 +1083,8 @@ type createPatchTestCase struct {
 
 	// The target state.
 	target *unstructured.Unstructured
-	// The current state as it exists in the release.
-	current *unstructured.Unstructured
+	// The state as it exists in the release.
+	original *unstructured.Unstructured
 	// The actual state as it exists in the cluster.
 	actual *unstructured.Unstructured
 
@@ -1132,15 +1132,15 @@ func (c createPatchTestCase) run(t *testing.T) {
 		},
 	}
 
-	patch, patchType, err := createPatch(targetInfo, c.current, c.threeWayMergeForUnstructured)
+	patch, patchType, err := createPatch(c.original, targetInfo, c.threeWayMergeForUnstructured)
 	if err != nil {
 		t.Fatalf("Failed to create patch: %v", err)
 	}
 
 	if c.expectedPatch != string(patch) {
-		t.Errorf("Unexpected patch.\nTarget:\n%s\nCurrent:\n%s\nActual:\n%s\n\nExpected:\n%s\nGot:\n%s",
+		t.Errorf("Unexpected patch.\nTarget:\n%s\nOriginal:\n%s\nActual:\n%s\n\nExpected:\n%s\nGot:\n%s",
 			c.target,
-			c.current,
+			c.original,
 			c.actual,
 			c.expectedPatch,
 			string(patch),
@@ -1182,9 +1182,9 @@ func TestCreatePatchCustomResourceMetadata(t *testing.T) {
 		"objectset.rio.cattle.io/id":     "default-foo-simple",
 	}, nil)
 	testCase := createPatchTestCase{
-		name:    "take ownership of resource",
-		target:  target,
-		current: target,
+		name:     "take ownership of resource",
+		target:   target,
+		original: target,
 		actual: newTestCustomResourceData(nil, map[string]interface{}{
 			"color": "red",
 		}),
@@ -1206,9 +1206,9 @@ func TestCreatePatchCustomResourceSpec(t *testing.T) {
 		"size":  "large",
 	})
 	testCase := createPatchTestCase{
-		name:    "merge with spec of existing custom resource",
-		target:  target,
-		current: target,
+		name:     "merge with spec of existing custom resource",
+		target:   target,
+		original: target,
 		actual: newTestCustomResourceData(nil, map[string]interface{}{
 			"color":  "red",
 			"weight": "heavy",
@@ -1561,18 +1561,18 @@ func TestPatchResourceClientSide(t *testing.T) {
 				Client:               fake.CreateHTTPClient(client.Do),
 			}
 
-			resourceListCurrent, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.OriginalPods), nil)
+			resourceListOriginal, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.OriginalPods), nil)
 			require.NoError(t, err)
-			require.Len(t, resourceListCurrent, 1)
+			require.Len(t, resourceListOriginal, 1)
 
 			resourceListTarget, err := buildResourceList(testFactory, v1.NamespaceDefault, FieldValidationDirectiveStrict, objBody(&tc.TargetPods), nil)
 			require.NoError(t, err)
 			require.Len(t, resourceListTarget, 1)
 
-			current := resourceListCurrent[0]
+			original := resourceListOriginal[0]
 			target := resourceListTarget[0]
 
-			err = patchResourceClientSide(target, current.Object, tc.ThreeWayMergeForUnstructured)
+			err = patchResourceClientSide(original.Object, target, tc.ThreeWayMergeForUnstructured)
 			if tc.ExpectedErrorContains != "" {
 				require.ErrorContains(t, err, tc.ExpectedErrorContains)
 			} else {

From b2dc411f9d77f3bca969fb4ad955d4a091aa0454 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Tue, 12 Aug 2025 10:49:10 -0700
Subject: [PATCH 131/211] code review (error checks, collapse forceConflicts,
 UpdateApplyFunc)

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/hooks.go     |  2 +-
 pkg/action/install.go   |  8 +++---
 pkg/action/rollback.go  |  2 +-
 pkg/action/upgrade.go   |  2 +-
 pkg/kube/client.go      | 64 +++++++++++++++++++++--------------------
 pkg/kube/client_test.go | 16 +++++------
 6 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 95260e0e4..275a1bf52 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -75,7 +75,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 		// Create hook resources
 		if _, err := cfg.KubeClient.Create(
 			resources,
-			kube.ClientCreateOptionServerSideApply(false)); err != nil {
+			kube.ClientCreateOptionServerSideApply(false, false)); err != nil {
 			h.LastRun.CompletedAt = helmtime.Now()
 			h.LastRun.Phase = release.HookPhaseFailed
 			return fmt.Errorf("warning: Hook %s %s failed: %w", hook, h.Path, err)
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 9a9101f5d..b46b4446b 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -175,7 +175,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 		// Send them to Kube
 		if _, err := i.cfg.KubeClient.Create(
 			res,
-			kube.ClientCreateOptionServerSideApply(false)); err != nil {
+			kube.ClientCreateOptionServerSideApply(false, false)); err != nil {
 			// If the error is CRD already exists, continue.
 			if apierrors.IsAlreadyExists(err) {
 				crdName := res[0].Name
@@ -403,7 +403,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		}
 		if _, err := i.cfg.KubeClient.Create(
 			resourceList,
-			kube.ClientCreateOptionServerSideApply(false)); err != nil && !apierrors.IsAlreadyExists(err) {
+			kube.ClientCreateOptionServerSideApply(false, false)); err != nil && !apierrors.IsAlreadyExists(err) {
 			return nil, err
 		}
 	}
@@ -474,13 +474,13 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	if len(toBeAdopted) == 0 && len(resources) > 0 {
 		_, err = i.cfg.KubeClient.Create(
 			resources,
-			kube.ClientCreateOptionServerSideApply(false))
+			kube.ClientCreateOptionServerSideApply(false, false))
 	} else if len(resources) > 0 {
 		updateThreeWayMergeForUnstructured := i.TakeOwnership
 		_, err = i.cfg.KubeClient.Update(
 			toBeAdopted,
 			resources,
-			kube.ClientUpdateOptionServerSideApply(false),
+			kube.ClientUpdateOptionServerSideApply(false, false),
 			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured),
 			kube.ClientUpdateOptionForceReplace(i.ForceReplace))
 	}
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index f60d4f4bc..dd1f8c390 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -193,7 +193,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 	results, err := r.cfg.KubeClient.Update(
 		current,
 		target,
-		kube.ClientUpdateOptionServerSideApply(false),
+		kube.ClientUpdateOptionServerSideApply(false, false),
 		kube.ClientUpdateOptionForceReplace(r.ForceReplace))
 
 	if err != nil {
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index a32d6e78e..abf4342d3 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -429,7 +429,7 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 	results, err := u.cfg.KubeClient.Update(
 		current,
 		target,
-		kube.ClientUpdateOptionServerSideApply(false),
+		kube.ClientUpdateOptionServerSideApply(false, false),
 		kube.ClientUpdateOptionForceReplace(u.ForceReplace))
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index b436f518f..016055392 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -214,26 +214,23 @@ type ClientCreateOption func(*clientCreateOptions) error
 
 // ClientUpdateOptionServerSideApply enables performing object apply server-side
 // see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
-func ClientCreateOptionServerSideApply(serverSideApply bool) ClientCreateOption {
-	return func(o *clientCreateOptions) error {
-		o.serverSideApply = serverSideApply
-
-		return nil
-	}
-}
-
-// ClientCreateOptionForceConflicts forces field conflicts to be resolved
+//
+// `forceConflicts` forces conflicts to be resolved (may be  when serverSideApply enabled only)
 // see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
-// Only valid when ClientUpdateOptionServerSideApply enabled
-func ClientCreateOptionForceConflicts(forceConflicts bool) ClientCreateOption {
+func ClientCreateOptionServerSideApply(serverSideApply, forceConflicts bool) ClientCreateOption {
 	return func(o *clientCreateOptions) error {
+		if !serverSideApply && forceConflicts {
+			return fmt.Errorf("forceConflicts enabled when serverSideApply disabled")
+		}
+
+		o.serverSideApply = serverSideApply
 		o.forceConflicts = forceConflicts
 
 		return nil
 	}
 }
 
-// ClientCreateOptionDryRun performs non-mutating operations only
+// ClientCreateOptionDryRun requests the server to perform non-mutating operations only
 func ClientCreateOptionDryRun(dryRun bool) ClientCreateOption {
 	return func(o *clientCreateOptions) error {
 		o.dryRun = dryRun
@@ -264,8 +261,12 @@ func (c *Client) Create(resources ResourceList, options ...ClientCreateOption) (
 		fieldValidationDirective: FieldValidationDirectiveStrict,
 	}
 
+	errs := make([]error, 0, len(options))
 	for _, o := range options {
-		o(&createOptions)
+		errs = append(errs, o(&createOptions))
+	}
+	if err := errors.Join(errs...); err != nil {
+		return nil, fmt.Errorf("invalid client create option(s): %w", err)
 	}
 
 	if createOptions.forceConflicts && !createOptions.serverSideApply {
@@ -499,7 +500,7 @@ func (c *Client) BuildTable(reader io.Reader, validate bool) (ResourceList, erro
 		transformRequests)
 }
 
-func (c *Client) update(originals, targets ResourceList, updateApplyFunc func(original, target *resource.Info) error) (*Result, error) {
+func (c *Client) update(originals, targets ResourceList, updateApplyFunc UpdateApplyFunc) (*Result, error) {
 	updateErrors := []error{}
 	res := &Result{}
 
@@ -599,9 +600,17 @@ func ClientUpdateOptionThreeWayMergeForUnstructured(threeWayMergeForUnstructured
 // ClientUpdateOptionServerSideApply enables performing object apply server-side (default)
 // see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
 // Must not be enabled when ClientUpdateOptionThreeWayMerge is enabled
-func ClientUpdateOptionServerSideApply(serverSideApply bool) ClientUpdateOption {
+//
+// `forceConflicts` forces conflicts to be resolved (may be enabled when serverSideApply enabled only)
+// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+func ClientUpdateOptionServerSideApply(serverSideApply, forceConflicts bool) ClientUpdateOption {
 	return func(o *clientUpdateOptions) error {
+		if !serverSideApply && forceConflicts {
+			return fmt.Errorf("forceConflicts enabled when serverSideApply disabled")
+		}
+
 		o.serverSideApply = serverSideApply
+		o.forceConflicts = forceConflicts
 
 		return nil
 	}
@@ -617,20 +626,7 @@ func ClientUpdateOptionForceReplace(forceReplace bool) ClientUpdateOption {
 	}
 }
 
-// ClientUpdateOptionForceConflicts forces field conflicts to be resolved
-// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
-// Must not be enabled when ClientUpdateOptionForceReplace is enabled
-func ClientUpdateOptionForceConflicts(forceConflicts bool) ClientUpdateOption {
-	return func(o *clientUpdateOptions) error {
-		o.forceConflicts = forceConflicts
-
-		return nil
-	}
-}
-
-// ClientUpdateOptionForceConflicts forces field conflicts to be resolved
-// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
-// Must not be enabled when ClientUpdateOptionForceReplace is enabled
+// ClientUpdateOptionDryRun requests the server to perform non-mutating operations only
 func ClientUpdateOptionDryRun(dryRun bool) ClientUpdateOption {
 	return func(o *clientUpdateOptions) error {
 		o.dryRun = dryRun
@@ -652,6 +648,8 @@ func ClientUpdateOptionFieldValidationDirective(fieldValidationDirective FieldVa
 	}
 }
 
+type UpdateApplyFunc func(original, target *resource.Info) error
+
 // Update takes the current list of objects and target list of objects and
 // creates resources that don't already exist, updates resources that have been
 // modified in the target configuration, and deletes resources from the current
@@ -667,8 +665,12 @@ func (c *Client) Update(originals, targets ResourceList, options ...ClientUpdate
 		fieldValidationDirective: FieldValidationDirectiveStrict,
 	}
 
+	errs := make([]error, 0, len(options))
 	for _, o := range options {
-		o(&updateOptions)
+		errs = append(errs, o(&updateOptions))
+	}
+	if err := errors.Join(errs...); err != nil {
+		return nil, fmt.Errorf("invalid client update option(s): %w", err)
 	}
 
 	if updateOptions.threeWayMergeForUnstructured && updateOptions.serverSideApply {
@@ -683,7 +685,7 @@ func (c *Client) Update(originals, targets ResourceList, options ...ClientUpdate
 		return nil, fmt.Errorf("invalid operation: cannot use server-side apply and force replace together")
 	}
 
-	makeUpdateApplyFunc := func() func(original, target *resource.Info) error {
+	makeUpdateApplyFunc := func() UpdateApplyFunc {
 		if updateOptions.forceReplace {
 			slog.Debug(
 				"using resource replace update strategy",
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index bdc5a9d7f..5060a5fc2 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -292,7 +292,7 @@ func TestCreate(t *testing.T) {
 
 			result, err := c.Create(
 				list,
-				ClientCreateOptionServerSideApply(tc.ServerSideApply))
+				ClientCreateOptionServerSideApply(tc.ServerSideApply, false))
 			if tc.ExpectedErrorContains != "" {
 				require.ErrorContains(t, err, tc.ExpectedErrorContains)
 			} else {
@@ -467,7 +467,7 @@ func TestUpdate(t *testing.T) {
 				second,
 				ClientUpdateOptionThreeWayMergeForUnstructured(tc.ThreeWayMergeForUnstructured),
 				ClientUpdateOptionForceReplace(false),
-				ClientUpdateOptionServerSideApply(tc.ServerSideApply))
+				ClientUpdateOptionServerSideApply(tc.ServerSideApply, false))
 			require.NoError(t, err)
 
 			assert.Len(t, result.Created, 1, "expected 1 resource created, got %d", len(result.Created))
@@ -684,7 +684,7 @@ func TestWait(t *testing.T) {
 
 	result, err := c.Create(
 		resources,
-		ClientCreateOptionServerSideApply(false))
+		ClientCreateOptionServerSideApply(false, false))
 
 	if err != nil {
 		t.Fatal(err)
@@ -744,7 +744,7 @@ func TestWaitJob(t *testing.T) {
 	}
 	result, err := c.Create(
 		resources,
-		ClientCreateOptionServerSideApply(false))
+		ClientCreateOptionServerSideApply(false, false))
 
 	if err != nil {
 		t.Fatal(err)
@@ -806,7 +806,7 @@ func TestWaitDelete(t *testing.T) {
 	}
 	result, err := c.Create(
 		resources,
-		ClientCreateOptionServerSideApply(false))
+		ClientCreateOptionServerSideApply(false, false))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1225,7 +1225,6 @@ func TestCreatePatchCustomResourceSpec(t *testing.T) {
 	t.Run(testCase.name, testCase.run)
 }
 
-<<<<<<< HEAD
 type errorFactory struct {
 	*cmdtesting.TestFactory
 	err error
@@ -1326,8 +1325,8 @@ func TestIsReachable(t *testing.T) {
 			}
 		})
 	}
-||||||| parent of 36a476ff4 (Kube client support server-side apply)
-=======
+}
+
 func TestIsIncompatibleServerError(t *testing.T) {
 	testCases := map[string]struct {
 		Err  error
@@ -1749,5 +1748,4 @@ func TestDetermineFieldValidationDirective(t *testing.T) {
 
 	assert.Equal(t, FieldValidationDirectiveIgnore, determineFieldValidationDirective(false))
 	assert.Equal(t, FieldValidationDirectiveStrict, determineFieldValidationDirective(true))
->>>>>>> 36a476ff4 (Kube client support server-side apply)
 }

From fab70472af3c4057f2e12019ae6bde1e1c2d013b Mon Sep 17 00:00:00 2001
From: joemicky <joemickychang@outlook.com>
Date: Thu, 14 Aug 2025 19:21:52 +0800
Subject: [PATCH 132/211] refactor: replace []byte(fmt.Sprintf) with
 fmt.Appendf

Signed-off-by: joemicky <joemickychang@outlook.com>
---
 internal/chart/v3/util/create.go | 4 ++--
 pkg/chart/v2/util/create.go      | 4 ++--
 pkg/registry/utils_test.go       | 2 +-
 pkg/repo/repotest/server.go      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/chart/v3/util/create.go b/internal/chart/v3/util/create.go
index 72fed5955..6a28f99d4 100644
--- a/internal/chart/v3/util/create.go
+++ b/internal/chart/v3/util/create.go
@@ -733,12 +733,12 @@ func Create(name, dir string) (string, error) {
 		{
 			// Chart.yaml
 			path:    filepath.Join(cdir, ChartfileName),
-			content: []byte(fmt.Sprintf(defaultChartfile, name)),
+			content: fmt.Appendf(nil, defaultChartfile, name),
 		},
 		{
 			// values.yaml
 			path:    filepath.Join(cdir, ValuesfileName),
-			content: []byte(fmt.Sprintf(defaultValues, name)),
+			content: fmt.Appendf(nil, defaultValues, name),
 		},
 		{
 			// .helmignore
diff --git a/pkg/chart/v2/util/create.go b/pkg/chart/v2/util/create.go
index e9cf3c2c6..a8ae3ab40 100644
--- a/pkg/chart/v2/util/create.go
+++ b/pkg/chart/v2/util/create.go
@@ -733,12 +733,12 @@ func Create(name, dir string) (string, error) {
 		{
 			// Chart.yaml
 			path:    filepath.Join(cdir, ChartfileName),
-			content: []byte(fmt.Sprintf(defaultChartfile, name)),
+			content: fmt.Appendf(nil, defaultChartfile, name),
 		},
 		{
 			// values.yaml
 			path:    filepath.Join(cdir, ValuesfileName),
-			content: []byte(fmt.Sprintf(defaultValues, name)),
+			content: fmt.Appendf(nil, defaultValues, name),
 		},
 		{
 			// .helmignore
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index f4ff5bd58..b46317fc6 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -121,7 +121,7 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
 	pwBytes, err := bcrypt.GenerateFromPassword([]byte(testPassword), bcrypt.DefaultCost)
 	suite.Nil(err, "no error generating bcrypt password for test htpasswd file")
 	htpasswdPath := filepath.Join(suite.WorkspaceDir, testHtpasswdFileBasename)
-	err = os.WriteFile(htpasswdPath, []byte(fmt.Sprintf("%s:%s\n", testUsername, string(pwBytes))), 0644)
+	err = os.WriteFile(htpasswdPath, fmt.Appendf(nil, "%s:%s\n", testUsername, string(pwBytes)), 0644)
 	suite.Nil(err, "no error creating test htpasswd file")
 
 	// Registry config
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go
index 7ff028b90..8f9f82281 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/repotest/server.go
@@ -169,7 +169,7 @@ func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) {
 		t.Fatal("error generating bcrypt password for test htpasswd file")
 	}
 	htpasswdPath := filepath.Join(dir, testHtpasswdFileBasename)
-	err = os.WriteFile(htpasswdPath, []byte(fmt.Sprintf("%s:%s\n", testUsername, string(pwBytes))), 0o644)
+	err = os.WriteFile(htpasswdPath, fmt.Appendf(nil, "%s:%s\n", testUsername, string(pwBytes)), 0o644)
 	if err != nil {
 		t.Fatalf("error creating test htpasswd file")
 	}

From a3d2da4d2e3732ac9888c490a356722428abcfaa Mon Sep 17 00:00:00 2001
From: joemicky <joemickychang@outlook.com>
Date: Thu, 14 Aug 2025 19:27:39 +0800
Subject: [PATCH 133/211] refactor: replace HasPrefix+TrimPrefix with CutPrefix

Signed-off-by: joemicky <joemickychang@outlook.com>
---
 pkg/cmd/release_testing.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/cmd/release_testing.go b/pkg/cmd/release_testing.go
index b43b67ca0..b660a16c5 100644
--- a/pkg/cmd/release_testing.go
+++ b/pkg/cmd/release_testing.go
@@ -59,8 +59,8 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 			client.Namespace = settings.Namespace()
 			notName := regexp.MustCompile(`^!\s?name=`)
 			for _, f := range filter {
-				if strings.HasPrefix(f, "name=") {
-					client.Filters[action.IncludeNameFilter] = append(client.Filters[action.IncludeNameFilter], strings.TrimPrefix(f, "name="))
+				if after, ok := strings.CutPrefix(f, "name="); ok {
+					client.Filters[action.IncludeNameFilter] = append(client.Filters[action.IncludeNameFilter], after)
 				} else if notName.MatchString(f) {
 					client.Filters[action.ExcludeNameFilter] = append(client.Filters[action.ExcludeNameFilter], notName.ReplaceAllLiteralString(f, ""))
 				}

From 762ef3ee80caa67f371f7759e8299b6bc23d1263 Mon Sep 17 00:00:00 2001
From: joemicky <joemickychang@outlook.com>
Date: Thu, 14 Aug 2025 19:30:33 +0800
Subject: [PATCH 134/211] refactor: omit unnecessary reassignment

Signed-off-by: joemicky <joemickychang@outlook.com>
---
 pkg/action/install_test.go | 1 -
 pkg/cmd/load_plugins.go    | 1 -
 pkg/repo/index_test.go     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 1882f19e7..424ee6135 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -890,7 +890,6 @@ func TestNameAndChartGenerateName(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index 5c7f618eb..8def7f9fa 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -63,7 +63,6 @@ func loadPlugins(baseCmd *cobra.Command, out io.Writer) {
 
 	// Now we create commands for all of these.
 	for _, plug := range found {
-		plug := plug
 		md := plug.Metadata
 		if md.Usage == "" {
 			md.Usage = fmt.Sprintf("the %q plugin", md.Name)
diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go
index 7810d3ac0..a8aadadec 100644
--- a/pkg/repo/index_test.go
+++ b/pkg/repo/index_test.go
@@ -160,7 +160,6 @@ func TestLoadIndex(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			i, err := LoadIndexFile(tc.Filename)

From fa73b6743be24c69b3cc32f749bc3c8ec65a0113 Mon Sep 17 00:00:00 2001
From: Isaiah Lewis <isaiah@roof12.com>
Date: Fri, 15 Aug 2025 07:31:30 -0700
Subject: [PATCH 135/211] fix(helm-lint): Add HTTP/HTTPS URL support for json
 schema references

Signed-off-by: Isaiah Lewis <isaiah@roof12.com>
---
 pkg/chart/v2/util/jsonschema.go      | 48 ++++++++++++++++++++++++++++
 pkg/chart/v2/util/jsonschema_test.go | 40 +++++++++++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/pkg/chart/v2/util/jsonschema.go b/pkg/chart/v2/util/jsonschema.go
index 820e5953a..96fd207b9 100644
--- a/pkg/chart/v2/util/jsonschema.go
+++ b/pkg/chart/v2/util/jsonschema.go
@@ -21,13 +21,53 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"net/http"
 	"strings"
+	"time"
 
 	"github.com/santhosh-tekuri/jsonschema/v6"
 
+	"helm.sh/helm/v4/internal/version"
+
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
+// HTTPURLLoader implements a loader for HTTP/HTTPS URLs
+type HTTPURLLoader http.Client
+
+func (l *HTTPURLLoader) Load(urlStr string) (any, error) {
+	client := (*http.Client)(l)
+
+	req, err := http.NewRequest(http.MethodGet, urlStr, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create HTTP request for %s: %w", urlStr, err)
+	}
+	req.Header.Set("User-Agent", version.GetUserAgent())
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("HTTP request failed for %s: %w", urlStr, err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("HTTP request to %s returned status %d (%s)", urlStr, resp.StatusCode, http.StatusText(resp.StatusCode))
+	}
+
+	return jsonschema.UnmarshalJSON(resp.Body)
+}
+
+// newHTTPURLLoader creates a HTTP URL loader with proxy support.
+func newHTTPURLLoader() *HTTPURLLoader {
+	httpLoader := HTTPURLLoader(http.Client{
+		Timeout: 15 * time.Second,
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		},
+	})
+	return &httpLoader
+}
+
 // ValidateAgainstSchema checks that values does not violate the structure laid out in schema
 func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
 	var sb strings.Builder
@@ -71,7 +111,15 @@ func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error
 	}
 	slog.Debug("unmarshalled JSON schema", "schema", schemaJSON)
 
+	// Configure compiler with loaders for different URL schemes
+	loader := jsonschema.SchemeURLLoader{
+		"file":  jsonschema.FileLoader{},
+		"http":  newHTTPURLLoader(),
+		"https": newHTTPURLLoader(),
+	}
+
 	compiler := jsonschema.NewCompiler()
+	compiler.UseLoader(loader)
 	err = compiler.AddResource("file:///values.schema.json", schema)
 	if err != nil {
 		return err
diff --git a/pkg/chart/v2/util/jsonschema_test.go b/pkg/chart/v2/util/jsonschema_test.go
index 3279eb0db..cd95b7faf 100644
--- a/pkg/chart/v2/util/jsonschema_test.go
+++ b/pkg/chart/v2/util/jsonschema_test.go
@@ -17,7 +17,10 @@ limitations under the License.
 package util
 
 import (
+	"net/http"
+	"net/http/httptest"
 	"os"
+	"strings"
 	"testing"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
@@ -245,3 +248,40 @@ func TestValidateAgainstSchema2020Negative(t *testing.T) {
 		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
 	}
 }
+
+func TestHTTPURLLoader_Load(t *testing.T) {
+	// Test successful JSON schema loading
+	t.Run("successful load", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte(`{"type": "object", "properties": {"name": {"type": "string"}}}`))
+		}))
+		defer server.Close()
+
+		loader := newHTTPURLLoader()
+		result, err := loader.Load(server.URL)
+		if err != nil {
+			t.Fatalf("Expected no error, got: %v", err)
+		}
+		if result == nil {
+			t.Fatal("Expected result to be non-nil")
+		}
+	})
+
+	t.Run("HTTP error status", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+			w.WriteHeader(http.StatusNotFound)
+		}))
+		defer server.Close()
+
+		loader := newHTTPURLLoader()
+		_, err := loader.Load(server.URL)
+		if err == nil {
+			t.Fatal("Expected error for HTTP 404")
+		}
+		if !strings.Contains(err.Error(), "404") {
+			t.Errorf("Expected error message to contain '404', got: %v", err)
+		}
+	})
+}

From a1c84f9a4c7a0bc0ae7598a1e46a83333aff0681 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Sat, 16 Aug 2025 14:42:00 -0700
Subject: [PATCH 136/211] Move pkg/plugin -> internal/plugin

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 {pkg => internal}/plugin/cache/cache.go                       | 2 +-
 {pkg => internal}/plugin/hooks.go                             | 2 +-
 {pkg => internal}/plugin/installer/base.go                    | 2 +-
 {pkg => internal}/plugin/installer/base_test.go               | 2 +-
 {pkg => internal}/plugin/installer/doc.go                     | 2 +-
 {pkg => internal}/plugin/installer/http_installer.go          | 4 ++--
 {pkg => internal}/plugin/installer/http_installer_test.go     | 2 +-
 {pkg => internal}/plugin/installer/installer.go               | 2 +-
 {pkg => internal}/plugin/installer/installer_test.go          | 0
 {pkg => internal}/plugin/installer/local_installer.go         | 2 +-
 {pkg => internal}/plugin/installer/local_installer_test.go    | 2 +-
 {pkg => internal}/plugin/installer/vcs_installer.go           | 4 ++--
 {pkg => internal}/plugin/installer/vcs_installer_test.go      | 2 +-
 {pkg => internal}/plugin/plugin.go                            | 0
 {pkg => internal}/plugin/plugin_test.go                       | 0
 .../plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml | 0
 .../plugin/testdata/plugdir/good/downloader/plugin.yaml       | 0
 .../plugin/testdata/plugdir/good/echo/plugin.yaml             | 0
 .../plugin/testdata/plugdir/good/hello/hello.ps1              | 0
 {pkg => internal}/plugin/testdata/plugdir/good/hello/hello.sh | 0
 .../plugin/testdata/plugdir/good/hello/plugin.yaml            | 0
 pkg/cmd/load_plugins.go                                       | 2 +-
 pkg/cmd/plugin.go                                             | 2 +-
 pkg/cmd/plugin_install.go                                     | 4 ++--
 pkg/cmd/plugin_list.go                                        | 2 +-
 pkg/cmd/plugin_uninstall.go                                   | 2 +-
 pkg/cmd/plugin_update.go                                      | 4 ++--
 pkg/getter/plugingetter.go                                    | 2 +-
 28 files changed, 23 insertions(+), 23 deletions(-)
 rename {pkg => internal}/plugin/cache/cache.go (96%)
 rename {pkg => internal}/plugin/hooks.go (94%)
 rename {pkg => internal}/plugin/installer/base.go (93%)
 rename {pkg => internal}/plugin/installer/base_test.go (94%)
 rename {pkg => internal}/plugin/installer/doc.go (89%)
 rename {pkg => internal}/plugin/installer/http_installer.go (98%)
 rename {pkg => internal}/plugin/installer/http_installer_test.go (99%)
 rename {pkg => internal}/plugin/installer/installer.go (99%)
 rename {pkg => internal}/plugin/installer/installer_test.go (100%)
 rename {pkg => internal}/plugin/installer/local_installer.go (95%)
 rename {pkg => internal}/plugin/installer/local_installer_test.go (96%)
 rename {pkg => internal}/plugin/installer/vcs_installer.go (97%)
 rename {pkg => internal}/plugin/installer/vcs_installer_test.go (98%)
 rename {pkg => internal}/plugin/plugin.go (100%)
 rename {pkg => internal}/plugin/plugin_test.go (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/good/downloader/plugin.yaml (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/good/echo/plugin.yaml (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/good/hello/hello.ps1 (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/good/hello/hello.sh (100%)
 rename {pkg => internal}/plugin/testdata/plugdir/good/hello/plugin.yaml (100%)

diff --git a/pkg/plugin/cache/cache.go b/internal/plugin/cache/cache.go
similarity index 96%
rename from pkg/plugin/cache/cache.go
rename to internal/plugin/cache/cache.go
index f3e847374..f3b737477 100644
--- a/pkg/plugin/cache/cache.go
+++ b/internal/plugin/cache/cache.go
@@ -14,7 +14,7 @@ limitations under the License.
 */
 
 // Package cache provides a key generator for vcs urls.
-package cache // import "helm.sh/helm/v4/pkg/plugin/cache"
+package cache // import "helm.sh/helm/v4/internal/plugin/cache"
 
 import (
 	"net/url"
diff --git a/pkg/plugin/hooks.go b/internal/plugin/hooks.go
similarity index 94%
rename from pkg/plugin/hooks.go
rename to internal/plugin/hooks.go
index 10dc8580e..7b4ff5a38 100644
--- a/pkg/plugin/hooks.go
+++ b/internal/plugin/hooks.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/v4/pkg/plugin"
+package plugin // import "helm.sh/helm/v4/internal/plugin"
 
 // Types of hooks
 const (
diff --git a/pkg/plugin/installer/base.go b/internal/plugin/installer/base.go
similarity index 93%
rename from pkg/plugin/installer/base.go
rename to internal/plugin/installer/base.go
index 3738246ee..c21a245a8 100644
--- a/pkg/plugin/installer/base.go
+++ b/internal/plugin/installer/base.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"path/filepath"
diff --git a/pkg/plugin/installer/base_test.go b/internal/plugin/installer/base_test.go
similarity index 94%
rename from pkg/plugin/installer/base_test.go
rename to internal/plugin/installer/base_test.go
index 732ac7927..62b77bde5 100644
--- a/pkg/plugin/installer/base_test.go
+++ b/internal/plugin/installer/base_test.go
@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"testing"
diff --git a/pkg/plugin/installer/doc.go b/internal/plugin/installer/doc.go
similarity index 89%
rename from pkg/plugin/installer/doc.go
rename to internal/plugin/installer/doc.go
index b927dbd37..a4cf384bf 100644
--- a/pkg/plugin/installer/doc.go
+++ b/internal/plugin/installer/doc.go
@@ -14,4 +14,4 @@ limitations under the License.
 */
 
 // Package installer provides an interface for installing Helm plugins.
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
diff --git a/pkg/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go
similarity index 98%
rename from pkg/plugin/installer/http_installer.go
rename to internal/plugin/installer/http_installer.go
index 3bcf71208..b168f8646 100644
--- a/pkg/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"archive/tar"
@@ -32,11 +32,11 @@ import (
 
 	securejoin "github.com/cyphar/filepath-securejoin"
 
+	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/plugin/cache"
 )
 
 // HTTPInstaller installs plugins from an archive served by a web server.
diff --git a/pkg/plugin/installer/http_installer_test.go b/internal/plugin/installer/http_installer_test.go
similarity index 99%
rename from pkg/plugin/installer/http_installer_test.go
rename to internal/plugin/installer/http_installer_test.go
index ed4b73b35..92521474e 100644
--- a/pkg/plugin/installer/http_installer_test.go
+++ b/internal/plugin/installer/http_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"archive/tar"
diff --git a/pkg/plugin/installer/installer.go b/internal/plugin/installer/installer.go
similarity index 99%
rename from pkg/plugin/installer/installer.go
rename to internal/plugin/installer/installer.go
index d88737ebf..e14f16018 100644
--- a/pkg/plugin/installer/installer.go
+++ b/internal/plugin/installer/installer.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )
 
 // ErrMissingMetadata indicates that plugin.yaml is missing.
diff --git a/pkg/plugin/installer/installer_test.go b/internal/plugin/installer/installer_test.go
similarity index 100%
rename from pkg/plugin/installer/installer_test.go
rename to internal/plugin/installer/installer_test.go
diff --git a/pkg/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go
similarity index 95%
rename from pkg/plugin/installer/local_installer.go
rename to internal/plugin/installer/local_installer.go
index 109f4f236..211904108 100644
--- a/pkg/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"errors"
diff --git a/pkg/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
similarity index 96%
rename from pkg/plugin/installer/local_installer_test.go
rename to internal/plugin/installer/local_installer_test.go
index 9effcd2c4..ef5660d7d 100644
--- a/pkg/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"os"
diff --git a/pkg/plugin/installer/vcs_installer.go b/internal/plugin/installer/vcs_installer.go
similarity index 97%
rename from pkg/plugin/installer/vcs_installer.go
rename to internal/plugin/installer/vcs_installer.go
index 3e53cbf11..3601ec7a8 100644
--- a/pkg/plugin/installer/vcs_installer.go
+++ b/internal/plugin/installer/vcs_installer.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"errors"
@@ -26,9 +26,9 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/Masterminds/vcs"
 
+	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/plugin/cache"
 )
 
 // VCSInstaller installs plugins from remote a repository.
diff --git a/pkg/plugin/installer/vcs_installer_test.go b/internal/plugin/installer/vcs_installer_test.go
similarity index 98%
rename from pkg/plugin/installer/vcs_installer_test.go
rename to internal/plugin/installer/vcs_installer_test.go
index 491d58a3f..76b337a2f 100644
--- a/pkg/plugin/installer/vcs_installer_test.go
+++ b/internal/plugin/installer/vcs_installer_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
 	"fmt"
diff --git a/pkg/plugin/plugin.go b/internal/plugin/plugin.go
similarity index 100%
rename from pkg/plugin/plugin.go
rename to internal/plugin/plugin.go
diff --git a/pkg/plugin/plugin_test.go b/internal/plugin/plugin_test.go
similarity index 100%
rename from pkg/plugin/plugin_test.go
rename to internal/plugin/plugin_test.go
diff --git a/pkg/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml b/internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
similarity index 100%
rename from pkg/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
rename to internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
diff --git a/pkg/plugin/testdata/plugdir/good/downloader/plugin.yaml b/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
similarity index 100%
rename from pkg/plugin/testdata/plugdir/good/downloader/plugin.yaml
rename to internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
diff --git a/pkg/plugin/testdata/plugdir/good/echo/plugin.yaml b/internal/plugin/testdata/plugdir/good/echo/plugin.yaml
similarity index 100%
rename from pkg/plugin/testdata/plugdir/good/echo/plugin.yaml
rename to internal/plugin/testdata/plugdir/good/echo/plugin.yaml
diff --git a/pkg/plugin/testdata/plugdir/good/hello/hello.ps1 b/internal/plugin/testdata/plugdir/good/hello/hello.ps1
similarity index 100%
rename from pkg/plugin/testdata/plugdir/good/hello/hello.ps1
rename to internal/plugin/testdata/plugdir/good/hello/hello.ps1
diff --git a/pkg/plugin/testdata/plugdir/good/hello/hello.sh b/internal/plugin/testdata/plugdir/good/hello/hello.sh
similarity index 100%
rename from pkg/plugin/testdata/plugdir/good/hello/hello.sh
rename to internal/plugin/testdata/plugdir/good/hello/hello.sh
diff --git a/pkg/plugin/testdata/plugdir/good/hello/plugin.yaml b/internal/plugin/testdata/plugdir/good/hello/plugin.yaml
similarity index 100%
rename from pkg/plugin/testdata/plugdir/good/hello/plugin.yaml
rename to internal/plugin/testdata/plugdir/good/hello/plugin.yaml
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index 8def7f9fa..e340ba1b6 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -31,7 +31,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )
 
 const (
diff --git a/pkg/cmd/plugin.go b/pkg/cmd/plugin.go
index a2bb838df..76bc99915 100644
--- a/pkg/cmd/plugin.go
+++ b/pkg/cmd/plugin.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )
 
 const pluginHelp = `
diff --git a/pkg/cmd/plugin_install.go b/pkg/cmd/plugin_install.go
index 945bf8ee0..7dd1623e7 100644
--- a/pkg/cmd/plugin_install.go
+++ b/pkg/cmd/plugin_install.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/installer"
 	"helm.sh/helm/v4/pkg/cmd/require"
-	"helm.sh/helm/v4/pkg/plugin"
-	"helm.sh/helm/v4/pkg/plugin/installer"
 )
 
 type pluginInstallOptions struct {
diff --git a/pkg/cmd/plugin_list.go b/pkg/cmd/plugin_list.go
index 5bb9ff68d..faf41b91e 100644
--- a/pkg/cmd/plugin_list.go
+++ b/pkg/cmd/plugin_list.go
@@ -24,7 +24,7 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )
 
 func newPluginListCmd(out io.Writer) *cobra.Command {
diff --git a/pkg/cmd/plugin_uninstall.go b/pkg/cmd/plugin_uninstall.go
index ec73ad6df..808cad92f 100644
--- a/pkg/cmd/plugin_uninstall.go
+++ b/pkg/cmd/plugin_uninstall.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )
 
 type pluginUninstallOptions struct {
diff --git a/pkg/cmd/plugin_update.go b/pkg/cmd/plugin_update.go
index 59d884877..4fed3772d 100644
--- a/pkg/cmd/plugin_update.go
+++ b/pkg/cmd/plugin_update.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"helm.sh/helm/v4/pkg/plugin"
-	"helm.sh/helm/v4/pkg/plugin/installer"
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/installer"
 )
 
 type pluginUpdateOptions struct {
diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index 3b8185543..1893e8327 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/pkg/cli"
-	"helm.sh/helm/v4/pkg/plugin"
 )
 
 // collectPlugins scans for getter plugins.

From 4aa2240750595241a724c87118db3ff556bfc2e4 Mon Sep 17 00:00:00 2001
From: Evans Mungai <mbuevans@gmail.com>
Date: Mon, 18 Aug 2025 09:18:02 +0100
Subject: [PATCH 137/211] Run go mod tidy

Signed-off-by: Evans Mungai <mbuevans@gmail.com>
---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index e3ed6d975..688094670 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
-  github.com/fatih/color v1.18.0
+	github.com/fatih/color v1.18.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
 	github.com/gobwas/glob v0.2.3

From d918f919e02898d39cd0538886ff0cb224ecdd0b Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Mon, 18 Aug 2025 07:26:50 -0600
Subject: [PATCH 138/211] fix: stale issue workflow

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 .github/workflows/stale-issue-bot.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/stale-issue-bot.yaml b/.github/workflows/stale-issue-bot.yaml
index 613d2900c..e99b57cb8 100644
--- a/.github/workflows/stale-issue-bot.yaml
+++ b/.github/workflows/stale-issue-bot.yaml
@@ -2,8 +2,6 @@ name: "Close stale issues"
 on:
   schedule:
   - cron: "0 0 * * *"
-permissions:  
-  contents: read
 
 jobs:
   stale:
@@ -16,4 +14,4 @@ jobs:
         exempt-issue-labels: 'keep open,v4.x,in progress'
         days-before-stale: 90
         days-before-close: 30
-        operations-per-run: 100
+        operations-per-run: 200

From 77bbbbd84f99b557209570bbb10d4c199c0f46aa Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Mon, 18 Aug 2025 08:46:41 -0600
Subject: [PATCH 139/211] feature: add stale pr workflow

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 .github/workflows/{stale-issue-bot.yaml => stale.yaml} | 1 +
 1 file changed, 1 insertion(+)
 rename .github/workflows/{stale-issue-bot.yaml => stale.yaml} (73%)

diff --git a/.github/workflows/stale-issue-bot.yaml b/.github/workflows/stale.yaml
similarity index 73%
rename from .github/workflows/stale-issue-bot.yaml
rename to .github/workflows/stale.yaml
index e99b57cb8..3417e1734 100644
--- a/.github/workflows/stale-issue-bot.yaml
+++ b/.github/workflows/stale.yaml
@@ -11,6 +11,7 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'
+        stale-pr-message: 'This pull request has been marked as stale because it has been open for 90 days with no activity. This pull request will be automatically closed in 30 days if no further activity occurs.'
         exempt-issue-labels: 'keep open,v4.x,in progress'
         days-before-stale: 90
         days-before-close: 30

From 4bc93393bc2be6347b13d484a0b464a97c06ca2a Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Mon, 18 Aug 2025 10:40:23 -0600
Subject: [PATCH 140/211] feature: enable shuffle for unit tests

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0785fdb2e..0a20259bd 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ACCEPTANCE_RUN_TESTS=.
 PKG         := ./...
 TAGS        :=
 TESTS       := .
-TESTFLAGS   :=
+TESTFLAGS   := -shuffle=on -count=1
 LDFLAGS     := -w -s
 GOFLAGS     :=
 CGO_ENABLED ?= 0

From e2dcbe28bf964873fe91eb49f1d97b13f7d51783 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Sun, 27 Apr 2025 21:15:46 -0700
Subject: [PATCH 141/211] Helm client/SDK support server-side apply

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/action.go                     |   7 ++
 pkg/action/action_test.go                |   5 ++
 pkg/action/get_metadata.go               |   2 +
 pkg/action/hooks.go                      |   4 +-
 pkg/action/hooks_test.go                 |   3 +-
 pkg/action/install.go                    |  42 +++++----
 pkg/action/release_testing.go            |   3 +-
 pkg/action/rollback.go                   |  62 ++++++++-----
 pkg/action/uninstall.go                  |  16 ++--
 pkg/action/uninstall_test.go             |   3 +-
 pkg/action/upgrade.go                    |  88 +++++++++++++------
 pkg/action/upgrade_test.go               | 106 +++++++++++++++++++++++
 pkg/cmd/get_metadata.go                  |  17 ++++
 pkg/cmd/install.go                       |   4 +
 pkg/cmd/rollback.go                      |   4 +
 pkg/cmd/testdata/output/get-metadata.txt |   1 +
 pkg/cmd/upgrade.go                       |   4 +
 pkg/kube/fake/fake.go                    |  16 ++--
 pkg/kube/fake/printer.go                 |  22 ++---
 pkg/release/v1/release.go                |   8 ++
 20 files changed, 320 insertions(+), 97 deletions(-)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 69bcf4da2..5249c8cfa 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -520,3 +520,10 @@ func (cfg *Configuration) Init(getter genericclioptions.RESTClientGetter, namesp
 func (cfg *Configuration) SetHookOutputFunc(hookOutputFunc func(_, _, _ string) io.Writer) {
 	cfg.HookOutputFunc = hookOutputFunc
 }
+
+func determineReleaseSSApplyMethod(serverSideApply bool) release.ApplyMethod {
+	if serverSideApply {
+		return release.ApplyMethodServerSideApply
+	}
+	return release.ApplyMethodClientSideApply
+}
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 43cf94622..7a510ace6 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -946,3 +946,8 @@ func TestRenderResources_NoPostRenderer(t *testing.T) {
 	assert.NotNil(t, buf)
 	assert.Equal(t, "", notes)
 }
+
+func TestDetermineReleaseSSAApplyMethod(t *testing.T) {
+	assert.Equal(t, release.ApplyMethodClientSideApply, determineReleaseSSApplyMethod(false))
+	assert.Equal(t, release.ApplyMethodServerSideApply, determineReleaseSSApplyMethod(true))
+}
diff --git a/pkg/action/get_metadata.go b/pkg/action/get_metadata.go
index 4cb77361a..889545ddc 100644
--- a/pkg/action/get_metadata.go
+++ b/pkg/action/get_metadata.go
@@ -47,6 +47,7 @@ type Metadata struct {
 	Revision     int                 `json:"revision" yaml:"revision"`
 	Status       string              `json:"status" yaml:"status"`
 	DeployedAt   string              `json:"deployedAt" yaml:"deployedAt"`
+	ApplyMethod  string              `json:"applyMethod,omitempty" yaml:"applyMethod,omitempty"`
 }
 
 // NewGetMetadata creates a new GetMetadata object with the given configuration.
@@ -79,6 +80,7 @@ func (g *GetMetadata) Run(name string) (*Metadata, error) {
 		Revision:     rel.Version,
 		Status:       rel.Info.Status.String(),
 		DeployedAt:   rel.Info.LastDeployed.Format(time.RFC3339),
+		ApplyMethod:  rel.ApplyMethod,
 	}, nil
 }
 
diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 275a1bf52..458a6342c 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -33,7 +33,7 @@ import (
 )
 
 // execHook executes all of the hooks for the given hook event.
-func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, waitStrategy kube.WaitStrategy, timeout time.Duration) error {
+func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, waitStrategy kube.WaitStrategy, timeout time.Duration, serverSideApply bool) error {
 	executingHooks := []*release.Hook{}
 
 	for _, h := range rl.Hooks {
@@ -75,7 +75,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 		// Create hook resources
 		if _, err := cfg.KubeClient.Create(
 			resources,
-			kube.ClientCreateOptionServerSideApply(false, false)); err != nil {
+			kube.ClientCreateOptionServerSideApply(serverSideApply, false)); err != nil {
 			h.LastRun.CompletedAt = helmtime.Now()
 			h.LastRun.Phase = release.HookPhaseFailed
 			return fmt.Errorf("warning: Hook %s %s failed: %w", hook, h.Path, err)
diff --git a/pkg/action/hooks_test.go b/pkg/action/hooks_test.go
index ad1de2c59..e3a2c0808 100644
--- a/pkg/action/hooks_test.go
+++ b/pkg/action/hooks_test.go
@@ -385,7 +385,8 @@ data:
 				Capabilities: chartutil.DefaultCapabilities,
 			}
 
-			err := configuration.execHook(&tc.inputRelease, hookEvent, kube.StatusWatcherStrategy, 600)
+			serverSideApply := true
+			err := configuration.execHook(&tc.inputRelease, hookEvent, kube.StatusWatcherStrategy, 600, serverSideApply)
 
 			if !reflect.DeepEqual(kubeClient.deleteRecord, tc.expectedDeleteRecord) {
 				t.Fatalf("Got unexpected delete record, expected: %#v, but got: %#v", kubeClient.deleteRecord, tc.expectedDeleteRecord)
diff --git a/pkg/action/install.go b/pkg/action/install.go
index b46b4446b..f7482d466 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -75,7 +75,13 @@ type Install struct {
 	// ForceReplace will, if set to `true`, ignore certain warnings and perform the install anyway.
 	//
 	// This should be used with caution.
-	ForceReplace    bool
+	ForceReplace bool
+	// ForceConflicts causes server-side apply to force conflicts ("Overwrite value, become sole manager")
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+	ForceConflicts bool
+	// ServerSideApply when true (default) will enable changes to be applied via Kubernetes server-side apply
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
+	ServerSideApply bool
 	CreateNamespace bool
 	DryRun          bool
 	DryRunOption    string
@@ -145,7 +151,8 @@ type ChartPathOptions struct {
 // NewInstall creates a new Install object with the given configuration.
 func NewInstall(cfg *Configuration) *Install {
 	in := &Install{
-		cfg: cfg,
+		cfg:             cfg,
+		ServerSideApply: true,
 	}
 	in.registryClient = cfg.RegistryClient
 
@@ -175,7 +182,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 		// Send them to Kube
 		if _, err := i.cfg.KubeClient.Create(
 			res,
-			kube.ClientCreateOptionServerSideApply(false, false)); err != nil {
+			kube.ClientCreateOptionServerSideApply(i.ServerSideApply, i.ForceConflicts)); err != nil {
 			// If the error is CRD already exists, continue.
 			if apierrors.IsAlreadyExists(err) {
 				crdName := res[0].Name
@@ -403,7 +410,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		}
 		if _, err := i.cfg.KubeClient.Create(
 			resourceList,
-			kube.ClientCreateOptionServerSideApply(false, false)); err != nil && !apierrors.IsAlreadyExists(err) {
+			kube.ClientCreateOptionServerSideApply(i.ServerSideApply, false)); err != nil && !apierrors.IsAlreadyExists(err) {
 			return nil, err
 		}
 	}
@@ -415,8 +422,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 		}
 	}
 
-	// Store the release in history before continuing (new in Helm 3). We always know
-	// that this is a create operation.
+	// Store the release in history before continuing. We always know that this is a create operation
 	if err := i.cfg.Releases.Create(rel); err != nil {
 		// We could try to recover gracefully here, but since nothing has been installed
 		// yet, this is probably safer than trying to continue when we know storage is
@@ -463,7 +469,7 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	var err error
 	// pre-install hooks
 	if !i.DisableHooks {
-		if err := i.cfg.execHook(rel, release.HookPreInstall, i.WaitStrategy, i.Timeout); err != nil {
+		if err := i.cfg.execHook(rel, release.HookPreInstall, i.WaitStrategy, i.Timeout, i.ServerSideApply); err != nil {
 			return rel, fmt.Errorf("failed pre-install: %s", err)
 		}
 	}
@@ -474,15 +480,15 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	if len(toBeAdopted) == 0 && len(resources) > 0 {
 		_, err = i.cfg.KubeClient.Create(
 			resources,
-			kube.ClientCreateOptionServerSideApply(false, false))
+			kube.ClientCreateOptionServerSideApply(i.ServerSideApply, false))
 	} else if len(resources) > 0 {
-		updateThreeWayMergeForUnstructured := i.TakeOwnership
+		useUpdateThreeWayMergeForUnstructured := i.TakeOwnership && !i.ServerSideApply // Use three-way merge when taking ownership (and not using server-side apply)
 		_, err = i.cfg.KubeClient.Update(
 			toBeAdopted,
 			resources,
-			kube.ClientUpdateOptionServerSideApply(false, false),
-			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured),
-			kube.ClientUpdateOptionForceReplace(i.ForceReplace))
+			kube.ClientUpdateOptionForceReplace(i.ForceReplace),
+			kube.ClientUpdateOptionServerSideApply(i.ServerSideApply, i.ForceConflicts),
+			kube.ClientUpdateOptionThreeWayMergeForUnstructured(useUpdateThreeWayMergeForUnstructured))
 	}
 	if err != nil {
 		return rel, err
@@ -503,7 +509,7 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 	}
 
 	if !i.DisableHooks {
-		if err := i.cfg.execHook(rel, release.HookPostInstall, i.WaitStrategy, i.Timeout); err != nil {
+		if err := i.cfg.execHook(rel, release.HookPostInstall, i.WaitStrategy, i.Timeout, i.ServerSideApply); err != nil {
 			return rel, fmt.Errorf("failed post-install: %s", err)
 		}
 	}
@@ -580,7 +586,8 @@ func (i *Install) availableName() error {
 // createRelease creates a new release object
 func (i *Install) createRelease(chrt *chart.Chart, rawVals map[string]interface{}, labels map[string]string) *release.Release {
 	ts := i.cfg.Now()
-	return &release.Release{
+
+	r := &release.Release{
 		Name:      i.ReleaseName,
 		Namespace: i.Namespace,
 		Chart:     chrt,
@@ -590,9 +597,12 @@ func (i *Install) createRelease(chrt *chart.Chart, rawVals map[string]interface{
 			LastDeployed:  ts,
 			Status:        release.StatusUnknown,
 		},
-		Version: 1,
-		Labels:  labels,
+		Version:     1,
+		Labels:      labels,
+		ApplyMethod: string(determineReleaseSSApplyMethod(i.ServerSideApply)),
 	}
+
+	return r
 }
 
 // recordRelease with an update operation in case reuse has been set.
diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go
index b5f6fe712..009f4d793 100644
--- a/pkg/action/release_testing.go
+++ b/pkg/action/release_testing.go
@@ -96,7 +96,8 @@ func (r *ReleaseTesting) Run(name string) (*release.Release, error) {
 		rel.Hooks = executingHooks
 	}
 
-	if err := r.cfg.execHook(rel, release.HookTest, kube.StatusWatcherStrategy, r.Timeout); err != nil {
+	serverSideApply := rel.ApplyMethod == string(release.ApplyMethodServerSideApply)
+	if err := r.cfg.execHook(rel, release.HookTest, kube.StatusWatcherStrategy, r.Timeout, serverSideApply); err != nil {
 		rel.Hooks = append(skippedHooks, rel.Hooks...)
 		r.cfg.Releases.Update(rel)
 		return rel, err
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index dd1f8c390..5f0ed02f1 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -44,9 +44,17 @@ type Rollback struct {
 	// ForceReplace will, if set to `true`, ignore certain warnings and perform the rollback anyway.
 	//
 	// This should be used with caution.
-	ForceReplace  bool
-	CleanupOnFail bool
-	MaxHistory    int // MaxHistory limits the maximum number of revisions saved per release
+	ForceReplace bool
+	// ForceConflicts causes server-side apply to force conflicts ("Overwrite value, become sole manager")
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+	ForceConflicts bool
+	// ServerSideApply enables changes to be applied via Kubernetes server-side apply
+	// Can be the string: "true", "false" or "auto"
+	// When "auto", sever-side usage will be based upon the releases previous usage
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
+	ServerSideApply string
+	CleanupOnFail   bool
+	MaxHistory      int // MaxHistory limits the maximum number of revisions saved per release
 }
 
 // NewRollback creates a new Rollback object with the given configuration.
@@ -65,7 +73,7 @@ func (r *Rollback) Run(name string) error {
 	r.cfg.Releases.MaxHistory = r.MaxHistory
 
 	slog.Debug("preparing rollback", "name", name)
-	currentRelease, targetRelease, err := r.prepareRollback(name)
+	currentRelease, targetRelease, serverSideApply, err := r.prepareRollback(name)
 	if err != nil {
 		return err
 	}
@@ -78,7 +86,7 @@ func (r *Rollback) Run(name string) error {
 	}
 
 	slog.Debug("performing rollback", "name", name)
-	if _, err := r.performRollback(currentRelease, targetRelease); err != nil {
+	if _, err := r.performRollback(currentRelease, targetRelease, serverSideApply); err != nil {
 		return err
 	}
 
@@ -93,18 +101,18 @@ func (r *Rollback) Run(name string) error {
 
 // prepareRollback finds the previous release and prepares a new release object with
 // the previous release's configuration
-func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Release, error) {
+func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Release, bool, error) {
 	if err := chartutil.ValidateReleaseName(name); err != nil {
-		return nil, nil, fmt.Errorf("prepareRollback: Release name is invalid: %s", name)
+		return nil, nil, false, fmt.Errorf("prepareRollback: Release name is invalid: %s", name)
 	}
 
 	if r.Version < 0 {
-		return nil, nil, errInvalidRevision
+		return nil, nil, false, errInvalidRevision
 	}
 
 	currentRelease, err := r.cfg.Releases.Last(name)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	previousVersion := r.Version
@@ -114,7 +122,7 @@ func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Rele
 
 	historyReleases, err := r.cfg.Releases.History(name)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	// Check if the history version to be rolled back exists
@@ -127,14 +135,19 @@ func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Rele
 		}
 	}
 	if !previousVersionExist {
-		return nil, nil, fmt.Errorf("release has no %d version", previousVersion)
+		return nil, nil, false, fmt.Errorf("release has no %d version", previousVersion)
 	}
 
 	slog.Debug("rolling back", "name", name, "currentVersion", currentRelease.Version, "targetVersion", previousVersion)
 
 	previousRelease, err := r.cfg.Releases.Get(name, previousVersion)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
+	}
+
+	serverSideApply, err := getUpgradeServerSideValue(r.ServerSideApply, previousRelease.ApplyMethod)
+	if err != nil {
+		return nil, nil, false, err
 	}
 
 	// Store a new release object with previous release's configuration
@@ -152,16 +165,17 @@ func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Rele
 			// message here, and only override it later if we experience failure.
 			Description: fmt.Sprintf("Rollback to %d", previousVersion),
 		},
-		Version:  currentRelease.Version + 1,
-		Labels:   previousRelease.Labels,
-		Manifest: previousRelease.Manifest,
-		Hooks:    previousRelease.Hooks,
+		Version:     currentRelease.Version + 1,
+		Labels:      previousRelease.Labels,
+		Manifest:    previousRelease.Manifest,
+		Hooks:       previousRelease.Hooks,
+		ApplyMethod: string(determineReleaseSSApplyMethod(serverSideApply)),
 	}
 
-	return currentRelease, targetRelease, nil
+	return currentRelease, targetRelease, serverSideApply, nil
 }
 
-func (r *Rollback) performRollback(currentRelease, targetRelease *release.Release) (*release.Release, error) {
+func (r *Rollback) performRollback(currentRelease, targetRelease *release.Release, serverSideApply bool) (*release.Release, error) {
 	if r.DryRun {
 		slog.Debug("dry run", "name", targetRelease.Name)
 		return targetRelease, nil
@@ -177,15 +191,16 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 	}
 
 	// pre-rollback hooks
+
 	if !r.DisableHooks {
-		if err := r.cfg.execHook(targetRelease, release.HookPreRollback, r.WaitStrategy, r.Timeout); err != nil {
+		if err := r.cfg.execHook(targetRelease, release.HookPreRollback, r.WaitStrategy, r.Timeout, serverSideApply); err != nil {
 			return targetRelease, err
 		}
 	} else {
 		slog.Debug("rollback hooks disabled", "name", targetRelease.Name)
 	}
 
-	// It is safe to use "force" here because these are resources currently rendered by the chart.
+	// It is safe to use "forceOwnership" here because these are resources currently rendered by the chart.
 	err = target.Visit(setMetadataVisitor(targetRelease.Name, targetRelease.Namespace, true))
 	if err != nil {
 		return targetRelease, fmt.Errorf("unable to set metadata visitor from target release: %w", err)
@@ -193,8 +208,9 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 	results, err := r.cfg.KubeClient.Update(
 		current,
 		target,
-		kube.ClientUpdateOptionServerSideApply(false, false),
-		kube.ClientUpdateOptionForceReplace(r.ForceReplace))
+		kube.ClientUpdateOptionForceReplace(r.ForceReplace),
+		kube.ClientUpdateOptionServerSideApply(serverSideApply, r.ForceConflicts),
+		kube.ClientUpdateOptionThreeWayMergeForUnstructured(false))
 
 	if err != nil {
 		msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
@@ -239,7 +255,7 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 
 	// post-rollback hooks
 	if !r.DisableHooks {
-		if err := r.cfg.execHook(targetRelease, release.HookPostRollback, r.WaitStrategy, r.Timeout); err != nil {
+		if err := r.cfg.execHook(targetRelease, release.HookPostRollback, r.WaitStrategy, r.Timeout, serverSideApply); err != nil {
 			return targetRelease, err
 		}
 	}
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 163af290e..4444f4331 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -115,7 +115,8 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 	res := &release.UninstallReleaseResponse{Release: rel}
 
 	if !u.DisableHooks {
-		if err := u.cfg.execHook(rel, release.HookPreDelete, u.WaitStrategy, u.Timeout); err != nil {
+		serverSideApply := true
+		if err := u.cfg.execHook(rel, release.HookPreDelete, u.WaitStrategy, u.Timeout, serverSideApply); err != nil {
 			return res, err
 		}
 	} else {
@@ -144,7 +145,8 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 	}
 
 	if !u.DisableHooks {
-		if err := u.cfg.execHook(rel, release.HookPostDelete, u.WaitStrategy, u.Timeout); err != nil {
+		serverSideApply := true
+		if err := u.cfg.execHook(rel, release.HookPostDelete, u.WaitStrategy, u.Timeout, serverSideApply); err != nil {
 			errs = append(errs, err)
 		}
 	}
@@ -244,11 +246,13 @@ func (u *Uninstall) deleteRelease(rel *release.Release) (kube.ResourceList, stri
 		return nil, "", []error{fmt.Errorf("unable to build kubernetes objects for delete: %w", err)}
 	}
 	if len(resources) > 0 {
-		if kubeClient, ok := u.cfg.KubeClient.(kube.InterfaceDeletionPropagation); ok {
-			_, errs = kubeClient.DeleteWithPropagationPolicy(resources, parseCascadingFlag(u.DeletionPropagation))
-			return resources, kept, errs
+		if len(resources) > 0 {
+			if kubeClient, ok := u.cfg.KubeClient.(kube.InterfaceDeletionPropagation); ok {
+				_, errs = kubeClient.DeleteWithPropagationPolicy(resources, parseCascadingFlag(u.DeletionPropagation))
+				return resources, kept, errs
+			}
+			_, errs = u.cfg.KubeClient.Delete(resources)
 		}
-		_, errs = u.cfg.KubeClient.Delete(resources)
 	}
 	return resources, kept, errs
 }
diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go
index 44bd66d96..f7c9e5f44 100644
--- a/pkg/action/uninstall_test.go
+++ b/pkg/action/uninstall_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"helm.sh/helm/v4/pkg/kube"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
@@ -147,6 +148,6 @@ func TestUninstallRelease_Cascade(t *testing.T) {
 	failer.BuildDummy = true
 	unAction.cfg.KubeClient = failer
 	_, err := unAction.Run(rel.Name)
-	is.Error(err)
+	require.Error(t, err)
 	is.Contains(err.Error(), "failed to delete release: come-fail-away")
 }
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index abf4342d3..41ddf859f 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -81,6 +81,14 @@ type Upgrade struct {
 	//
 	// This should be used with caution.
 	ForceReplace bool
+	// ForceConflicts causes server-side apply to force conflicts ("Overwrite value, become sole manager")
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#conflicts
+	ForceConflicts bool
+	// ServerSideApply enables changes to be applied via Kubernetes server-side apply
+	// Can be the string: "true", "false" or "auto"
+	// When "auto", sever-side usage will be based upon the releases previous usage
+	// see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
+	ServerSideApply string
 	// ResetValues will reset the values to the chart's built-ins rather than merging with existing.
 	ResetValues bool
 	// ReuseValues will reuse the user's last supplied values.
@@ -127,7 +135,8 @@ type resultMessage struct {
 // NewUpgrade creates a new Upgrade object with the given configuration.
 func NewUpgrade(cfg *Configuration) *Upgrade {
 	up := &Upgrade{
-		cfg: cfg,
+		cfg:             cfg,
+		ServerSideApply: "auto",
 	}
 	up.registryClient = cfg.RegistryClient
 
@@ -162,7 +171,7 @@ func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart.
 	}
 
 	slog.Debug("preparing upgrade", "name", name)
-	currentRelease, upgradedRelease, err := u.prepareUpgrade(name, chart, vals)
+	currentRelease, upgradedRelease, serverSideApply, err := u.prepareUpgrade(name, chart, vals)
 	if err != nil {
 		return nil, err
 	}
@@ -170,7 +179,7 @@ func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart.
 	u.cfg.Releases.MaxHistory = u.MaxHistory
 
 	slog.Debug("performing update", "name", name)
-	res, err := u.performUpgrade(ctx, currentRelease, upgradedRelease)
+	res, err := u.performUpgrade(ctx, currentRelease, upgradedRelease, serverSideApply)
 	if err != nil {
 		return res, err
 	}
@@ -195,14 +204,14 @@ func (u *Upgrade) isDryRun() bool {
 }
 
 // prepareUpgrade builds an upgraded release for an upgrade operation.
-func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[string]interface{}) (*release.Release, *release.Release, error) {
+func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[string]interface{}) (*release.Release, *release.Release, bool, error) {
 	if chart == nil {
-		return nil, nil, errMissingChart
+		return nil, nil, false, errMissingChart
 	}
 
 	// HideSecret must be used with dry run. Otherwise, return an error.
 	if !u.isDryRun() && u.HideSecret {
-		return nil, nil, errors.New("hiding Kubernetes secrets requires a dry-run mode")
+		return nil, nil, false, errors.New("hiding Kubernetes secrets requires a dry-run mode")
 	}
 
 	// finds the last non-deleted release with the given name
@@ -210,14 +219,14 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 	if err != nil {
 		// to keep existing behavior of returning the "%q has no deployed releases" error when an existing release does not exist
 		if errors.Is(err, driver.ErrReleaseNotFound) {
-			return nil, nil, driver.NewErrNoDeployedReleases(name)
+			return nil, nil, false, driver.NewErrNoDeployedReleases(name)
 		}
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	// Concurrent `helm upgrade`s will either fail here with `errPending` or when creating the release with "already exists". This should act as a pessimistic lock.
 	if lastRelease.Info.Status.IsPending() {
-		return nil, nil, errPending
+		return nil, nil, false, errPending
 	}
 
 	var currentRelease *release.Release
@@ -232,7 +241,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 				(lastRelease.Info.Status == release.StatusFailed || lastRelease.Info.Status == release.StatusSuperseded) {
 				currentRelease = lastRelease
 			} else {
-				return nil, nil, err
+				return nil, nil, false, err
 			}
 		}
 	}
@@ -240,11 +249,11 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 	// determine if values will be reused
 	vals, err = u.reuseValues(chart, currentRelease, vals)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	if err := chartutil.ProcessDependencies(chart, vals); err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	// Increment revision count. This is passed to templates, and also stored on
@@ -260,11 +269,11 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 
 	caps, err := u.cfg.getCapabilities()
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 	valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chart, vals, options, caps, u.SkipSchemaValidation)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	// Determine whether or not to interact with remote
@@ -275,13 +284,20 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 
 	hooks, manifestDoc, notesTxt, err := u.cfg.renderResources(chart, valuesToRender, "", "", u.SubNotes, false, false, u.PostRenderer, interactWithRemote, u.EnableDNS, u.HideSecret)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, false, err
 	}
 
 	if driver.ContainsSystemLabels(u.Labels) {
-		return nil, nil, fmt.Errorf("user supplied labels contains system reserved label name. System labels: %+v", driver.GetSystemLabels())
+		return nil, nil, false, fmt.Errorf("user supplied labels contains system reserved label name. System labels: %+v", driver.GetSystemLabels())
 	}
 
+	serverSideApply, err := getUpgradeServerSideValue(u.ServerSideApply, lastRelease.ApplyMethod)
+	if err != nil {
+		return nil, nil, false, err
+	}
+
+	slog.Debug("determined release apply method", slog.Bool("server_side_apply", serverSideApply), slog.String("previous_release_apply_method", lastRelease.ApplyMethod))
+
 	// Store an upgraded release.
 	upgradedRelease := &release.Release{
 		Name:      name,
@@ -294,20 +310,21 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 			Status:        release.StatusPendingUpgrade,
 			Description:   "Preparing upgrade", // This should be overwritten later.
 		},
-		Version:  revision,
-		Manifest: manifestDoc.String(),
-		Hooks:    hooks,
-		Labels:   mergeCustomLabels(lastRelease.Labels, u.Labels),
+		Version:     revision,
+		Manifest:    manifestDoc.String(),
+		Hooks:       hooks,
+		Labels:      mergeCustomLabels(lastRelease.Labels, u.Labels),
+		ApplyMethod: string(determineReleaseSSApplyMethod(serverSideApply)),
 	}
 
 	if len(notesTxt) > 0 {
 		upgradedRelease.Info.Notes = notesTxt
 	}
 	err = validateManifest(u.cfg.KubeClient, manifestDoc.Bytes(), !u.DisableOpenAPIValidation)
-	return currentRelease, upgradedRelease, err
+	return currentRelease, upgradedRelease, serverSideApply, err
 }
 
-func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedRelease *release.Release) (*release.Release, error) {
+func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedRelease *release.Release, serverSideApply bool) (*release.Release, error) {
 	current, err := u.cfg.KubeClient.Build(bytes.NewBufferString(originalRelease.Manifest), false)
 	if err != nil {
 		// Checking for removed Kubernetes API error so can provide a more informative error message to the user
@@ -380,7 +397,7 @@ func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedR
 	ctxChan := make(chan resultMessage)
 	doneChan := make(chan interface{})
 	defer close(doneChan)
-	go u.releasingUpgrade(rChan, upgradedRelease, current, target, originalRelease)
+	go u.releasingUpgrade(rChan, upgradedRelease, current, target, originalRelease, serverSideApply)
 	go u.handleContext(ctx, doneChan, ctxChan, upgradedRelease)
 	select {
 	case result := <-rChan:
@@ -414,11 +431,11 @@ func (u *Upgrade) handleContext(ctx context.Context, done chan interface{}, c ch
 		return
 	}
 }
-func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *release.Release, current kube.ResourceList, target kube.ResourceList, originalRelease *release.Release) {
+func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *release.Release, current kube.ResourceList, target kube.ResourceList, originalRelease *release.Release, serverSideApply bool) {
 	// pre-upgrade hooks
 
 	if !u.DisableHooks {
-		if err := u.cfg.execHook(upgradedRelease, release.HookPreUpgrade, u.WaitStrategy, u.Timeout); err != nil {
+		if err := u.cfg.execHook(upgradedRelease, release.HookPreUpgrade, u.WaitStrategy, u.Timeout, serverSideApply); err != nil {
 			u.reportToPerformUpgrade(c, upgradedRelease, kube.ResourceList{}, fmt.Errorf("pre-upgrade hooks failed: %s", err))
 			return
 		}
@@ -429,8 +446,8 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 	results, err := u.cfg.KubeClient.Update(
 		current,
 		target,
-		kube.ClientUpdateOptionServerSideApply(false, false),
-		kube.ClientUpdateOptionForceReplace(u.ForceReplace))
+		kube.ClientUpdateOptionForceReplace(u.ForceReplace),
+		kube.ClientUpdateOptionServerSideApply(serverSideApply, u.ForceConflicts))
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
 		u.reportToPerformUpgrade(c, upgradedRelease, results.Created, err)
@@ -459,7 +476,7 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 
 	// post-upgrade hooks
 	if !u.DisableHooks {
-		if err := u.cfg.execHook(upgradedRelease, release.HookPostUpgrade, u.WaitStrategy, u.Timeout); err != nil {
+		if err := u.cfg.execHook(upgradedRelease, release.HookPostUpgrade, u.WaitStrategy, u.Timeout, serverSideApply); err != nil {
 			u.reportToPerformUpgrade(c, upgradedRelease, results.Created, fmt.Errorf("post-upgrade hooks failed: %s", err))
 			return
 		}
@@ -530,6 +547,8 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 		rollin.WaitForJobs = u.WaitForJobs
 		rollin.DisableHooks = u.DisableHooks
 		rollin.ForceReplace = u.ForceReplace
+		rollin.ForceConflicts = u.ForceConflicts
+		rollin.ServerSideApply = u.ServerSideApply
 		rollin.Timeout = u.Timeout
 		if rollErr := rollin.Run(rel.Name); rollErr != nil {
 			return rel, fmt.Errorf("an error occurred while rolling back the release. original upgrade error: %w: %w", err, rollErr)
@@ -607,3 +626,16 @@ func mergeCustomLabels(current, desired map[string]string) map[string]string {
 	}
 	return labels
 }
+
+func getUpgradeServerSideValue(serverSideOption string, releaseApplyMethod string) (bool, error) {
+	switch serverSideOption {
+	case "auto":
+		return releaseApplyMethod == "ssa", nil
+	case "false":
+		return false, nil
+	case "true":
+		return true, nil
+	default:
+		return false, fmt.Errorf("invalid/unknown release server-side apply method: %s", serverSideOption)
+	}
+}
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index e20955560..ccb0b8447 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -583,3 +583,109 @@ func TestUpgradeRelease_DryRun(t *testing.T) {
 	done()
 	req.Error(err)
 }
+
+func TestGetUpgradeServerSideValue(t *testing.T) {
+	tests := []struct {
+		name                    string
+		actionServerSideOption  string
+		releaseApplyMethod      string
+		expectedServerSideApply bool
+	}{
+		{
+			name:                    "action ssa auto / release csa",
+			actionServerSideOption:  "auto",
+			releaseApplyMethod:      "csa",
+			expectedServerSideApply: false,
+		},
+		{
+			name:                    "action ssa auto / release ssa",
+			actionServerSideOption:  "auto",
+			releaseApplyMethod:      "ssa",
+			expectedServerSideApply: true,
+		},
+		{
+			name:                    "action ssa auto / release empty",
+			actionServerSideOption:  "auto",
+			releaseApplyMethod:      "",
+			expectedServerSideApply: false,
+		},
+		{
+			name:                    "action ssa true / release csa",
+			actionServerSideOption:  "true",
+			releaseApplyMethod:      "csa",
+			expectedServerSideApply: true,
+		},
+		{
+			name:                    "action ssa true / release ssa",
+			actionServerSideOption:  "true",
+			releaseApplyMethod:      "ssa",
+			expectedServerSideApply: true,
+		},
+		{
+			name:                    "action ssa true / release 'unknown'",
+			actionServerSideOption:  "true",
+			releaseApplyMethod:      "foo",
+			expectedServerSideApply: true,
+		},
+		{
+			name:                    "action ssa true / release empty",
+			actionServerSideOption:  "true",
+			releaseApplyMethod:      "",
+			expectedServerSideApply: true,
+		},
+		{
+			name:                    "action ssa false / release csa",
+			actionServerSideOption:  "false",
+			releaseApplyMethod:      "ssa",
+			expectedServerSideApply: false,
+		},
+		{
+			name:                    "action ssa false / release ssa",
+			actionServerSideOption:  "false",
+			releaseApplyMethod:      "ssa",
+			expectedServerSideApply: false,
+		},
+		{
+			name:                    "action ssa false / release 'unknown'",
+			actionServerSideOption:  "false",
+			releaseApplyMethod:      "foo",
+			expectedServerSideApply: false,
+		},
+		{
+			name:                    "action ssa false / release empty",
+			actionServerSideOption:  "false",
+			releaseApplyMethod:      "ssa",
+			expectedServerSideApply: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			serverSideApply, err := getUpgradeServerSideValue(tt.actionServerSideOption, tt.releaseApplyMethod)
+			assert.Nil(t, err)
+			assert.Equal(t, tt.expectedServerSideApply, serverSideApply)
+		})
+	}
+
+	testsError := []struct {
+		name                   string
+		actionServerSideOption string
+		releaseApplyMethod     string
+		expectedErrorMsg       string
+	}{
+		{
+			name:                   "action invalid option",
+			actionServerSideOption: "invalid",
+			releaseApplyMethod:     "ssa",
+			expectedErrorMsg:       "invalid/unknown release server-side apply method: invalid",
+		},
+	}
+
+	for _, tt := range testsError {
+		t.Run(tt.name, func(t *testing.T) {
+			_, err := getUpgradeServerSideValue(tt.actionServerSideOption, tt.releaseApplyMethod)
+			assert.ErrorContains(t, err, tt.expectedErrorMsg)
+		})
+	}
+
+}
diff --git a/pkg/cmd/get_metadata.go b/pkg/cmd/get_metadata.go
index aea149f5e..eb90b6e44 100644
--- a/pkg/cmd/get_metadata.go
+++ b/pkg/cmd/get_metadata.go
@@ -27,6 +27,8 @@ import (
 	"helm.sh/helm/v4/pkg/action"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
+
+	release "helm.sh/helm/v4/pkg/release/v1"
 )
 
 type metadataWriter struct {
@@ -75,6 +77,20 @@ func newGetMetadataCmd(cfg *action.Configuration, out io.Writer) *cobra.Command
 }
 
 func (w metadataWriter) WriteTable(out io.Writer) error {
+
+	formatApplyMethod := func(applyMethod string) string {
+		switch applyMethod {
+		case "":
+			return "client-side apply (defaulted)"
+		case string(release.ApplyMethodClientSideApply):
+			return "client-side apply"
+		case string(release.ApplyMethodServerSideApply):
+			return "server-side apply"
+		default:
+			return fmt.Sprintf("unknown (%q)", applyMethod)
+		}
+	}
+
 	_, _ = fmt.Fprintf(out, "NAME: %v\n", w.metadata.Name)
 	_, _ = fmt.Fprintf(out, "CHART: %v\n", w.metadata.Chart)
 	_, _ = fmt.Fprintf(out, "VERSION: %v\n", w.metadata.Version)
@@ -86,6 +102,7 @@ func (w metadataWriter) WriteTable(out io.Writer) error {
 	_, _ = fmt.Fprintf(out, "REVISION: %v\n", w.metadata.Revision)
 	_, _ = fmt.Fprintf(out, "STATUS: %v\n", w.metadata.Status)
 	_, _ = fmt.Fprintf(out, "DEPLOYED_AT: %v\n", w.metadata.DeployedAt)
+	_, _ = fmt.Fprintf(out, "APPLY_METHOD: %v\n", formatApplyMethod(w.metadata.ApplyMethod))
 
 	return nil
 }
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index d53b1d981..5be298ff8 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -196,6 +196,8 @@ func addInstallFlags(cmd *cobra.Command, f *pflag.FlagSet, client *action.Instal
 	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
 	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
 	f.MarkDeprecated("force", "use --force-replace instead")
+	f.BoolVar(&client.ForceConflicts, "force-conflicts", false, "if set server-side apply will force changes against conflicts")
+	f.BoolVar(&client.ServerSideApply, "server-side", true, "object updates run in the server instead of the client")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during install")
 	f.BoolVar(&client.Replace, "replace", false, "reuse the given name, only if that name is a deleted release which remains in the history. This is unsafe in production")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
@@ -217,6 +219,8 @@ func addInstallFlags(cmd *cobra.Command, f *pflag.FlagSet, client *action.Instal
 	addValueOptionsFlags(f, valueOpts)
 	addChartPathOptionsFlags(f, &client.ChartPathOptions)
 	AddWaitFlag(cmd, &client.WaitStrategy)
+	cmd.MarkFlagsMutuallyExclusive("force-replace", "force-conflicts")
+	cmd.MarkFlagsMutuallyExclusive("force", "force-conflicts")
 
 	err := cmd.RegisterFlagCompletionFunc("version", func(_ *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		requiredArgs := 2
diff --git a/pkg/cmd/rollback.go b/pkg/cmd/rollback.go
index 4b7f3016d..ff60aaedf 100644
--- a/pkg/cmd/rollback.go
+++ b/pkg/cmd/rollback.go
@@ -80,12 +80,16 @@ func newRollbackCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
 	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
 	f.MarkDeprecated("force", "use --force-replace instead")
+	f.BoolVar(&client.ForceConflicts, "force-conflicts", false, "if set server-side apply will force changes against conflicts")
+	f.StringVar(&client.ServerSideApply, "server-side", "auto", "must be \"true\", \"false\" or \"auto\". Object updates run in the server instead of the client (\"auto\" defaults the value from the previous chart release's method)")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "prevent hooks from running during rollback")
 	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
 	f.BoolVar(&client.WaitForJobs, "wait-for-jobs", false, "if set and --wait enabled, will wait until all Jobs have been completed before marking the release as successful. It will wait for as long as --timeout")
 	f.BoolVar(&client.CleanupOnFail, "cleanup-on-fail", false, "allow deletion of new resources created in this rollback when rollback fails")
 	f.IntVar(&client.MaxHistory, "history-max", settings.MaxHistory, "limit the maximum number of revisions saved per release. Use 0 for no limit")
 	AddWaitFlag(cmd, &client.WaitStrategy)
+	cmd.MarkFlagsMutuallyExclusive("force-replace", "force-conflicts")
+	cmd.MarkFlagsMutuallyExclusive("force", "force-conflicts")
 
 	return cmd
 }
diff --git a/pkg/cmd/testdata/output/get-metadata.txt b/pkg/cmd/testdata/output/get-metadata.txt
index 5744083dd..b3cb73ee2 100644
--- a/pkg/cmd/testdata/output/get-metadata.txt
+++ b/pkg/cmd/testdata/output/get-metadata.txt
@@ -9,3 +9,4 @@ NAMESPACE: default
 REVISION: 1
 STATUS: deployed
 DEPLOYED_AT: 1977-09-02T22:04:05Z
+APPLY_METHOD: client-side apply (defaulted)
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index c3288286b..f39810c88 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -273,6 +273,8 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.BoolVar(&client.ForceReplace, "force-replace", false, "force resource updates by replacement")
 	f.BoolVar(&client.ForceReplace, "force", false, "deprecated")
 	f.MarkDeprecated("force", "use --force-replace instead")
+	f.BoolVar(&client.ForceConflicts, "force-conflicts", false, "if set server-side apply will force changes against conflicts")
+	f.StringVar(&client.ServerSideApply, "server-side", "auto", "must be \"true\", \"false\" or \"auto\". Object updates run in the server instead of the client (\"auto\" defaults the value from the previous chart release's method)")
 	f.BoolVar(&client.DisableHooks, "no-hooks", false, "disable pre/post upgrade hooks")
 	f.BoolVar(&client.DisableOpenAPIValidation, "disable-openapi-validation", false, "if set, the upgrade process will not validate rendered templates against the Kubernetes OpenAPI Schema")
 	f.BoolVar(&client.SkipCRDs, "skip-crds", false, "if set, no CRDs will be installed when an upgrade is performed with install flag enabled. By default, CRDs are installed if not already present, when an upgrade is performed with install flag enabled")
@@ -297,6 +299,8 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	bindOutputFlag(cmd, &outfmt)
 	bindPostRenderFlag(cmd, &client.PostRenderer)
 	AddWaitFlag(cmd, &client.WaitStrategy)
+	cmd.MarkFlagsMutuallyExclusive("force-replace", "force-conflicts")
+	cmd.MarkFlagsMutuallyExclusive("force", "force-conflicts")
 
 	err := cmd.RegisterFlagCompletionFunc("version", func(_ *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		if len(args) != 2 {
diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go
index 588bba83d..ae3853fb7 100644
--- a/pkg/kube/fake/fake.go
+++ b/pkg/kube/fake/fake.go
@@ -108,6 +108,14 @@ func (f *FailingKubeClient) Delete(resources kube.ResourceList) (*kube.Result, [
 	return f.PrintingKubeClient.Delete(resources)
 }
 
+// DeleteWithPropagationPolicy returns the configured error if set or prints
+func (f *FailingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, policy metav1.DeletionPropagation) (*kube.Result, []error) {
+	if f.DeleteWithPropagationError != nil {
+		return nil, []error{f.DeleteWithPropagationError}
+	}
+	return f.PrintingKubeClient.DeleteWithPropagationPolicy(resources, policy)
+}
+
 // WatchUntilReady returns the configured error if set or prints
 func (f *FailingKubeWaiter) WatchUntilReady(resources kube.ResourceList, d time.Duration) error {
 	if f.watchUntilReadyError != nil {
@@ -146,14 +154,6 @@ func (f *FailingKubeClient) BuildTable(r io.Reader, _ bool) (kube.ResourceList,
 	return f.PrintingKubeClient.BuildTable(r, false)
 }
 
-// DeleteWithPropagationPolicy returns the configured error if set or prints
-func (f *FailingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, policy metav1.DeletionPropagation) (*kube.Result, []error) {
-	if f.DeleteWithPropagationError != nil {
-		return nil, []error{f.DeleteWithPropagationError}
-	}
-	return f.PrintingKubeClient.DeleteWithPropagationPolicy(resources, policy)
-}
-
 func (f *FailingKubeClient) GetWaiter(ws kube.WaitStrategy) (kube.Waiter, error) {
 	waiter, _ := f.PrintingKubeClient.GetWaiter(ws)
 	printingKubeWaiter, _ := waiter.(*PrintingKubeWaiter)
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index 16c93615a..130e923c6 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -97,6 +97,17 @@ func (p *PrintingKubeClient) Delete(resources kube.ResourceList) (*kube.Result,
 	return &kube.Result{Deleted: resources}, nil
 }
 
+// DeleteWithPropagationPolicy implements KubeClient delete.
+//
+// It only prints out the content to be deleted.
+func (p *PrintingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, _ metav1.DeletionPropagation) (*kube.Result, []error) {
+	_, err := io.Copy(p.Out, bufferize(resources))
+	if err != nil {
+		return nil, []error{err}
+	}
+	return &kube.Result{Deleted: resources}, nil
+}
+
 // Update implements KubeClient Update.
 func (p *PrintingKubeClient) Update(_, modified kube.ResourceList, _ ...kube.ClientUpdateOption) (*kube.Result, error) {
 	_, err := io.Copy(p.Out, bufferize(modified))
@@ -135,17 +146,6 @@ func (p *PrintingKubeClient) OutputContainerLogsForPodList(_ *v1.PodList, someNa
 	return err
 }
 
-// DeleteWithPropagationPolicy implements KubeClient delete.
-//
-// It only prints out the content to be deleted.
-func (p *PrintingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, _ metav1.DeletionPropagation) (*kube.Result, []error) {
-	_, err := io.Copy(p.Out, bufferize(resources))
-	if err != nil {
-		return nil, []error{err}
-	}
-	return &kube.Result{Deleted: resources}, nil
-}
-
 func (p *PrintingKubeClient) GetWaiter(_ kube.WaitStrategy) (kube.Waiter, error) {
 	return &PrintingKubeWaiter{Out: p.Out, LogOutput: p.LogOutput}, nil
 }
diff --git a/pkg/release/v1/release.go b/pkg/release/v1/release.go
index 74e834f7b..a7f076e04 100644
--- a/pkg/release/v1/release.go
+++ b/pkg/release/v1/release.go
@@ -19,6 +19,11 @@ import (
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
+type ApplyMethod string
+
+const ApplyMethodClientSideApply ApplyMethod = "csa"
+const ApplyMethodServerSideApply ApplyMethod = "ssa"
+
 // Release describes a deployment of a chart, together with the chart
 // and the variables used to deploy that chart.
 type Release struct {
@@ -42,6 +47,9 @@ type Release struct {
 	// Labels of the release.
 	// Disabled encoding into Json cause labels are stored in storage driver metadata field.
 	Labels map[string]string `json:"-"`
+	// ApplyMethod stores whether server-side or client-side apply was used for the release
+	// Unset (empty string) should be treated as the default of client-side apply
+	ApplyMethod string `json:"apply_method,omitempty"` // "ssa" | "csa"
 }
 
 // SetStatus is a helper for setting the status on a release.

From fb12b44493eb36e12b1af4804051cca01515f5f3 Mon Sep 17 00:00:00 2001
From: Isaiah Lewis <isaiah@roof12.com>
Date: Mon, 18 Aug 2025 11:35:59 -0700
Subject: [PATCH 142/211] fix(helm-lint): Add TLSClientConfig

Signed-off-by: Isaiah Lewis <isaiah@roof12.com>
---
 pkg/chart/v2/util/jsonschema.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/chart/v2/util/jsonschema.go b/pkg/chart/v2/util/jsonschema.go
index 96fd207b9..0d03db710 100644
--- a/pkg/chart/v2/util/jsonschema.go
+++ b/pkg/chart/v2/util/jsonschema.go
@@ -18,6 +18,7 @@ package util
 
 import (
 	"bytes"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -63,6 +64,7 @@ func newHTTPURLLoader() *HTTPURLLoader {
 		Timeout: 15 * time.Second,
 		Transport: &http.Transport{
 			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{},
 		},
 	})
 	return &httpLoader

From b4b2392f7e9d519af85f3a797fe1085d04c7f954 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 18 Aug 2025 10:17:22 -0700
Subject: [PATCH 143/211] mergefix

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/install.go    |  4 ++--
 pkg/action/uninstall.go  | 10 ++++------
 pkg/kube/fake/fake.go    | 16 ++++++++--------
 pkg/kube/fake/printer.go | 22 +++++++++++-----------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index f7482d466..89755d4e5 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -482,13 +482,13 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 			resources,
 			kube.ClientCreateOptionServerSideApply(i.ServerSideApply, false))
 	} else if len(resources) > 0 {
-		useUpdateThreeWayMergeForUnstructured := i.TakeOwnership && !i.ServerSideApply // Use three-way merge when taking ownership (and not using server-side apply)
+		updateThreeWayMergeForUnstructured := i.TakeOwnership && !i.ServerSideApply // Use three-way merge when taking ownership (and not using server-side apply)
 		_, err = i.cfg.KubeClient.Update(
 			toBeAdopted,
 			resources,
 			kube.ClientUpdateOptionForceReplace(i.ForceReplace),
 			kube.ClientUpdateOptionServerSideApply(i.ServerSideApply, i.ForceConflicts),
-			kube.ClientUpdateOptionThreeWayMergeForUnstructured(useUpdateThreeWayMergeForUnstructured))
+			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured))
 	}
 	if err != nil {
 		return rel, err
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 4444f4331..6aa87d331 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -246,13 +246,11 @@ func (u *Uninstall) deleteRelease(rel *release.Release) (kube.ResourceList, stri
 		return nil, "", []error{fmt.Errorf("unable to build kubernetes objects for delete: %w", err)}
 	}
 	if len(resources) > 0 {
-		if len(resources) > 0 {
-			if kubeClient, ok := u.cfg.KubeClient.(kube.InterfaceDeletionPropagation); ok {
-				_, errs = kubeClient.DeleteWithPropagationPolicy(resources, parseCascadingFlag(u.DeletionPropagation))
-				return resources, kept, errs
-			}
-			_, errs = u.cfg.KubeClient.Delete(resources)
+		if kubeClient, ok := u.cfg.KubeClient.(kube.InterfaceDeletionPropagation); ok {
+			_, errs = kubeClient.DeleteWithPropagationPolicy(resources, parseCascadingFlag(u.DeletionPropagation))
+			return resources, kept, errs
 		}
+		_, errs = u.cfg.KubeClient.Delete(resources)
 	}
 	return resources, kept, errs
 }
diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go
index ae3853fb7..588bba83d 100644
--- a/pkg/kube/fake/fake.go
+++ b/pkg/kube/fake/fake.go
@@ -108,14 +108,6 @@ func (f *FailingKubeClient) Delete(resources kube.ResourceList) (*kube.Result, [
 	return f.PrintingKubeClient.Delete(resources)
 }
 
-// DeleteWithPropagationPolicy returns the configured error if set or prints
-func (f *FailingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, policy metav1.DeletionPropagation) (*kube.Result, []error) {
-	if f.DeleteWithPropagationError != nil {
-		return nil, []error{f.DeleteWithPropagationError}
-	}
-	return f.PrintingKubeClient.DeleteWithPropagationPolicy(resources, policy)
-}
-
 // WatchUntilReady returns the configured error if set or prints
 func (f *FailingKubeWaiter) WatchUntilReady(resources kube.ResourceList, d time.Duration) error {
 	if f.watchUntilReadyError != nil {
@@ -154,6 +146,14 @@ func (f *FailingKubeClient) BuildTable(r io.Reader, _ bool) (kube.ResourceList,
 	return f.PrintingKubeClient.BuildTable(r, false)
 }
 
+// DeleteWithPropagationPolicy returns the configured error if set or prints
+func (f *FailingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, policy metav1.DeletionPropagation) (*kube.Result, []error) {
+	if f.DeleteWithPropagationError != nil {
+		return nil, []error{f.DeleteWithPropagationError}
+	}
+	return f.PrintingKubeClient.DeleteWithPropagationPolicy(resources, policy)
+}
+
 func (f *FailingKubeClient) GetWaiter(ws kube.WaitStrategy) (kube.Waiter, error) {
 	waiter, _ := f.PrintingKubeClient.GetWaiter(ws)
 	printingKubeWaiter, _ := waiter.(*PrintingKubeWaiter)
diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go
index 130e923c6..16c93615a 100644
--- a/pkg/kube/fake/printer.go
+++ b/pkg/kube/fake/printer.go
@@ -97,17 +97,6 @@ func (p *PrintingKubeClient) Delete(resources kube.ResourceList) (*kube.Result,
 	return &kube.Result{Deleted: resources}, nil
 }
 
-// DeleteWithPropagationPolicy implements KubeClient delete.
-//
-// It only prints out the content to be deleted.
-func (p *PrintingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, _ metav1.DeletionPropagation) (*kube.Result, []error) {
-	_, err := io.Copy(p.Out, bufferize(resources))
-	if err != nil {
-		return nil, []error{err}
-	}
-	return &kube.Result{Deleted: resources}, nil
-}
-
 // Update implements KubeClient Update.
 func (p *PrintingKubeClient) Update(_, modified kube.ResourceList, _ ...kube.ClientUpdateOption) (*kube.Result, error) {
 	_, err := io.Copy(p.Out, bufferize(modified))
@@ -146,6 +135,17 @@ func (p *PrintingKubeClient) OutputContainerLogsForPodList(_ *v1.PodList, someNa
 	return err
 }
 
+// DeleteWithPropagationPolicy implements KubeClient delete.
+//
+// It only prints out the content to be deleted.
+func (p *PrintingKubeClient) DeleteWithPropagationPolicy(resources kube.ResourceList, _ metav1.DeletionPropagation) (*kube.Result, []error) {
+	_, err := io.Copy(p.Out, bufferize(resources))
+	if err != nil {
+		return nil, []error{err}
+	}
+	return &kube.Result{Deleted: resources}, nil
+}
+
 func (p *PrintingKubeClient) GetWaiter(_ kube.WaitStrategy) (kube.Waiter, error) {
 	return &PrintingKubeWaiter{Out: p.Out, LogOutput: p.LogOutput}, nil
 }

From e1e23d2af1ef2ca1214a723035aa189bab64c74a Mon Sep 17 00:00:00 2001
From: Eric Stroczynski <estroczynski@nvidia.com>
Date: Mon, 18 Aug 2025 12:27:22 -0700
Subject: [PATCH 144/211] fix: set repo authorizer in registry.Client.Resolve()

Signed-off-by: Eric Stroczynski <estroczynski@nvidia.com>
---
 pkg/registry/client.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 3ccdba92c..8d6af9697 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -818,6 +818,7 @@ func (c *Client) Resolve(ref string) (desc ocispec.Descriptor, err error) {
 		return desc, err
 	}
 	remoteRepository.PlainHTTP = c.plainHTTP
+	remoteRepository.Client = c.authorizer
 
 	parsedReference, err := newReference(ref)
 	if err != nil {

From c9e6e8a040721c258a5e3d12c7bdd9ada6f62082 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Aug 2025 22:39:10 +0000
Subject: [PATCH 145/211] chore(deps): bump the k8s-io group with 7 updates

Bumps the k8s-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.33.3` | `0.33.4` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.3` | `0.33.4` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.3` | `0.33.4` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.33.3` | `0.33.4` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.3` | `0.33.4` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.3` | `0.33.4` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.33.3` | `0.33.4` |


Updates `k8s.io/api` from 0.33.3 to 0.33.4
- [Commits](https://github.com/kubernetes/api/compare/v0.33.3...v0.33.4)

Updates `k8s.io/apiextensions-apiserver` from 0.33.3 to 0.33.4
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.33.3...v0.33.4)

Updates `k8s.io/apimachinery` from 0.33.3 to 0.33.4
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.33.3...v0.33.4)

Updates `k8s.io/apiserver` from 0.33.3 to 0.33.4
- [Commits](https://github.com/kubernetes/apiserver/compare/v0.33.3...v0.33.4)

Updates `k8s.io/cli-runtime` from 0.33.3 to 0.33.4
- [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.33.3...v0.33.4)

Updates `k8s.io/client-go` from 0.33.3 to 0.33.4
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.33.3...v0.33.4)

Updates `k8s.io/kubectl` from 0.33.3 to 0.33.4
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.33.3...v0.33.4)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiserver
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-version: 0.33.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 16 ++++++++--------
 go.sum | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 688094670..f3a3ebd33 100644
--- a/go.mod
+++ b/go.mod
@@ -35,14 +35,14 @@ require (
 	golang.org/x/crypto v0.41.0
 	golang.org/x/term v0.34.0
 	golang.org/x/text v0.28.0
-	k8s.io/api v0.33.3
-	k8s.io/apiextensions-apiserver v0.33.3
-	k8s.io/apimachinery v0.33.3
-	k8s.io/apiserver v0.33.3
-	k8s.io/cli-runtime v0.33.3
-	k8s.io/client-go v0.33.3
+	k8s.io/api v0.33.4
+	k8s.io/apiextensions-apiserver v0.33.4
+	k8s.io/apimachinery v0.33.4
+	k8s.io/apiserver v0.33.4
+	k8s.io/cli-runtime v0.33.4
+	k8s.io/client-go v0.33.4
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubectl v0.33.3
+	k8s.io/kubectl v0.33.4
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/kustomize/kyaml v0.20.1
@@ -170,7 +170,7 @@ require (
 	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.33.3 // indirect
+	k8s.io/component-base v0.33.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
diff --git a/go.sum b/go.sum
index 5ac66f328..b76d921d3 100644
--- a/go.sum
+++ b/go.sum
@@ -500,26 +500,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
-k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
-k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
-k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
-k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
-k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
-k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
-k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA=
-k8s.io/cli-runtime v0.33.3/go.mod h1:yklhLklD4vLS8HNGgC9wGiuHWze4g7x6XQZ+8edsKEo=
-k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
-k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
-k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
-k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
+k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
+k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
+k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU=
+k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs=
+k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
+k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/apiserver v0.33.4 h1:6N0TEVA6kASUS3owYDIFJjUH6lgN8ogQmzZvaFFj1/Y=
+k8s.io/apiserver v0.33.4/go.mod h1:8ODgXMnOoSPLMUg1aAzMFx+7wTJM+URil+INjbTZCok=
+k8s.io/cli-runtime v0.33.4 h1:V8NSxGfh24XzZVhXmIGzsApdBpGq0RQS2u/Fz1GvJwk=
+k8s.io/cli-runtime v0.33.4/go.mod h1:V+ilyokfqjT5OI+XE+O515K7jihtr0/uncwoyVqXaIU=
+k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
+k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
+k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY=
+k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 h1:gAXU86Fmbr/ktY17lkHwSjw5aoThQvhnstGGIYKlKYc=
 k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
-k8s.io/kubectl v0.33.3 h1:r/phHvH1iU7gO/l7tTjQk2K01ER7/OAJi8uFHHyWSac=
-k8s.io/kubectl v0.33.3/go.mod h1:euj2bG56L6kUGOE/ckZbCoudPwuj4Kud7BR0GzyNiT0=
+k8s.io/kubectl v0.33.4 h1:nXEI6Vi+oB9hXxoAHyHisXolm/l1qutK3oZQMak4N98=
+k8s.io/kubectl v0.33.4/go.mod h1:Xe7P9X4DfILvKmlBsVqUtzktkI56lEj22SJW7cFy6nE=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

From 6ac2c34689df6fb78470e7c809f2c97060fc4d27 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Tue, 19 Aug 2025 14:00:36 -0400
Subject: [PATCH 146/211] Initial addition of content based cache

The previous cache was based on chart name and version. If 2 charts
with different content had the same name and version they would collide.
Helm did not trust the cache because of this and always downloaded
content. It was a short lived cache.

This commit introduces a content based cache which is based on the
content rather than file name. Charts with the same name but different
content are no longer an issue.

While the system assumes a file based interface, the cache system
is pluggable. In the future, it should return bytes for the content
instead of paths to it. That would requie a larger change for Helm 5
or later.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 pkg/action/install.go                   |   4 +-
 pkg/action/verify.go                    |   2 +-
 pkg/downloader/cache.go                 |  86 ++++++++++
 pkg/downloader/chart_downloader.go      | 209 ++++++++++++++++++++----
 pkg/downloader/chart_downloader_test.go |   6 +-
 pkg/registry/client.go                  |  23 +--
 6 files changed, 281 insertions(+), 49 deletions(-)
 create mode 100644 pkg/downloader/cache.go

diff --git a/pkg/action/install.go b/pkg/action/install.go
index d8efa5d5d..b13bbfb8b 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -792,7 +792,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 			return abs, err
 		}
 		if c.Verify {
-			if _, err := downloader.VerifyChart(abs, c.Keyring); err != nil {
+			if _, err := downloader.VerifyChart(abs, abs+".prov", c.Keyring); err != nil {
 				return "", err
 			}
 		}
@@ -868,7 +868,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 		return "", err
 	}
 
-	filename, _, err := dl.DownloadTo(name, version, settings.RepositoryCache)
+	filename, _, err := dl.DownloadToCache(name, version)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/action/verify.go b/pkg/action/verify.go
index 68a5e2d88..ca2f4fa63 100644
--- a/pkg/action/verify.go
+++ b/pkg/action/verify.go
@@ -39,7 +39,7 @@ func NewVerify() *Verify {
 // Run executes 'helm verify'.
 func (v *Verify) Run(chartfile string) error {
 	var out strings.Builder
-	p, err := downloader.VerifyChart(chartfile, v.Keyring)
+	p, err := downloader.VerifyChart(chartfile, chartfile+".prov", v.Keyring)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/downloader/cache.go b/pkg/downloader/cache.go
new file mode 100644
index 000000000..d9b925756
--- /dev/null
+++ b/pkg/downloader/cache.go
@@ -0,0 +1,86 @@
+/*
+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 downloader
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"io"
+	"log/slog"
+	"os"
+	"path/filepath"
+
+	"helm.sh/helm/v4/internal/fileutil"
+)
+
+// Cache describes a cache that can get and put chart data.
+// The cache key is the sha256 has of the content. sha256 is used in Helm for
+// digests in index files providing a common key for checking content.
+type Cache interface {
+	// Get returns a reader for the given key.
+	Get(key [sha256.Size]byte, prov bool) (string, error)
+	// Put stores the given reader for the given key.
+	Put(key [sha256.Size]byte, data io.Reader, prov bool) (string, error)
+}
+
+// TODO: The cache assumes files because much of Helm assumes files. Convert
+// Helm to pass content around instead of file locations.
+
+// DiskCache is a cache that stores data on disk.
+type DiskCache struct {
+	Root string
+}
+
+// Get returns a reader for the given key.
+func (c *DiskCache) Get(key [sha256.Size]byte, prov bool) (string, error) {
+	p := c.fileName(key, prov)
+	fi, err := os.Stat(p)
+	if err != nil {
+		return "", err
+	}
+	// Empty files treated as not exist because there is no content.
+	if fi.Size() == 0 {
+		return p, os.ErrNotExist
+	}
+	// directories should never happen unless something outside helm is operating
+	// on this content.
+	if fi.IsDir() {
+		return p, os.ErrInvalid
+	}
+	return p, nil
+}
+
+// Put stores the given reader for the given key.
+// It returns the path to the stored file.
+func (c *DiskCache) Put(key [sha256.Size]byte, data io.Reader, prov bool) (string, error) {
+	// TODO: verify the key and digest of the key are the same.
+	p := c.fileName(key, prov)
+	if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
+		slog.Error("failed to create cache directory")
+		return p, err
+	}
+	return p, fileutil.AtomicWriteFile(p, data, 0644)
+}
+
+// fileName generates the filename in a structured manner where the first part is the
+// directory and the full hash is the filename.
+func (c *DiskCache) fileName(id [sha256.Size]byte, prov bool) string {
+	suffix := ".tgz"
+	if prov {
+		suffix = ".prov"
+	}
+	return filepath.Join(c.Root, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%x", id)+suffix)
+}
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index 529fd788e..bdf65011c 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -16,6 +16,9 @@ limitations under the License.
 package downloader
 
 import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -72,6 +75,9 @@ type ChartDownloader struct {
 	RegistryClient   *registry.Client
 	RepositoryConfig string
 	RepositoryCache  string
+
+	// Cache specifies the cache implementation to use.
+	Cache Cache
 }
 
 // DownloadTo retrieves a chart. Depending on the settings, it may also download a provenance file.
@@ -86,7 +92,10 @@ type ChartDownloader struct {
 // Returns a string path to the location where the file was downloaded and a verification
 // (if provenance was verified), or an error if something bad happened.
 func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *provenance.Verification, error) {
-	u, err := c.ResolveChartVersion(ref, version)
+	if c.Cache == nil {
+		c.Cache = &DiskCache{Root: c.RepositoryCache}
+	}
+	hash, u, err := c.ResolveChartVersion(ref, version)
 	if err != nil {
 		return "", nil, err
 	}
@@ -96,11 +105,36 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 		return "", nil, err
 	}
 
-	c.Options = append(c.Options, getter.WithAcceptHeader("application/gzip,application/octet-stream"))
+	// Check the cache for the content. Otherwise download it.
+	// Note, this process will pull from the cache but does not automatically populate
+	// the cache with the file it downloads.
+	var data *bytes.Buffer
+	var found bool
+	var digest []byte
+	var digest32 [32]byte
+	if hash != "" {
+		// if there is a hash, populate the other formats
+		digest, err = hex.DecodeString(hash)
+		if err != nil {
+			return "", nil, err
+		}
+		copy(digest32[:], digest)
+		if pth, err := c.Cache.Get(digest32, false); err == nil {
+			fdata, err := os.ReadFile(pth)
+			if err == nil {
+				found = true
+				data = bytes.NewBuffer(fdata)
+			}
+		}
+	}
 
-	data, err := g.Get(u.String(), c.Options...)
-	if err != nil {
-		return "", nil, err
+	if !found {
+		c.Options = append(c.Options, getter.WithAcceptHeader("application/gzip,application/octet-stream"))
+
+		data, err = g.Get(u.String(), c.Options...)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 
 	name := filepath.Base(u.Path)
@@ -117,13 +151,26 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 	// If provenance is requested, verify it.
 	ver := &provenance.Verification{}
 	if c.Verify > VerifyNever {
-		body, err := g.Get(u.String() + ".prov")
-		if err != nil {
-			if c.Verify == VerifyAlways {
-				return destfile, ver, fmt.Errorf("failed to fetch provenance %q", u.String()+".prov")
+		found = false
+		var body *bytes.Buffer
+		if hash != "" {
+			if pth, err := c.Cache.Get(digest32, true); err == nil {
+				fdata, err := os.ReadFile(pth)
+				if err == nil {
+					found = true
+					body = bytes.NewBuffer(fdata)
+				}
+			}
+		}
+		if !found {
+			body, err = g.Get(u.String() + ".prov")
+			if err != nil {
+				if c.Verify == VerifyAlways {
+					return destfile, ver, fmt.Errorf("failed to fetch provenance %q", u.String()+".prov")
+				}
+				fmt.Fprintf(c.Out, "WARNING: Verification not found for %s: %s\n", ref, err)
+				return destfile, ver, nil
 			}
-			fmt.Fprintf(c.Out, "WARNING: Verification not found for %s: %s\n", ref, err)
-			return destfile, ver, nil
 		}
 		provfile := destfile + ".prov"
 		if err := fileutil.AtomicWriteFile(provfile, body, 0644); err != nil {
@@ -131,7 +178,7 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 		}
 
 		if c.Verify != VerifyLater {
-			ver, err = VerifyChart(destfile, c.Keyring)
+			ver, err = VerifyChart(destfile, destfile+".prov", c.Keyring)
 			if err != nil {
 				// Fail always in this case, since it means the verification step
 				// failed.
@@ -142,10 +189,105 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 	return destfile, ver, nil
 }
 
+// DownloadToCache retrieves resources while using a content based cache.
+func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provenance.Verification, error) {
+	if c.Cache == nil {
+		c.Cache = &DiskCache{Root: c.RepositoryCache}
+	}
+
+	digestString, u, err := c.ResolveChartVersion(ref, version)
+	if err != nil {
+		return "", nil, err
+	}
+
+	g, err := c.Getters.ByScheme(u.Scheme)
+	if err != nil {
+		return "", nil, err
+	}
+
+	c.Options = append(c.Options, getter.WithAcceptHeader("application/gzip,application/octet-stream"))
+
+	// Check the cache for the file
+	digest, err := hex.DecodeString(digestString)
+	if err != nil {
+		return "", nil, err
+	}
+	var digest32 [32]byte
+	copy(digest32[:], digest)
+	if err != nil {
+		return "", nil, fmt.Errorf("unable to decode digest: %w", err)
+	}
+
+	var pth string
+	// only fetch from the cache if we have a digest
+	if len(digest) > 0 {
+		pth, err = c.Cache.Get(digest32, false)
+	}
+	if len(digest) == 0 || err != nil {
+		if err != nil && !os.IsNotExist(err) {
+			return "", nil, err
+		}
+
+		// Get file not in the cache
+		data, gerr := g.Get(u.String(), c.Options...)
+		if gerr != nil {
+			return "", nil, gerr
+		}
+
+		// Generate the digest
+		if len(digest) == 0 {
+			h := sha256.New()
+			digest32 = [sha256.Size]byte(h.Sum(data.Bytes()))
+		}
+
+		pth, err = c.Cache.Put(digest32, data, false)
+		if err != nil {
+			return "", nil, err
+		}
+	}
+
+	// If provenance is requested, verify it.
+	ver := &provenance.Verification{}
+	if c.Verify > VerifyNever {
+		ppth, err := c.Cache.Get(digest32, true)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				return pth, ver, err
+			}
+
+			body, err := g.Get(u.String() + ".prov")
+			if err != nil {
+				if c.Verify == VerifyAlways {
+					return pth, ver, fmt.Errorf("failed to fetch provenance %q", u.String()+".prov")
+				}
+				fmt.Fprintf(c.Out, "WARNING: Verification not found for %s: %s\n", ref, err)
+				return pth, ver, nil
+			}
+
+			ppth, err = c.Cache.Put(digest32, body, true)
+			if err != nil {
+				return "", nil, err
+			}
+		}
+
+		if c.Verify != VerifyLater {
+			ver, err = VerifyChart(pth, ppth, c.Keyring)
+			if err != nil {
+				// Fail always in this case, since it means the verification step
+				// failed.
+				return pth, ver, err
+			}
+		}
+	}
+	return pth, ver, nil
+}
+
 // ResolveChartVersion resolves a chart reference to a URL.
 //
-// It returns the URL and sets the ChartDownloader's Options that can fetch
-// the URL using the appropriate Getter.
+// It returns:
+// - A hash of the content if available
+// - The URL and sets the ChartDownloader's Options that can fetch the URL using the appropriate Getter.
+// - An error if there is one
 //
 // A reference may be an HTTP URL, an oci reference URL, a 'reponame/chartname'
 // reference, or a local path.
@@ -157,23 +299,26 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 //   - If version is non-empty, this will return the URL for that version
 //   - If version is empty, this will return the URL for the latest version
 //   - If no version can be found, an error is returned
-func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, error) {
+//
+// TODO: support OCI hash
+func (c *ChartDownloader) ResolveChartVersion(ref, version string) (string, *url.URL, error) {
 	u, err := url.Parse(ref)
 	if err != nil {
-		return nil, fmt.Errorf("invalid chart URL format: %s", ref)
+		return "", nil, fmt.Errorf("invalid chart URL format: %s", ref)
 	}
 
 	if registry.IsOCI(u.String()) {
 		if c.RegistryClient == nil {
-			return nil, fmt.Errorf("unable to lookup ref %s at version '%s', missing registry client", ref, version)
+			return "", nil, fmt.Errorf("unable to lookup ref %s at version '%s', missing registry client", ref, version)
 		}
 
-		return c.RegistryClient.ValidateReference(ref, version, u)
+		digest, OCIref, err := c.RegistryClient.ValidateReference(ref, version, u)
+		return digest, OCIref, err
 	}
 
 	rf, err := loadRepoConfig(c.RepositoryConfig)
 	if err != nil {
-		return u, err
+		return "", u, err
 	}
 
 	if u.IsAbs() && len(u.Host) > 0 && len(u.Path) > 0 {
@@ -190,9 +335,9 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
 			if err == ErrNoOwnerRepo {
 				// Make sure to add the ref URL as the URL for the getter
 				c.Options = append(c.Options, getter.WithURL(ref))
-				return u, nil
+				return "", u, nil
 			}
-			return u, err
+			return "", u, err
 		}
 
 		// If we get here, we don't need to go through the next phase of looking
@@ -211,20 +356,20 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
 				getter.WithPassCredentialsAll(rc.PassCredentialsAll),
 			)
 		}
-		return u, nil
+		return "", u, nil
 	}
 
 	// See if it's of the form: repo/path_to_chart
 	p := strings.SplitN(u.Path, "/", 2)
 	if len(p) < 2 {
-		return u, fmt.Errorf("non-absolute URLs should be in form of repo_name/path_to_chart, got: %s", u)
+		return "", u, fmt.Errorf("non-absolute URLs should be in form of repo_name/path_to_chart, got: %s", u)
 	}
 
 	repoName := p[0]
 	chartName := p[1]
 	rc, err := pickChartRepositoryConfigByName(repoName, rf.Repositories)
 	if err != nil {
-		return u, err
+		return "", u, err
 	}
 
 	// Now that we have the chart repository information we can use that URL
@@ -233,7 +378,7 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
 
 	r, err := repo.NewChartRepository(rc, c.Getters)
 	if err != nil {
-		return u, err
+		return "", u, err
 	}
 
 	if r != nil && r.Config != nil {
@@ -252,32 +397,33 @@ func (c *ChartDownloader) ResolveChartVersion(ref, version string) (*url.URL, er
 	idxFile := filepath.Join(c.RepositoryCache, helmpath.CacheIndexFile(r.Config.Name))
 	i, err := repo.LoadIndexFile(idxFile)
 	if err != nil {
-		return u, fmt.Errorf("no cached repo found. (try 'helm repo update'): %w", err)
+		return "", u, fmt.Errorf("no cached repo found. (try 'helm repo update'): %w", err)
 	}
 
 	cv, err := i.Get(chartName, version)
 	if err != nil {
-		return u, fmt.Errorf("chart %q matching %s not found in %s index. (try 'helm repo update'): %w", chartName, version, r.Config.Name, err)
+		return "", u, fmt.Errorf("chart %q matching %s not found in %s index. (try 'helm repo update'): %w", chartName, version, r.Config.Name, err)
 	}
 
 	if len(cv.URLs) == 0 {
-		return u, fmt.Errorf("chart %q has no downloadable URLs", ref)
+		return "", u, fmt.Errorf("chart %q has no downloadable URLs", ref)
 	}
 
 	// TODO: Seems that picking first URL is not fully correct
 	resolvedURL, err := repo.ResolveReferenceURL(rc.URL, cv.URLs[0])
 	if err != nil {
-		return u, fmt.Errorf("invalid chart URL format: %s", ref)
+		return cv.Digest, u, fmt.Errorf("invalid chart URL format: %s", ref)
 	}
 
-	return url.Parse(resolvedURL)
+	loc, err := url.Parse(resolvedURL)
+	return cv.Digest, loc, err
 }
 
 // VerifyChart takes a path to a chart archive and a keyring, and verifies the chart.
 //
 // It assumes that a chart archive file is accompanied by a provenance file whose
 // name is the archive file name plus the ".prov" extension.
-func VerifyChart(path, keyring string) (*provenance.Verification, error) {
+func VerifyChart(path, provfile, keyring string) (*provenance.Verification, error) {
 	// For now, error out if it's not a tar file.
 	switch fi, err := os.Stat(path); {
 	case err != nil:
@@ -288,7 +434,6 @@ func VerifyChart(path, keyring string) (*provenance.Verification, error) {
 		return nil, errors.New("chart must be a tgz file")
 	}
 
-	provfile := path + ".prov"
 	if _, err := os.Stat(provfile); err != nil {
 		return nil, fmt.Errorf("could not load provenance file %s: %w", provfile, err)
 	}
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index a2e09eae5..5b5f96751 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -79,7 +79,7 @@ func TestResolveChartRef(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		u, err := c.ResolveChartVersion(tt.ref, tt.version)
+		_, u, err := c.ResolveChartVersion(tt.ref, tt.version)
 		if err != nil {
 			if tt.fail {
 				continue
@@ -131,7 +131,7 @@ func TestResolveChartOpts(t *testing.T) {
 			continue
 		}
 
-		u, err := c.ResolveChartVersion(tt.ref, tt.version)
+		_, u, err := c.ResolveChartVersion(tt.ref, tt.version)
 		if err != nil {
 			t.Errorf("%s: failed with error %s", tt.name, err)
 			continue
@@ -155,7 +155,7 @@ func TestResolveChartOpts(t *testing.T) {
 }
 
 func TestVerifyChart(t *testing.T) {
-	v, err := VerifyChart("testdata/signtest-0.1.0.tgz", "testdata/helm-test-key.pub")
+	v, err := VerifyChart("testdata/signtest-0.1.0.tgz", "testdata/signtest-0.1.0.tgz.prov", "testdata/helm-test-key.pub")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 0c9f256d3..673c6ea87 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -823,12 +823,12 @@ func (c *Client) Resolve(ref string) (desc ocispec.Descriptor, err error) {
 }
 
 // ValidateReference for path and version
-func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, error) {
+func (c *Client) ValidateReference(ref, version string, u *url.URL) (string, *url.URL, error) {
 	var tag string
 
 	registryReference, err := newReference(u.Host + u.Path)
 	if err != nil {
-		return nil, err
+		return "", nil, err
 	}
 
 	if version == "" {
@@ -836,14 +836,14 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
 		version = registryReference.Tag
 	} else {
 		if registryReference.Tag != "" && registryReference.Tag != version {
-			return nil, fmt.Errorf("chart reference and version mismatch: %s is not %s", version, registryReference.Tag)
+			return "", nil, fmt.Errorf("chart reference and version mismatch: %s is not %s", version, registryReference.Tag)
 		}
 	}
 
 	if registryReference.Digest != "" {
 		if version == "" {
 			// Install by digest only
-			return u, nil
+			return "", u, nil
 		}
 		u.Path = fmt.Sprintf("%s@%s", registryReference.Repository, registryReference.Digest)
 
@@ -852,12 +852,12 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
 		desc, err := c.Resolve(path)
 		if err != nil {
 			// The resource does not have to be tagged when digest is specified
-			return u, nil
+			return "", u, nil
 		}
 		if desc.Digest.String() != registryReference.Digest {
-			return nil, fmt.Errorf("chart reference digest mismatch: %s is not %s", desc.Digest.String(), registryReference.Digest)
+			return "", nil, fmt.Errorf("chart reference digest mismatch: %s is not %s", desc.Digest.String(), registryReference.Digest)
 		}
-		return u, nil
+		return registryReference.Digest, u, nil
 	}
 
 	// Evaluate whether an explicit version has been provided. Otherwise, determine version to use
@@ -868,10 +868,10 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
 		// Retrieve list of repository tags
 		tags, err := c.Tags(strings.TrimPrefix(ref, fmt.Sprintf("%s://", OCIScheme)))
 		if err != nil {
-			return nil, err
+			return "", nil, err
 		}
 		if len(tags) == 0 {
-			return nil, fmt.Errorf("unable to locate any tags in provided repository: %s", ref)
+			return "", nil, fmt.Errorf("unable to locate any tags in provided repository: %s", ref)
 		}
 
 		// Determine if version provided
@@ -880,13 +880,14 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
 		// If semver constraint string, try to find a match
 		tag, err = GetTagMatchingVersionOrConstraint(tags, version)
 		if err != nil {
-			return nil, err
+			return "", nil, err
 		}
 	}
 
 	u.Path = fmt.Sprintf("%s:%s", registryReference.Repository, tag)
+	// desc, err := c.Resolve(u.Path)
 
-	return u, err
+	return "", u, err
 }
 
 // tagManifest prepares and tags a manifest in memory storage

From 62e0c78ef8dcfbdaffc44c634088c00f692d8344 Mon Sep 17 00:00:00 2001
From: Isaiah Lewis <isaiah@roof12.com>
Date: Tue, 19 Aug 2025 12:35:12 -0700
Subject: [PATCH 147/211] fix(helm-lint): fmt

Signed-off-by: Isaiah Lewis <isaiah@roof12.com>
---
 pkg/chart/v2/util/jsonschema.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/chart/v2/util/jsonschema.go b/pkg/chart/v2/util/jsonschema.go
index 0d03db710..72e133363 100644
--- a/pkg/chart/v2/util/jsonschema.go
+++ b/pkg/chart/v2/util/jsonschema.go
@@ -63,7 +63,7 @@ func newHTTPURLLoader() *HTTPURLLoader {
 	httpLoader := HTTPURLLoader(http.Client{
 		Timeout: 15 * time.Second,
 		Transport: &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
+			Proxy:           http.ProxyFromEnvironment,
 			TLSClientConfig: &tls.Config{},
 		},
 	})

From ebc874ef844bd85d0ad33df1183d1a7c6b388df7 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 20 Aug 2025 17:37:01 -0700
Subject: [PATCH 148/211] fix client-side to server-side field manager
 migration

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 pkg/action/install.go   |   3 +-
 pkg/action/rollback.go  |   3 +-
 pkg/action/upgrade.go   |  10 +++-
 pkg/kube/client.go      | 121 +++++++++++++++++++++++++++++++++++-----
 pkg/kube/client_test.go |   5 +-
 5 files changed, 123 insertions(+), 19 deletions(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index 89755d4e5..90c673b9c 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -488,7 +488,8 @@ func (i *Install) performInstall(rel *release.Release, toBeAdopted kube.Resource
 			resources,
 			kube.ClientUpdateOptionForceReplace(i.ForceReplace),
 			kube.ClientUpdateOptionServerSideApply(i.ServerSideApply, i.ForceConflicts),
-			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured))
+			kube.ClientUpdateOptionThreeWayMergeForUnstructured(updateThreeWayMergeForUnstructured),
+			kube.ClientUpdateOptionUpgradeClientSideFieldManager(true))
 	}
 	if err != nil {
 		return rel, err
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index 5f0ed02f1..adaf22615 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -210,7 +210,8 @@ func (r *Rollback) performRollback(currentRelease, targetRelease *release.Releas
 		target,
 		kube.ClientUpdateOptionForceReplace(r.ForceReplace),
 		kube.ClientUpdateOptionServerSideApply(serverSideApply, r.ForceConflicts),
-		kube.ClientUpdateOptionThreeWayMergeForUnstructured(false))
+		kube.ClientUpdateOptionThreeWayMergeForUnstructured(false),
+		kube.ClientUpdateOptionUpgradeClientSideFieldManager(true))
 
 	if err != nil {
 		msg := fmt.Sprintf("Rollback %q failed: %s", targetRelease.Name, err)
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 41ddf859f..d86ac7752 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -399,6 +399,7 @@ func (u *Upgrade) performUpgrade(ctx context.Context, originalRelease, upgradedR
 	defer close(doneChan)
 	go u.releasingUpgrade(rChan, upgradedRelease, current, target, originalRelease, serverSideApply)
 	go u.handleContext(ctx, doneChan, ctxChan, upgradedRelease)
+
 	select {
 	case result := <-rChan:
 		return result.r, result.e
@@ -431,6 +432,11 @@ func (u *Upgrade) handleContext(ctx context.Context, done chan interface{}, c ch
 		return
 	}
 }
+
+func isReleaseApplyMethodClientSideApply(applyMethod string) bool {
+	return applyMethod == "" || applyMethod == string(release.ApplyMethodClientSideApply)
+}
+
 func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *release.Release, current kube.ResourceList, target kube.ResourceList, originalRelease *release.Release, serverSideApply bool) {
 	// pre-upgrade hooks
 
@@ -443,11 +449,13 @@ func (u *Upgrade) releasingUpgrade(c chan<- resultMessage, upgradedRelease *rele
 		slog.Debug("upgrade hooks disabled", "name", upgradedRelease.Name)
 	}
 
+	upgradeClientSideFieldManager := isReleaseApplyMethodClientSideApply(originalRelease.ApplyMethod) && serverSideApply // Update client-side field manager if transitioning from client-side to server-side apply
 	results, err := u.cfg.KubeClient.Update(
 		current,
 		target,
 		kube.ClientUpdateOptionForceReplace(u.ForceReplace),
-		kube.ClientUpdateOptionServerSideApply(serverSideApply, u.ForceConflicts))
+		kube.ClientUpdateOptionServerSideApply(serverSideApply, u.ForceConflicts),
+		kube.ClientUpdateOptionUpgradeClientSideFieldManager(upgradeClientSideFieldManager))
 	if err != nil {
 		u.cfg.recordRelease(originalRelease)
 		u.reportToPerformUpgrade(c, upgradedRelease, results.Created, err)
diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 016055392..c41165490 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -47,12 +47,14 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/jsonmergepatch"
 	"k8s.io/apimachinery/pkg/util/mergepatch"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/util/csaupgrade"
 	"k8s.io/client-go/util/retry"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
@@ -577,12 +579,13 @@ func (c *Client) update(originals, targets ResourceList, updateApplyFunc UpdateA
 }
 
 type clientUpdateOptions struct {
-	threeWayMergeForUnstructured bool
-	serverSideApply              bool
-	forceReplace                 bool
-	forceConflicts               bool
-	dryRun                       bool
-	fieldValidationDirective     FieldValidationDirective
+	threeWayMergeForUnstructured  bool
+	serverSideApply               bool
+	forceReplace                  bool
+	forceConflicts                bool
+	dryRun                        bool
+	fieldValidationDirective      FieldValidationDirective
+	upgradeClientSideFieldManager bool
 }
 
 type ClientUpdateOption func(*clientUpdateOptions) error
@@ -640,14 +643,32 @@ func ClientUpdateOptionDryRun(dryRun bool) ClientUpdateOption {
 //   - For server-side apply: the directive is sent to the server to perform the validation
 //
 // Defaults to `FieldValidationDirectiveStrict`
-func ClientUpdateOptionFieldValidationDirective(fieldValidationDirective FieldValidationDirective) ClientCreateOption {
-	return func(o *clientCreateOptions) error {
+func ClientUpdateOptionFieldValidationDirective(fieldValidationDirective FieldValidationDirective) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
 		o.fieldValidationDirective = fieldValidationDirective
 
 		return nil
 	}
 }
 
+// ClientUpdateOptionUpgradeClientSideFieldManager specifies that resources client-side field manager should be upgraded to server-side apply
+// (before applying the object server-side)
+// This is required when upgrading a chart from client-side to server-side apply, otherwise the client-side field management remains. Conflicting with server-side applied updates.
+//
+// Note:
+// if this option is specified, but the object is not managed by client-side field manager, it will be a no-op. However, the cost of fetching the objects will be incurred.
+//
+// see:
+// - https://github.com/kubernetes/kubernetes/pull/112905
+// - `UpgradeManagedFields` / https://github.com/kubernetes/kubernetes/blob/f47e9696d7237f1011d23c9b55f6947e60526179/staging/src/k8s.io/client-go/util/csaupgrade/upgrade.go#L81
+func ClientUpdateOptionUpgradeClientSideFieldManager(upgradeClientSideFieldManager bool) ClientUpdateOption {
+	return func(o *clientUpdateOptions) error {
+		o.upgradeClientSideFieldManager = upgradeClientSideFieldManager
+
+		return nil
+	}
+}
+
 type UpdateApplyFunc func(original, target *resource.Info) error
 
 // Update takes the current list of objects and target list of objects and
@@ -707,15 +728,28 @@ func (c *Client) Update(originals, targets ResourceList, options ...ClientUpdate
 				"using server-side apply for resource update",
 				slog.Bool("forceConflicts", updateOptions.forceConflicts),
 				slog.Bool("dryRun", updateOptions.dryRun),
-				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)))
-			return func(_, target *resource.Info) error {
-				err := patchResourceServerSide(target, updateOptions.dryRun, updateOptions.forceConflicts, updateOptions.fieldValidationDirective)
+				slog.String("fieldValidationDirective", string(updateOptions.fieldValidationDirective)),
+				slog.Bool("upgradeClientSideFieldManager", updateOptions.upgradeClientSideFieldManager))
+			return func(original, target *resource.Info) error {
 
 				logger := slog.With(
 					slog.String("namespace", target.Namespace),
 					slog.String("name", target.Name),
 					slog.String("gvk", target.Mapping.GroupVersionKind.String()))
-				if err != nil {
+
+				if updateOptions.upgradeClientSideFieldManager {
+					patched, err := upgradeClientSideFieldManager(original, updateOptions.dryRun, updateOptions.fieldValidationDirective)
+					if err != nil {
+						slog.Debug("Error patching resource to replace CSA field management", slog.Any("error", err))
+						return err
+					}
+
+					if patched {
+						logger.Debug("Upgraded object client-side field management with server-side apply field management")
+					}
+				}
+
+				if err := patchResourceServerSide(target, updateOptions.dryRun, updateOptions.forceConflicts, updateOptions.fieldValidationDirective); err != nil {
 					logger.Debug("Error patching resource", slog.Any("error", err))
 					return err
 				}
@@ -996,19 +1030,76 @@ func patchResourceClientSide(original runtime.Object, target *resource.Info, thr
 	return nil
 }
 
+// upgradeClientSideFieldManager is simply a wrapper around csaupgrade.UpgradeManagedFields
+// that ugrade CSA managed fields to SSA apply
+// see: https://github.com/kubernetes/kubernetes/pull/112905
+func upgradeClientSideFieldManager(info *resource.Info, dryRun bool, fieldValidationDirective FieldValidationDirective) (bool, error) {
+
+	fieldManagerName := getManagedFieldsManager()
+
+	patched := false
+	err := retry.RetryOnConflict(
+		retry.DefaultRetry,
+		func() error {
+
+			if err := info.Get(); err != nil {
+				return fmt.Errorf("failed to get object %s/%s %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.String(), err)
+			}
+
+			helper := resource.NewHelper(
+				info.Client,
+				info.Mapping).
+				DryRun(dryRun).
+				WithFieldManager(fieldManagerName).
+				WithFieldValidation(string(fieldValidationDirective))
+
+			patchData, err := csaupgrade.UpgradeManagedFieldsPatch(
+				info.Object,
+				sets.New(fieldManagerName),
+				fieldManagerName)
+			if err != nil {
+				return fmt.Errorf("failed to upgrade managed fields for object %s/%s %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.String(), err)
+			}
+
+			if len(patchData) == 0 {
+				return nil
+			}
+
+			obj, err := helper.Patch(
+				info.Namespace,
+				info.Name,
+				types.JSONPatchType,
+				patchData,
+				nil)
+
+			if err == nil {
+				patched = true
+				return info.Refresh(obj, true)
+			}
+
+			if !apierrors.IsConflict(err) {
+				return fmt.Errorf("failed to patch object to upgrade CSA field manager %s/%s %s: %w", info.Namespace, info.Name, info.Mapping.GroupVersionKind.String(), err)
+			}
+
+			return err
+		})
+
+	return patched, err
+}
+
 // Patch reource using server-side apply
 func patchResourceServerSide(target *resource.Info, dryRun bool, forceConflicts bool, fieldValidationDirective FieldValidationDirective) error {
 	helper := resource.NewHelper(
 		target.Client,
 		target.Mapping).
 		DryRun(dryRun).
-		WithFieldManager(ManagedFieldsManager).
+		WithFieldManager(getManagedFieldsManager()).
 		WithFieldValidation(string(fieldValidationDirective))
 
 	// Send the full object to be applied on the server side.
 	data, err := runtime.Encode(unstructured.UnstructuredJSONScheme, target.Object)
 	if err != nil {
-		return fmt.Errorf("failed to encode object %s/%s with kind %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.Kind, err)
+		return fmt.Errorf("failed to encode object %s/%s %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.String(), err)
 	}
 	options := metav1.PatchOptions{
 		Force: &forceConflicts,
@@ -1026,7 +1117,7 @@ func patchResourceServerSide(target *resource.Info, dryRun bool, forceConflicts
 		}
 
 		if apierrors.IsConflict(err) {
-			return fmt.Errorf("conflict occurred while applying %s/%s with kind %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.Kind, err)
+			return fmt.Errorf("conflict occurred while applying object %s/%s %s: %w", target.Namespace, target.Name, target.Mapping.GroupVersionKind.String(), err)
 		}
 
 		return err
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 5060a5fc2..a8a8668c7 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -339,9 +339,11 @@ func TestUpdate(t *testing.T) {
 	}
 
 	expectedActionsServerSideApply := []string{
+		"/namespaces/default/pods/starfish:GET",
 		"/namespaces/default/pods/starfish:GET",
 		"/namespaces/default/pods/starfish:PATCH",
 		"/namespaces/default/pods/otter:GET",
+		"/namespaces/default/pods/otter:GET",
 		"/namespaces/default/pods/otter:PATCH",
 		"/namespaces/default/pods/dolphin:GET",
 		"/namespaces/default/pods:POST", // create dolphin
@@ -467,7 +469,8 @@ func TestUpdate(t *testing.T) {
 				second,
 				ClientUpdateOptionThreeWayMergeForUnstructured(tc.ThreeWayMergeForUnstructured),
 				ClientUpdateOptionForceReplace(false),
-				ClientUpdateOptionServerSideApply(tc.ServerSideApply, false))
+				ClientUpdateOptionServerSideApply(tc.ServerSideApply, false),
+				ClientUpdateOptionUpgradeClientSideFieldManager(true))
 			require.NoError(t, err)
 
 			assert.Len(t, result.Created, 1, "expected 1 resource created, got %d", len(result.Created))

From 04cb1bad672e5d10453bea42d0fcaee5dae8df63 Mon Sep 17 00:00:00 2001
From: cuiweixie <cuiweixie@gmail.com>
Date: Thu, 21 Aug 2025 19:44:33 +0800
Subject: [PATCH 149/211] pkg/register: refactor to use atomic.Uint64

Signed-off-by: cuiweixie <cuiweixie@gmail.com>
---
 pkg/registry/transport.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/registry/transport.go b/pkg/registry/transport.go
index a82229e2f..9d6a37326 100644
--- a/pkg/registry/transport.go
+++ b/pkg/registry/transport.go
@@ -32,7 +32,7 @@ import (
 var (
 	// requestCount records the number of logged request-response pairs and will
 	// be used as the unique id for the next pair.
-	requestCount uint64
+	requestCount atomic.Uint64
 
 	// toScrub is a set of headers that should be scrubbed from the log.
 	toScrub = []string{
@@ -79,7 +79,7 @@ func NewTransport(debug bool) *retry.Transport {
 
 // RoundTrip calls base round trip while keeping track of the current request.
 func (t *LoggingTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
-	id := atomic.AddUint64(&requestCount, 1) - 1
+	id := requestCount.Add(1) - 1
 
 	slog.Debug(req.Method, "id", id, "url", req.URL, "header", logHeader(req.Header))
 	resp, err = t.RoundTripper.RoundTrip(req)

From fea6d8eb045ec82bfb6a500d91fa6c965898efd2 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Thu, 21 Aug 2025 14:25:55 -0400
Subject: [PATCH 150/211] Updating to tested content cache

A few things are added here:
1. The cache is made to be more generic as a content based cache.
   It could be used for other things such as plugins
2. Flags were added to specify the content cache locaiton rather
   than rely on the repository cache. Keeping the 2 the same
   hid bugs and errors.
3. Tests were added and updated to ensure the cache is used and
   tested

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 internal/third_party/dep/fs/fs.go       |   8 +-
 internal/third_party/dep/fs/fs_test.go  |   6 +-
 pkg/action/install.go                   |   1 +
 pkg/action/pull.go                      |   1 +
 pkg/cli/environment.go                  |   4 +
 pkg/cmd/dependency_build.go             |   1 +
 pkg/cmd/dependency_update.go            |   1 +
 pkg/cmd/dependency_update_test.go       |  19 ++--
 pkg/cmd/install.go                      |   1 +
 pkg/cmd/package.go                      |   1 +
 pkg/cmd/pull_test.go                    |   5 +-
 pkg/cmd/show_test.go                    |   5 +-
 pkg/cmd/upgrade.go                      |   1 +
 pkg/downloader/cache.go                 |  29 +++---
 pkg/downloader/cache_test.go            | 122 ++++++++++++++++++++++++
 pkg/downloader/chart_downloader.go      |  75 ++++++++++++---
 pkg/downloader/chart_downloader_test.go | 119 +++++++++++++++++++++++
 pkg/downloader/manager.go               |   4 +
 pkg/downloader/manager_test.go          |   2 +
 19 files changed, 364 insertions(+), 41 deletions(-)
 create mode 100644 pkg/downloader/cache_test.go

diff --git a/internal/third_party/dep/fs/fs.go b/internal/third_party/dep/fs/fs.go
index 717eff04d..6e2720f3b 100644
--- a/internal/third_party/dep/fs/fs.go
+++ b/internal/third_party/dep/fs/fs.go
@@ -73,7 +73,7 @@ func renameByCopy(src, dst string) error {
 			cerr = fmt.Errorf("copying directory failed: %w", cerr)
 		}
 	} else {
-		cerr = copyFile(src, dst)
+		cerr = CopyFile(src, dst)
 		if cerr != nil {
 			cerr = fmt.Errorf("copying file failed: %w", cerr)
 		}
@@ -139,7 +139,7 @@ func CopyDir(src, dst string) error {
 		} else {
 			// This will include symlinks, which is what we want when
 			// copying things.
-			if err = copyFile(srcPath, dstPath); err != nil {
+			if err = CopyFile(srcPath, dstPath); err != nil {
 				return fmt.Errorf("copying file failed: %w", err)
 			}
 		}
@@ -148,11 +148,11 @@ func CopyDir(src, dst string) error {
 	return nil
 }
 
-// copyFile copies the contents of the file named src to the file named
+// CopyFile copies the contents of the file named src to the file named
 // by dst. The file will be created if it does not already exist. If the
 // destination file exists, all its contents will be replaced by the contents
 // of the source file. The file mode will be copied from the source.
-func copyFile(src, dst string) (err error) {
+func CopyFile(src, dst string) (err error) {
 	if sym, err := IsSymlink(src); err != nil {
 		return fmt.Errorf("symlink check failed: %w", err)
 	} else if sym {
diff --git a/internal/third_party/dep/fs/fs_test.go b/internal/third_party/dep/fs/fs_test.go
index 4c59d17fe..610771bc3 100644
--- a/internal/third_party/dep/fs/fs_test.go
+++ b/internal/third_party/dep/fs/fs_test.go
@@ -326,7 +326,7 @@ func TestCopyFile(t *testing.T) {
 	srcf.Close()
 
 	destf := filepath.Join(dir, "destf")
-	if err := copyFile(srcf.Name(), destf); err != nil {
+	if err := CopyFile(srcf.Name(), destf); err != nil {
 		t.Fatal(err)
 	}
 
@@ -366,7 +366,7 @@ func TestCopyFileSymlink(t *testing.T) {
 	for symlink, dst := range testcases {
 		t.Run(symlink, func(t *testing.T) {
 			var err error
-			if err = copyFile(symlink, dst); err != nil {
+			if err = CopyFile(symlink, dst); err != nil {
 				t.Fatalf("failed to copy symlink: %s", err)
 			}
 
@@ -438,7 +438,7 @@ func TestCopyFileFail(t *testing.T) {
 	defer cleanup()
 
 	fn := filepath.Join(dstdir, "file")
-	if err := copyFile(srcf.Name(), fn); err == nil {
+	if err := CopyFile(srcf.Name(), fn); err == nil {
 		t.Fatalf("expected error for %s, got none", fn)
 	}
 }
diff --git a/pkg/action/install.go b/pkg/action/install.go
index b13bbfb8b..db130c6e9 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -815,6 +815,7 @@ func (c *ChartPathOptions) LocateChart(name string, settings *cli.EnvSettings) (
 		},
 		RepositoryConfig: settings.RepositoryConfig,
 		RepositoryCache:  settings.RepositoryCache,
+		ContentCache:     settings.ContentCache,
 		RegistryClient:   c.registryClient,
 	}
 
diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index b4779f8d2..c1f77e44c 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -88,6 +88,7 @@ func (p *Pull) Run(chartRef string) (string, error) {
 		RegistryClient:   p.cfg.RegistryClient,
 		RepositoryConfig: p.Settings.RepositoryConfig,
 		RepositoryCache:  p.Settings.RepositoryCache,
+		ContentCache:     p.Settings.ContentCache,
 	}
 
 	if registry.IsOCI(chartRef) {
diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index c5f87cf24..19563cba3 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -91,6 +91,8 @@ type EnvSettings struct {
 	QPS float32
 	// ColorMode controls colorized output (never, auto, always)
 	ColorMode string
+	// ContentCache is the location where cached charts are stored
+	ContentCache string
 }
 
 func New() *EnvSettings {
@@ -109,6 +111,7 @@ func New() *EnvSettings {
 		RegistryConfig:            envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry/config.json")),
 		RepositoryConfig:          envOr("HELM_REPOSITORY_CONFIG", helmpath.ConfigPath("repositories.yaml")),
 		RepositoryCache:           envOr("HELM_REPOSITORY_CACHE", helmpath.CachePath("repository")),
+		ContentCache:              envOr("HELM_CONTENT_CACHE", helmpath.CachePath("content")),
 		BurstLimit:                envIntOr("HELM_BURST_LIMIT", defaultBurstLimit),
 		QPS:                       envFloat32Or("HELM_QPS", defaultQPS),
 		ColorMode:                 envColorMode(),
@@ -161,6 +164,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.RegistryConfig, "registry-config", s.RegistryConfig, "path to the registry config file")
 	fs.StringVar(&s.RepositoryConfig, "repository-config", s.RepositoryConfig, "path to the file containing repository names and URLs")
 	fs.StringVar(&s.RepositoryCache, "repository-cache", s.RepositoryCache, "path to the directory containing cached repository indexes")
+	fs.StringVar(&s.ContentCache, "content-cache", s.ContentCache, "path to the directory containing cached content (e.g. charts)")
 	fs.IntVar(&s.BurstLimit, "burst-limit", s.BurstLimit, "client-side default throttling limit")
 	fs.Float32Var(&s.QPS, "qps", s.QPS, "queries per second used when communicating with the Kubernetes API, not including bursting")
 	fs.StringVar(&s.ColorMode, "color", s.ColorMode, "use colored output (never, auto, always)")
diff --git a/pkg/cmd/dependency_build.go b/pkg/cmd/dependency_build.go
index 16907facf..320fe12ae 100644
--- a/pkg/cmd/dependency_build.go
+++ b/pkg/cmd/dependency_build.go
@@ -69,6 +69,7 @@ func newDependencyBuildCmd(out io.Writer) *cobra.Command {
 				RegistryClient:   registryClient,
 				RepositoryConfig: settings.RepositoryConfig,
 				RepositoryCache:  settings.RepositoryCache,
+				ContentCache:     settings.ContentCache,
 				Debug:            settings.Debug,
 			}
 			if client.Verify {
diff --git a/pkg/cmd/dependency_update.go b/pkg/cmd/dependency_update.go
index 921e5ef49..b534fb48a 100644
--- a/pkg/cmd/dependency_update.go
+++ b/pkg/cmd/dependency_update.go
@@ -73,6 +73,7 @@ func newDependencyUpdateCmd(_ *action.Configuration, out io.Writer) *cobra.Comma
 				RegistryClient:   registryClient,
 				RepositoryConfig: settings.RepositoryConfig,
 				RepositoryCache:  settings.RepositoryCache,
+				ContentCache:     settings.ContentCache,
 				Debug:            settings.Debug,
 			}
 			if client.Verify {
diff --git a/pkg/cmd/dependency_update_test.go b/pkg/cmd/dependency_update_test.go
index 9646c6816..f1b39c4b7 100644
--- a/pkg/cmd/dependency_update_test.go
+++ b/pkg/cmd/dependency_update_test.go
@@ -45,6 +45,7 @@ func TestDependencyUpdateCmd(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	contentCache := t.TempDir()
 
 	ociChartName := "oci-depending-chart"
 	c := createTestingMetadataForOCI(ociChartName, ociSrv.RegistryURL)
@@ -69,7 +70,7 @@ func TestDependencyUpdateCmd(t *testing.T) {
 	}
 
 	_, out, err := executeActionCommand(
-		fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir()),
+		fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --content-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir(), contentCache),
 	)
 	if err != nil {
 		t.Logf("Output: %s", out)
@@ -112,7 +113,7 @@ func TestDependencyUpdateCmd(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, out, err = executeActionCommand(fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir()))
+	_, out, err = executeActionCommand(fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --content-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir(), contentCache))
 	if err != nil {
 		t.Logf("Output: %s", out)
 		t.Fatal(err)
@@ -133,11 +134,12 @@ func TestDependencyUpdateCmd(t *testing.T) {
 	if err := chartutil.SaveDir(c, dir()); err != nil {
 		t.Fatal(err)
 	}
-	cmd := fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --registry-config %s/config.json --plain-http",
+	cmd := fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --registry-config %s/config.json --content-cache %s --plain-http",
 		dir(ociChartName),
 		dir("repositories.yaml"),
 		dir(),
-		dir())
+		dir(),
+		contentCache)
 	_, out, err = executeActionCommand(cmd)
 	if err != nil {
 		t.Logf("Output: %s", out)
@@ -179,8 +181,9 @@ func TestDependencyUpdateCmd_DoNotDeleteOldChartsOnError(t *testing.T) {
 
 	// Chart repo is down
 	srv.Stop()
+	contentCache := t.TempDir()
 
-	_, output, err = executeActionCommand(fmt.Sprintf("dependency update %s --repository-config %s --repository-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir()))
+	_, output, err = executeActionCommand(fmt.Sprintf("dependency update %s --repository-config %s --repository-cache %s --content-cache %s --plain-http", dir(chartname), dir("repositories.yaml"), dir(), contentCache))
 	if err == nil {
 		t.Logf("Output: %s", output)
 		t.Fatal("Expected error, got nil")
@@ -232,9 +235,11 @@ func TestDependencyUpdateCmd_WithRepoThatWasNotAdded(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	contentCache := t.TempDir()
+
 	_, out, err := executeActionCommand(
-		fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s", dir(chartname),
-			dir("repositories.yaml"), dir()),
+		fmt.Sprintf("dependency update '%s' --repository-config %s --repository-cache %s --content-cache %s", dir(chartname),
+			dir("repositories.yaml"), dir(), contentCache),
 	)
 
 	if err != nil {
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index d53b1d981..b254b887e 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -287,6 +287,7 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 					Getters:          p,
 					RepositoryConfig: settings.RepositoryConfig,
 					RepositoryCache:  settings.RepositoryCache,
+					ContentCache:     settings.ContentCache,
 					Debug:            settings.Debug,
 					RegistryClient:   client.GetRegistryClient(),
 				}
diff --git a/pkg/cmd/package.go b/pkg/cmd/package.go
index 40c503222..fc56e936a 100644
--- a/pkg/cmd/package.go
+++ b/pkg/cmd/package.go
@@ -100,6 +100,7 @@ func newPackageCmd(out io.Writer) *cobra.Command {
 						RegistryClient:   registryClient,
 						RepositoryConfig: settings.RepositoryConfig,
 						RepositoryCache:  settings.RepositoryCache,
+						ContentCache:     settings.ContentCache,
 					}
 
 					if err := downloadManager.Update(); err != nil {
diff --git a/pkg/cmd/pull_test.go b/pkg/cmd/pull_test.go
index 58e1862ae..ed8ea442e 100644
--- a/pkg/cmd/pull_test.go
+++ b/pkg/cmd/pull_test.go
@@ -212,15 +212,18 @@ func TestPullCmd(t *testing.T) {
 		},
 	}
 
+	contentCache := t.TempDir()
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			outdir := srv.Root()
-			cmd := fmt.Sprintf("fetch %s -d '%s' --repository-config %s --repository-cache %s --registry-config %s --plain-http",
+			cmd := fmt.Sprintf("fetch %s -d '%s' --repository-config %s --repository-cache %s --registry-config %s --content-cache %s --plain-http",
 				tt.args,
 				outdir,
 				filepath.Join(outdir, "repositories.yaml"),
 				outdir,
 				filepath.Join(outdir, "config.json"),
+				contentCache,
 			)
 			// Create file or Dir before helm pull --untar, see: https://github.com/helm/helm/issues/7182
 			if tt.existFile != "" {
diff --git a/pkg/cmd/show_test.go b/pkg/cmd/show_test.go
index ab8cafc37..5ccb4bcad 100644
--- a/pkg/cmd/show_test.go
+++ b/pkg/cmd/show_test.go
@@ -64,14 +64,17 @@ func TestShowPreReleaseChart(t *testing.T) {
 		},
 	}
 
+	contentTmp := t.TempDir()
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			outdir := srv.Root()
-			cmd := fmt.Sprintf("show all '%s' %s --repository-config %s --repository-cache %s",
+			cmd := fmt.Sprintf("show all '%s' %s --repository-config %s --repository-cache %s --content-cache %s",
 				tt.args,
 				tt.flags,
 				filepath.Join(outdir, "repositories.yaml"),
 				outdir,
+				contentTmp,
 			)
 			//_, out, err := executeActionCommand(cmd)
 			_, _, err := executeActionCommand(cmd)
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index c3288286b..4f204037a 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -210,6 +210,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 							Getters:          p,
 							RepositoryConfig: settings.RepositoryConfig,
 							RepositoryCache:  settings.RepositoryCache,
+							ContentCache:     settings.ContentCache,
 							Debug:            settings.Debug,
 						}
 						if err := man.Update(); err != nil {
diff --git a/pkg/downloader/cache.go b/pkg/downloader/cache.go
index d9b925756..cecfc8bd7 100644
--- a/pkg/downloader/cache.go
+++ b/pkg/downloader/cache.go
@@ -17,6 +17,7 @@ package downloader
 
 import (
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"io"
 	"log/slog"
@@ -31,11 +32,17 @@ import (
 // digests in index files providing a common key for checking content.
 type Cache interface {
 	// Get returns a reader for the given key.
-	Get(key [sha256.Size]byte, prov bool) (string, error)
+	Get(key [sha256.Size]byte, cacheType string) (string, error)
 	// Put stores the given reader for the given key.
-	Put(key [sha256.Size]byte, data io.Reader, prov bool) (string, error)
+	Put(key [sha256.Size]byte, data io.Reader, cacheType string) (string, error)
 }
 
+// CacheChart specifies the content is a chart
+var CacheChart = ".chart"
+
+// CacheProv specifies the content is a provenance file
+var CacheProv = ".prov"
+
 // TODO: The cache assumes files because much of Helm assumes files. Convert
 // Helm to pass content around instead of file locations.
 
@@ -45,8 +52,8 @@ type DiskCache struct {
 }
 
 // Get returns a reader for the given key.
-func (c *DiskCache) Get(key [sha256.Size]byte, prov bool) (string, error) {
-	p := c.fileName(key, prov)
+func (c *DiskCache) Get(key [sha256.Size]byte, cacheType string) (string, error) {
+	p := c.fileName(key, cacheType)
 	fi, err := os.Stat(p)
 	if err != nil {
 		return "", err
@@ -58,16 +65,16 @@ func (c *DiskCache) Get(key [sha256.Size]byte, prov bool) (string, error) {
 	// directories should never happen unless something outside helm is operating
 	// on this content.
 	if fi.IsDir() {
-		return p, os.ErrInvalid
+		return p, errors.New("is a directory")
 	}
 	return p, nil
 }
 
 // Put stores the given reader for the given key.
 // It returns the path to the stored file.
-func (c *DiskCache) Put(key [sha256.Size]byte, data io.Reader, prov bool) (string, error) {
+func (c *DiskCache) Put(key [sha256.Size]byte, data io.Reader, cacheType string) (string, error) {
 	// TODO: verify the key and digest of the key are the same.
-	p := c.fileName(key, prov)
+	p := c.fileName(key, cacheType)
 	if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
 		slog.Error("failed to create cache directory")
 		return p, err
@@ -77,10 +84,6 @@ func (c *DiskCache) Put(key [sha256.Size]byte, data io.Reader, prov bool) (strin
 
 // fileName generates the filename in a structured manner where the first part is the
 // directory and the full hash is the filename.
-func (c *DiskCache) fileName(id [sha256.Size]byte, prov bool) string {
-	suffix := ".tgz"
-	if prov {
-		suffix = ".prov"
-	}
-	return filepath.Join(c.Root, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%x", id)+suffix)
+func (c *DiskCache) fileName(id [sha256.Size]byte, cacheType string) string {
+	return filepath.Join(c.Root, fmt.Sprintf("%02x", id[0]), fmt.Sprintf("%x", id)+cacheType)
 }
diff --git a/pkg/downloader/cache_test.go b/pkg/downloader/cache_test.go
new file mode 100644
index 000000000..340c77aba
--- /dev/null
+++ b/pkg/downloader/cache_test.go
@@ -0,0 +1,122 @@
+/*
+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 downloader
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// compiler check to ensure DiskCache implements the Cache interface.
+var _ Cache = (*DiskCache)(nil)
+
+func TestDiskCache_PutAndGet(t *testing.T) {
+	// Setup a temporary directory for the cache
+	tmpDir := t.TempDir()
+	cache := &DiskCache{Root: tmpDir}
+
+	// Test data
+	content := []byte("hello world")
+	key := sha256.Sum256(content)
+
+	// --- Test case 1: Put and Get a regular file (prov=false) ---
+	t.Run("PutAndGetTgz", func(t *testing.T) {
+		// Put the data into the cache
+		path, err := cache.Put(key, bytes.NewReader(content), CacheChart)
+		require.NoError(t, err, "Put should not return an error")
+
+		// Verify the file exists at the returned path
+		_, err = os.Stat(path)
+		require.NoError(t, err, "File should exist after Put")
+
+		// Get the file from the cache
+		retrievedPath, err := cache.Get(key, CacheChart)
+		require.NoError(t, err, "Get should not return an error for existing file")
+		assert.Equal(t, path, retrievedPath, "Get should return the same path as Put")
+
+		// Verify content
+		data, err := os.ReadFile(retrievedPath)
+		require.NoError(t, err)
+		assert.Equal(t, content, data, "Content of retrieved file should match original content")
+	})
+
+	// --- Test case 2: Put and Get a provenance file (prov=true) ---
+	t.Run("PutAndGetProv", func(t *testing.T) {
+		provContent := []byte("provenance data")
+		provKey := sha256.Sum256(provContent)
+
+		path, err := cache.Put(provKey, bytes.NewReader(provContent), CacheProv)
+		require.NoError(t, err)
+
+		retrievedPath, err := cache.Get(provKey, CacheProv)
+		require.NoError(t, err)
+		assert.Equal(t, path, retrievedPath)
+
+		data, err := os.ReadFile(retrievedPath)
+		require.NoError(t, err)
+		assert.Equal(t, provContent, data)
+	})
+
+	// --- Test case 3: Get a non-existent file ---
+	t.Run("GetNonExistent", func(t *testing.T) {
+		nonExistentKey := sha256.Sum256([]byte("does not exist"))
+		_, err := cache.Get(nonExistentKey, CacheChart)
+		assert.ErrorIs(t, err, os.ErrNotExist, "Get for a non-existent key should return os.ErrNotExist")
+	})
+
+	// --- Test case 4: Put an empty file ---
+	t.Run("PutEmptyFile", func(t *testing.T) {
+		emptyContent := []byte{}
+		emptyKey := sha256.Sum256(emptyContent)
+
+		path, err := cache.Put(emptyKey, bytes.NewReader(emptyContent), CacheChart)
+		require.NoError(t, err)
+
+		// Get should return ErrNotExist for empty files
+		_, err = cache.Get(emptyKey, CacheChart)
+		assert.ErrorIs(t, err, os.ErrNotExist, "Get for an empty file should return os.ErrNotExist")
+
+		// But the file should exist
+		_, err = os.Stat(path)
+		require.NoError(t, err, "Empty file should still exist on disk")
+	})
+
+	// --- Test case 5: Get a directory ---
+	t.Run("GetDirectory", func(t *testing.T) {
+		dirKey := sha256.Sum256([]byte("i am a directory"))
+		dirPath := cache.fileName(dirKey, CacheChart)
+		err := os.MkdirAll(dirPath, 0755)
+		require.NoError(t, err)
+
+		_, err = cache.Get(dirKey, CacheChart)
+		assert.EqualError(t, err, "is a directory")
+	})
+}
+
+func TestDiskCache_fileName(t *testing.T) {
+	cache := &DiskCache{Root: "/tmp/cache"}
+	key := sha256.Sum256([]byte("some data"))
+
+	assert.Equal(t, filepath.Join("/tmp/cache", "13", "1307990e6ba5ca145eb35e99182a9bec46531bc54ddf656a602c780fa0240dee.chart"), cache.fileName(key, CacheChart))
+	assert.Equal(t, filepath.Join("/tmp/cache", "13", "1307990e6ba5ca145eb35e99182a9bec46531bc54ddf656a602c780fa0240dee.prov"), cache.fileName(key, CacheProv))
+}
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index bdf65011c..693e6b009 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -23,12 +23,14 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
+	"log/slog"
 	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"helm.sh/helm/v4/internal/fileutil"
+	ifs "helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/internal/urlutil"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
@@ -76,6 +78,11 @@ type ChartDownloader struct {
 	RepositoryConfig string
 	RepositoryCache  string
 
+	// ContentCache is the location where Cache stores its files by default
+	// In previous versions of Helm the charts were put in the RepositoryCache. The
+	// repositories and charts are stored in 2 difference caches.
+	ContentCache string
+
 	// Cache specifies the cache implementation to use.
 	Cache Cache
 }
@@ -93,7 +100,11 @@ type ChartDownloader struct {
 // (if provenance was verified), or an error if something bad happened.
 func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *provenance.Verification, error) {
 	if c.Cache == nil {
-		c.Cache = &DiskCache{Root: c.RepositoryCache}
+		if c.ContentCache == "" {
+			return "", nil, errors.New("content cache must be set")
+		}
+		c.Cache = &DiskCache{Root: c.ContentCache}
+		slog.Debug("setup up default downloader cache")
 	}
 	hash, u, err := c.ResolveChartVersion(ref, version)
 	if err != nil {
@@ -119,11 +130,12 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 			return "", nil, err
 		}
 		copy(digest32[:], digest)
-		if pth, err := c.Cache.Get(digest32, false); err == nil {
+		if pth, err := c.Cache.Get(digest32, CacheChart); err == nil {
 			fdata, err := os.ReadFile(pth)
 			if err == nil {
 				found = true
 				data = bytes.NewBuffer(fdata)
+				slog.Debug("found chart in cache", "id", hash)
 			}
 		}
 	}
@@ -154,11 +166,12 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 		found = false
 		var body *bytes.Buffer
 		if hash != "" {
-			if pth, err := c.Cache.Get(digest32, true); err == nil {
+			if pth, err := c.Cache.Get(digest32, CacheProv); err == nil {
 				fdata, err := os.ReadFile(pth)
 				if err == nil {
 					found = true
 					body = bytes.NewBuffer(fdata)
+					slog.Debug("found provenance in cache", "id", hash)
 				}
 			}
 		}
@@ -192,7 +205,11 @@ func (c *ChartDownloader) DownloadTo(ref, version, dest string) (string, *proven
 // DownloadToCache retrieves resources while using a content based cache.
 func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provenance.Verification, error) {
 	if c.Cache == nil {
-		c.Cache = &DiskCache{Root: c.RepositoryCache}
+		if c.ContentCache == "" {
+			return "", nil, errors.New("content cache must be set")
+		}
+		c.Cache = &DiskCache{Root: c.ContentCache}
+		slog.Debug("setup up default downloader cache")
 	}
 
 	digestString, u, err := c.ResolveChartVersion(ref, version)
@@ -221,9 +238,13 @@ func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provena
 	var pth string
 	// only fetch from the cache if we have a digest
 	if len(digest) > 0 {
-		pth, err = c.Cache.Get(digest32, false)
+		pth, err = c.Cache.Get(digest32, CacheChart)
+		if err == nil {
+			slog.Debug("found chart in cache", "id", digestString)
+		}
 	}
 	if len(digest) == 0 || err != nil {
+		slog.Debug("attempting to download chart", "ref", ref, "version", version)
 		if err != nil && !os.IsNotExist(err) {
 			return "", nil, err
 		}
@@ -236,21 +257,24 @@ func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provena
 
 		// Generate the digest
 		if len(digest) == 0 {
-			h := sha256.New()
-			digest32 = [sha256.Size]byte(h.Sum(data.Bytes()))
+			digest32 = sha256.Sum256(data.Bytes())
 		}
 
-		pth, err = c.Cache.Put(digest32, data, false)
+		pth, err = c.Cache.Put(digest32, data, CacheChart)
 		if err != nil {
 			return "", nil, err
 		}
+		slog.Debug("put downloaded chart in cache", "id", hex.EncodeToString(digest32[:]))
 	}
 
 	// If provenance is requested, verify it.
 	ver := &provenance.Verification{}
 	if c.Verify > VerifyNever {
-		ppth, err := c.Cache.Get(digest32, true)
-		if err != nil {
+
+		ppth, err := c.Cache.Get(digest32, CacheProv)
+		if err == nil {
+			slog.Debug("found provenance in cache", "id", digestString)
+		} else {
 			if !os.IsNotExist(err) {
 				return pth, ver, err
 			}
@@ -264,14 +288,41 @@ func (c *ChartDownloader) DownloadToCache(ref, version string) (string, *provena
 				return pth, ver, nil
 			}
 
-			ppth, err = c.Cache.Put(digest32, body, true)
+			ppth, err = c.Cache.Put(digest32, body, CacheProv)
 			if err != nil {
 				return "", nil, err
 			}
+			slog.Debug("put downloaded provenance file in cache", "id", hex.EncodeToString(digest32[:]))
 		}
 
 		if c.Verify != VerifyLater {
-			ver, err = VerifyChart(pth, ppth, c.Keyring)
+
+			// provenance files pin to a specific name so this needs to be accounted for
+			// when verifying.
+			// Note, this does make an assumption that the name/version is unique to a
+			// hash when a provenance file is used. If this isn't true, this section of code
+			// will need to be reworked.
+			name := filepath.Base(u.Path)
+			if u.Scheme == registry.OCIScheme {
+				idx := strings.LastIndexByte(name, ':')
+				name = fmt.Sprintf("%s-%s.tgz", name[:idx], name[idx+1:])
+			}
+
+			// Copy chart to a known location with the right name for verification and then
+			// clean it up.
+			tmpdir := filepath.Dir(filepath.Join(c.ContentCache, "tmp"))
+			if err := os.MkdirAll(tmpdir, 0755); err != nil {
+				return pth, ver, err
+			}
+			tmpfile := filepath.Join(tmpdir, name)
+			err = ifs.CopyFile(pth, tmpfile)
+			if err != nil {
+				return pth, ver, err
+			}
+			// Not removing the tmp dir itself because a concurrent process may be using it
+			defer os.RemoveAll(tmpfile)
+
+			ver, err = VerifyChart(tmpfile, ppth, c.Keyring)
 			if err != nil {
 				// Fail always in this case, since it means the verification step
 				// failed.
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index 5b5f96751..649448fef 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -16,10 +16,14 @@ limitations under the License.
 package downloader
 
 import (
+	"crypto/sha256"
+	"encoding/hex"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
@@ -198,15 +202,19 @@ func TestDownloadTo(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	contentCache := t.TempDir()
+
 	c := ChartDownloader{
 		Out:              os.Stderr,
 		Verify:           VerifyAlways,
 		Keyring:          "testdata/helm-test-key.pub",
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ContentCache:     contentCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
+			ContentCache:     contentCache,
 		}),
 		Options: []getter.Option{
 			getter.WithBasicAuth("username", "password"),
@@ -250,6 +258,7 @@ func TestDownloadTo_TLS(t *testing.T) {
 
 	repoConfig := filepath.Join(srv.Root(), "repositories.yaml")
 	repoCache := srv.Root()
+	contentCache := t.TempDir()
 
 	c := ChartDownloader{
 		Out:              os.Stderr,
@@ -257,9 +266,11 @@ func TestDownloadTo_TLS(t *testing.T) {
 		Keyring:          "testdata/helm-test-key.pub",
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ContentCache:     contentCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
+			ContentCache:     contentCache,
 		}),
 		Options: []getter.Option{
 			getter.WithTLSClientConfig(
@@ -304,15 +315,18 @@ func TestDownloadTo_VerifyLater(t *testing.T) {
 	if err := srv.LinkIndices(); err != nil {
 		t.Fatal(err)
 	}
+	contentCache := t.TempDir()
 
 	c := ChartDownloader{
 		Out:              os.Stderr,
 		Verify:           VerifyLater,
 		RepositoryConfig: repoConfig,
 		RepositoryCache:  repoCache,
+		ContentCache:     contentCache,
 		Getters: getter.All(&cli.EnvSettings{
 			RepositoryConfig: repoConfig,
 			RepositoryCache:  repoCache,
+			ContentCache:     contentCache,
 		}),
 	}
 	cname := "/signtest-0.1.0.tgz"
@@ -366,3 +380,108 @@ func TestScanReposForURL(t *testing.T) {
 		t.Fatalf("expected ErrNoOwnerRepo, got %v", err)
 	}
 }
+
+func TestDownloadToCache(t *testing.T) {
+	srv := repotest.NewTempServer(t,
+		repotest.WithChartSourceGlob("testdata/*.tgz*"),
+	)
+	defer srv.Stop()
+	if err := srv.CreateIndex(); err != nil {
+		t.Fatal(err)
+	}
+	if err := srv.LinkIndices(); err != nil {
+		t.Fatal(err)
+	}
+
+	// The repo file needs to point to our server.
+	repoFile := filepath.Join(srv.Root(), "repositories.yaml")
+	repoCache := srv.Root()
+	contentCache := t.TempDir()
+
+	c := ChartDownloader{
+		Out:              os.Stderr,
+		Verify:           VerifyNever,
+		RepositoryConfig: repoFile,
+		RepositoryCache:  repoCache,
+		Getters: getter.All(&cli.EnvSettings{
+			RepositoryConfig: repoFile,
+			RepositoryCache:  repoCache,
+			ContentCache:     contentCache,
+		}),
+		Cache: &DiskCache{Root: contentCache},
+	}
+
+	// Case 1: Chart not in cache, download it.
+	t.Run("download and cache chart", func(t *testing.T) {
+		// Clear cache for this test
+		os.RemoveAll(contentCache)
+		os.MkdirAll(contentCache, 0755)
+		c.Cache = &DiskCache{Root: contentCache}
+
+		pth, v, err := c.DownloadToCache("test/signtest", "0.1.0")
+		require.NoError(t, err)
+		require.NotNil(t, v)
+
+		// Check that the file exists at the returned path
+		_, err = os.Stat(pth)
+		require.NoError(t, err, "chart should exist at returned path")
+
+		// Check that it's in the cache
+		digest, _, err := c.ResolveChartVersion("test/signtest", "0.1.0")
+		require.NoError(t, err)
+		digestBytes, err := hex.DecodeString(digest)
+		require.NoError(t, err)
+		var digestArray [sha256.Size]byte
+		copy(digestArray[:], digestBytes)
+
+		cachePath, err := c.Cache.Get(digestArray, CacheChart)
+		require.NoError(t, err, "chart should now be in cache")
+		require.Equal(t, pth, cachePath)
+	})
+
+	// Case 2: Chart is in cache, get from cache.
+	t.Run("get chart from cache", func(t *testing.T) {
+		// The cache should be populated from the previous test.
+		// To prove it's coming from cache, we can stop the server.
+		// But repotest doesn't support restarting.
+		// Let's just call it again and assume it works if it's fast and doesn't error.
+		pth, v, err := c.DownloadToCache("test/signtest", "0.1.0")
+		require.NoError(t, err)
+		require.NotNil(t, v)
+
+		_, err = os.Stat(pth)
+		require.NoError(t, err, "chart should exist at returned path")
+	})
+
+	// Case 3: Download with verification
+	t.Run("download and verify", func(t *testing.T) {
+		// Clear cache
+		os.RemoveAll(contentCache)
+		os.MkdirAll(contentCache, 0755)
+		c.Cache = &DiskCache{Root: contentCache}
+		c.Verify = VerifyAlways
+		c.Keyring = "testdata/helm-test-key.pub"
+
+		_, v, err := c.DownloadToCache("test/signtest", "0.1.0")
+		require.NoError(t, err)
+		require.NotNil(t, v)
+		require.NotEmpty(t, v.FileHash, "verification should have a file hash")
+
+		// Check that both chart and prov are in cache
+		digest, _, err := c.ResolveChartVersion("test/signtest", "0.1.0")
+		require.NoError(t, err)
+		digestBytes, err := hex.DecodeString(digest)
+		require.NoError(t, err)
+		var digestArray [sha256.Size]byte
+		copy(digestArray[:], digestBytes)
+
+		_, err = c.Cache.Get(digestArray, CacheChart)
+		require.NoError(t, err, "chart should be in cache")
+		_, err = c.Cache.Get(digestArray, CacheProv)
+		require.NoError(t, err, "provenance file should be in cache")
+
+		// Reset for other tests
+		c.Verify = VerifyNever
+		c.Keyring = ""
+	})
+}
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index b43165975..8b77a77c0 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -75,6 +75,9 @@ type Manager struct {
 	RegistryClient   *registry.Client
 	RepositoryConfig string
 	RepositoryCache  string
+
+	// ContentCache is a location where a cache of charts can be stored
+	ContentCache string
 }
 
 // Build rebuilds a local charts directory from a lockfile.
@@ -331,6 +334,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error {
 			Keyring:          m.Keyring,
 			RepositoryConfig: m.RepositoryConfig,
 			RepositoryCache:  m.RepositoryCache,
+			ContentCache:     m.ContentCache,
 			RegistryClient:   m.RegistryClient,
 			Getters:          m.Getters,
 			Options: []getter.Option{
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index f01a5d7ad..b7121a4ce 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -488,12 +488,14 @@ func checkBuildWithOptionalFields(t *testing.T, chartName string, dep chart.Depe
 		Schemes: []string{"http", "https"},
 		New:     getter.NewHTTPGetter,
 	}}
+	contentCache := t.TempDir()
 	m := &Manager{
 		ChartPath:        dir(chartName),
 		Out:              b,
 		Getters:          g,
 		RepositoryConfig: dir("repositories.yaml"),
 		RepositoryCache:  dir(),
+		ContentCache:     contentCache,
 	}
 
 	// First build will update dependencies and create Chart.lock file.

From be74ab72a06c2525fa833d3f118a2d4cf46e3c49 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Fri, 22 Aug 2025 16:12:49 -0400
Subject: [PATCH 151/211] [HIP-0026] Plugin runtime interface (#31145)

* Runtime abstraction to encapsulate subprocess code and enable future runtimes

Also fix race condition in TestPrepareCommandExtraArgs by replacing the shared variable modification with a local copy

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>

* Remove commented out code

Co-authored-by: Joe Julian <me@joejulian.name>
Signed-off-by: Scott Rigby <scott@r6by.com>

* Check test failure string

Co-authored-by: Jesse Simpson <jesse.simpson36@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>

---------

Signed-off-by: Scott Rigby <scott@r6by.com>
Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Co-authored-by: Joe Julian <me@joejulian.name>
Co-authored-by: Jesse Simpson <jesse.simpson36@gmail.com>
---
 go.mod                                        |   4 +-
 internal/plugin/config.go                     |  66 +++
 internal/plugin/descriptor.go                 |  24 +
 internal/plugin/doc.go                        |  89 +++
 internal/plugin/error.go                      |  29 +
 .../plugin/installer/local_installer_test.go  |   6 +-
 .../plugin/installer/vcs_installer_test.go    |   2 +-
 internal/plugin/loader.go                     | 224 ++++++++
 internal/plugin/loader_test.go                | 197 +++++++
 internal/plugin/metadata.go                   | 155 +++++
 internal/plugin/metadata_legacy.go            | 113 ++++
 internal/plugin/metadata_test.go              | 141 +++++
 internal/plugin/plugin.go                     | 370 ++----------
 internal/plugin/plugin_test.go                | 533 +-----------------
 internal/plugin/runtime.go                    |  33 ++
 internal/plugin/runtime_subprocess.go         | 229 ++++++++
 internal/plugin/runtime_subprocess_getter.go  |  92 +++
 .../{hooks.go => runtime_subprocess_hooks.go} |   0
 internal/plugin/runtime_subprocess_test.go    |  64 +++
 internal/plugin/schema/cli.go                 |  29 +
 internal/plugin/schema/getter.go              |  47 ++
 internal/plugin/subprocess_commands.go        | 111 ++++
 internal/plugin/subprocess_commands_test.go   | 259 +++++++++
 .../plugin.yaml                               |   0
 .../plugdir/good/downloader/plugin.yaml       |   1 +
 .../good/{echo => echo-legacy}/plugin.yaml    |   3 +-
 .../good/{hello => hello-legacy}/hello.ps1    |   0
 .../good/{hello => hello-legacy}/hello.sh     |   0
 .../good/{hello => hello-legacy}/plugin.yaml  |   9 +-
 pkg/action/action.go                          |   2 +-
 pkg/action/install.go                         |   2 +-
 pkg/cmd/flags.go                              |   2 +
 pkg/cmd/helpers_test.go                       |   6 +-
 pkg/cmd/load_plugins.go                       | 159 ++++--
 pkg/cmd/plugin.go                             |  37 +-
 pkg/cmd/plugin_install.go                     |   2 +-
 pkg/cmd/plugin_list.go                        |  44 +-
 pkg/cmd/plugin_test.go                        |  64 +--
 pkg/cmd/plugin_uninstall.go                   |  11 +-
 pkg/cmd/plugin_update.go                      |   6 +-
 pkg/cmd/root.go                               |   4 +-
 pkg/cmd/testdata/testplugin/plugin.yaml       |   4 -
 pkg/getter/getter.go                          |  35 +-
 pkg/getter/httpgetter.go                      |   2 +-
 pkg/getter/httpgetter_test.go                 |   2 +-
 pkg/getter/ocigetter.go                       |   4 +-
 pkg/getter/ocigetter_test.go                  |   2 +-
 pkg/getter/plugingetter.go                    | 147 ++---
 pkg/getter/plugingetter_test.go               | 120 ++--
 pkg/getter/testdata/plugins/testgetter/get.sh |   8 -
 .../testdata/plugins/testgetter/plugin.yaml   |  15 +-
 .../testdata/plugins/testgetter2/get.sh       |   8 -
 .../testdata/plugins/testgetter2/plugin.yaml  |  10 +-
 53 files changed, 2346 insertions(+), 1180 deletions(-)
 create mode 100644 internal/plugin/config.go
 create mode 100644 internal/plugin/descriptor.go
 create mode 100644 internal/plugin/doc.go
 create mode 100644 internal/plugin/error.go
 create mode 100644 internal/plugin/loader.go
 create mode 100644 internal/plugin/loader_test.go
 create mode 100644 internal/plugin/metadata.go
 create mode 100644 internal/plugin/metadata_legacy.go
 create mode 100644 internal/plugin/metadata_test.go
 create mode 100644 internal/plugin/runtime.go
 create mode 100644 internal/plugin/runtime_subprocess.go
 create mode 100644 internal/plugin/runtime_subprocess_getter.go
 rename internal/plugin/{hooks.go => runtime_subprocess_hooks.go} (100%)
 create mode 100644 internal/plugin/runtime_subprocess_test.go
 create mode 100644 internal/plugin/schema/cli.go
 create mode 100644 internal/plugin/schema/getter.go
 create mode 100644 internal/plugin/subprocess_commands.go
 create mode 100644 internal/plugin/subprocess_commands_test.go
 rename internal/plugin/testdata/plugdir/bad/{duplicate-entries => duplicate-entries-legacy}/plugin.yaml (100%)
 rename internal/plugin/testdata/plugdir/good/{echo => echo-legacy}/plugin.yaml (85%)
 rename internal/plugin/testdata/plugdir/good/{hello => hello-legacy}/hello.ps1 (100%)
 rename internal/plugin/testdata/plugdir/good/{hello => hello-legacy}/hello.sh (100%)
 rename internal/plugin/testdata/plugdir/good/{hello => hello-legacy}/plugin.yaml (84%)
 delete mode 100644 pkg/cmd/testdata/testplugin/plugin.yaml
 delete mode 100755 pkg/getter/testdata/plugins/testgetter/get.sh
 delete mode 100755 pkg/getter/testdata/plugins/testgetter2/get.sh

diff --git a/go.mod b/go.mod
index f3a3ebd33..6557d7663 100644
--- a/go.mod
+++ b/go.mod
@@ -25,6 +25,7 @@ require (
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/moby/term v0.5.2
+	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
@@ -35,6 +36,7 @@ require (
 	golang.org/x/crypto v0.41.0
 	golang.org/x/term v0.34.0
 	golang.org/x/text v0.28.0
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.33.4
 	k8s.io/apiextensions-apiserver v0.33.4
 	k8s.io/apimachinery v0.33.4
@@ -114,7 +116,6 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/onsi/gomega v1.37.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -169,7 +170,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.33.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
diff --git a/internal/plugin/config.go b/internal/plugin/config.go
new file mode 100644
index 000000000..f308e7ae9
--- /dev/null
+++ b/internal/plugin/config.go
@@ -0,0 +1,66 @@
+/*
+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 plugin
+
+import (
+	"fmt"
+)
+
+// Config interface defines the methods that all plugin type configurations must implement
+type Config interface {
+	GetType() string
+	Validate() error
+}
+
+// ConfigCLI represents the configuration for CLI plugins
+type ConfigCLI struct {
+	// Usage is the single-line usage text shown in help
+	// For recommended syntax, see [spf13/cobra.command.Command] Use field comment:
+	// https://pkg.go.dev/github.com/spf13/cobra#Command
+	Usage string `yaml:"usage"`
+	// ShortHelp is the short description shown in the 'helm help' output
+	ShortHelp string `yaml:"shortHelp"`
+	// LongHelp is the long message shown in the 'helm help <this-command>' output
+	LongHelp string `yaml:"longHelp"`
+	// IgnoreFlags ignores any flags passed in from Helm
+	IgnoreFlags bool `yaml:"ignoreFlags"`
+}
+
+// ConfigGetter represents the configuration for download plugins
+type ConfigGetter struct {
+	// Protocols are the list of URL schemes supported by this downloader
+	Protocols []string `yaml:"protocols"`
+}
+
+func (c *ConfigCLI) GetType() string    { return "cli/v1" }
+func (c *ConfigGetter) GetType() string { return "getter/v1" }
+
+func (c *ConfigCLI) Validate() error {
+	// Config validation for CLI plugins
+	return nil
+}
+
+func (c *ConfigGetter) Validate() error {
+	if len(c.Protocols) == 0 {
+		return fmt.Errorf("getter has no protocols")
+	}
+	for i, protocol := range c.Protocols {
+		if protocol == "" {
+			return fmt.Errorf("getter has empty protocol at index %d", i)
+		}
+	}
+	return nil
+}
diff --git a/internal/plugin/descriptor.go b/internal/plugin/descriptor.go
new file mode 100644
index 000000000..ba92b3c55
--- /dev/null
+++ b/internal/plugin/descriptor.go
@@ -0,0 +1,24 @@
+/*
+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 plugin
+
+// Descriptor describes a plugin to find
+type Descriptor struct {
+	// Name is the name of the plugin
+	Name string
+	// Type is the type of the plugin (cli, getter, postrenderer)
+	Type string
+}
diff --git a/internal/plugin/doc.go b/internal/plugin/doc.go
new file mode 100644
index 000000000..f150358bd
--- /dev/null
+++ b/internal/plugin/doc.go
@@ -0,0 +1,89 @@
+/*
+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.
+*/
+
+/*
+---
+TODO: move this section to public plugin package
+
+Package plugin provides the implementation of the Helm plugin system.
+
+Conceptually, "plugins" enable extending Helm's functionality external to Helm's core codebase. The plugin system allows
+code to fetch plugins by type, then invoke the plugin with an input as required by that plugin type. The plugin
+returning an output for the caller to consume.
+
+An example of a plugin invocation:
+```
+d := plugin.Descriptor{
+	Type: "example/v1", //
+}
+plgs, err := plugin.FindPlugins([]string{settings.PluginsDirectory}, d)
+
+for _, plg := range plgs {
+	input := &plugin.Input{
+		Message: schema.InputMessageExampleV1{ // The type of the input message is defined by the plugin's "type" (example/v1 here)
+			...
+		},
+	}
+	output, err := plg.Invoke(context.Background(), input)
+	if err != nil {
+	    ...
+	}
+
+	// consume the output, using type assertion to convert to the expected output type (as defined by the plugin's "type")
+	outputMessage, ok := output.Message.(schema.OutputMessageExampleV1)
+}
+
+---
+
+Package `plugin` provides the implementation of the Helm plugin system.
+
+Helm plugins are exposed to uses as the "Plugin" type, the basic interface that primarily support the "Invoke" method.
+
+# Plugin Runtimes
+Internally, plugins must be implemented by a "runtime" that is responsible for creating the plugin instance, and dispatching the plugin's invocation to the plugin's implementation.
+For example:
+- forming environment variables and command line args for subprocess execution
+- converting input to JSON and invoking a function in a future runtime (eg, Wasm)
+
+Internally, the code structure is:
+Runtime.CreatePlugin()
+      |
+	  | (creates)
+	  |
+      \---> PluginRuntime
+	         |
+	         | (implements)
+			 v
+			 Plugin.Invoke()
+
+# Plugin Types
+Each plugin implements a specific functionality, denoted by the plugin's "type" e.g. "getter/v1". The "type" includes a version, in order to allow a given types messaging schema and invocation options to evolve.
+
+Specifically, the plugin's "type" specifies the contract for the input and output messages that are expected to be passed to the plugin, and returned from the plugin. The plugin's "type" also defines the options that can be passed to the plugin when invoking it.
+
+# Metadata
+Each plugin must have a `plugin.yaml`, that defines the plugin's metadata. The metadata includes the plugin's name, version, and other information.
+
+For legacy plugins, the type is inferred by which fields are set on the plugin: a downloader plugin is inferred when metadata contains a "downloaders" yaml node, otherwise it is assumed to define a Helm CLI subcommand.
+
+For future plugin api versions, the metadata will include explicit apiVersion and type fields. It will also contain type and runtime specific Config and RuntimeConfig fields.
+
+# Runtime and type cardinality
+From a cardinality perspective, this means there a "few" runtimes, and "many" plugins types. It is also expected that the subprocess runtime will not be extended to support extra plugin types, and deprecated in a future version of Helm.
+
+Future ideas that are intended to be implemented include extending the plugin system to support future Wasm standards. Or allowing Helm SDK user's to inject "plugins" that are actually implemented as native go modules. Or even moving Helm's internal functionality e.g. yaml rendering engine to be used as an "in-built" plugin, along side other plugins that may implement other (non-go template) rendering engines.
+*/
+
+package plugin
diff --git a/internal/plugin/error.go b/internal/plugin/error.go
new file mode 100644
index 000000000..5ace680cb
--- /dev/null
+++ b/internal/plugin/error.go
@@ -0,0 +1,29 @@
+/*
+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 plugin
+
+// InvokeExecError is returned when a plugin invocation returns a non-zero status/exit code
+// - subprocess plugin: child process exit code
+// - extism plugin: wasm function return code
+type InvokeExecError struct {
+	Err  error // Underlying error
+	Code int   // Exeit code from plugin code execution
+}
+
+// Error implements the error interface
+func (e *InvokeExecError) Error() string {
+	return e.Err.Error()
+}
diff --git a/internal/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
index ef5660d7d..3b1c0f680 100644
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -34,7 +34,7 @@ func TestLocalInstaller(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	source := "../testdata/plugdir/good/echo"
+	source := "../testdata/plugdir/good/echo-legacy"
 	i, err := NewForSource(source, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -44,14 +44,14 @@ func TestLocalInstaller(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if i.Path() != helmpath.DataPath("plugins", "echo") {
+	if i.Path() != helmpath.DataPath("plugins", "echo-legacy") {
 		t.Fatalf("expected path '$XDG_CONFIG_HOME/helm/plugins/helm-env', got %q", i.Path())
 	}
 	defer os.RemoveAll(filepath.Dir(helmpath.DataPath())) // helmpath.DataPath is like /tmp/helm013130971/helm
 }
 
 func TestLocalInstallerNotAFolder(t *testing.T) {
-	source := "../testdata/plugdir/good/echo/plugin.yaml"
+	source := "../testdata/plugdir/good/echo-legacy/plugin.yaml"
 	i, err := NewForSource(source, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
diff --git a/internal/plugin/installer/vcs_installer_test.go b/internal/plugin/installer/vcs_installer_test.go
index 76b337a2f..9c65d244c 100644
--- a/internal/plugin/installer/vcs_installer_test.go
+++ b/internal/plugin/installer/vcs_installer_test.go
@@ -57,7 +57,7 @@ func TestVCSInstaller(t *testing.T) {
 	}
 
 	source := "https://github.com/adamreese/helm-env"
-	testRepoPath, _ := filepath.Abs("../testdata/plugdir/good/echo")
+	testRepoPath, _ := filepath.Abs("../testdata/plugdir/good/echo-legacy")
 	repo := &testRepo{
 		local: testRepoPath,
 		tags:  []string{"0.1.0", "0.1.1"},
diff --git a/internal/plugin/loader.go b/internal/plugin/loader.go
new file mode 100644
index 000000000..b47b15d34
--- /dev/null
+++ b/internal/plugin/loader.go
@@ -0,0 +1,224 @@
+/*
+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 plugin
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
+	"go.yaml.in/yaml/v3"
+)
+
+func peekAPIVersion(r io.Reader) (string, error) {
+	type apiVersion struct {
+		APIVersion string `yaml:"apiVersion"`
+	}
+
+	var v apiVersion
+	d := yaml.NewDecoder(r)
+	if err := d.Decode(&v); err != nil {
+		return "", err
+	}
+
+	return v.APIVersion, nil
+}
+
+func loadMetadataLegacy(metadataData []byte) (*Metadata, error) {
+
+	var ml MetadataLegacy
+	d := yaml.NewDecoder(bytes.NewReader(metadataData))
+	if err := d.Decode(&ml); err != nil {
+		return nil, err
+	}
+
+	if err := ml.Validate(); err != nil {
+		return nil, err
+	}
+
+	m := fromMetadataLegacy(ml)
+	if err := m.Validate(); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func loadMetadata(metadataData []byte) (*Metadata, error) {
+	apiVersion, err := peekAPIVersion(bytes.NewReader(metadataData))
+	if err != nil {
+		return nil, fmt.Errorf("failed to peek %s API version: %w", PluginFileName, err)
+	}
+
+	switch apiVersion {
+	case "": // legacy
+		return loadMetadataLegacy(metadataData)
+	}
+
+	return nil, fmt.Errorf("invalid plugin apiVersion: %q", apiVersion)
+}
+
+type prototypePluginManager struct {
+	runtimes map[string]Runtime
+}
+
+func newPrototypePluginManager() *prototypePluginManager {
+	return &prototypePluginManager{
+		runtimes: map[string]Runtime{
+			"subprocess": &RuntimeSubprocess{},
+		},
+	}
+}
+
+func (pm *prototypePluginManager) RegisterRuntime(runtimeName string, runtime Runtime) {
+	pm.runtimes[runtimeName] = runtime
+}
+
+func (pm *prototypePluginManager) CreatePlugin(pluginPath string, metadata *Metadata) (Plugin, error) {
+	rt, ok := pm.runtimes[metadata.Runtime]
+	if !ok {
+		return nil, fmt.Errorf("unsupported plugin runtime type: %q", metadata.Runtime)
+	}
+
+	return rt.CreatePlugin(pluginPath, metadata)
+}
+
+// LoadDir loads a plugin from the given directory.
+func LoadDir(dirname string) (Plugin, error) {
+	pluginfile := filepath.Join(dirname, PluginFileName)
+	metadataData, err := os.ReadFile(pluginfile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read plugin at %q: %w", pluginfile, err)
+	}
+
+	m, err := loadMetadata(metadataData)
+	if err != nil {
+		return nil, fmt.Errorf("failed to load plugin %q: %w", dirname, err)
+	}
+
+	pm := newPrototypePluginManager()
+	return pm.CreatePlugin(dirname, m)
+}
+
+// LoadAll loads all plugins found beneath the base directory.
+//
+// This scans only one directory level.
+func LoadAll(basedir string) ([]Plugin, error) {
+	var plugins []Plugin
+	// We want basedir/*/plugin.yaml
+	scanpath := filepath.Join(basedir, "*", PluginFileName)
+	matches, err := filepath.Glob(scanpath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to search for plugins in %q: %w", scanpath, err)
+	}
+
+	// empty dir should load
+	if len(matches) == 0 {
+		return plugins, nil
+	}
+
+	for _, yamlFile := range matches {
+		dir := filepath.Dir(yamlFile)
+		p, err := LoadDir(dir)
+		if err != nil {
+			return plugins, err
+		}
+		plugins = append(plugins, p)
+	}
+	return plugins, detectDuplicates(plugins)
+}
+
+// findFunc is a function that finds plugins in a directory
+type findFunc func(pluginsDir string) ([]Plugin, error)
+
+// filterFunc is a function that filters plugins
+type filterFunc func(Plugin) bool
+
+// FindPlugins returns a list of plugins that match the descriptor
+func FindPlugins(pluginsDirs []string, descriptor Descriptor) ([]Plugin, error) {
+	return findPlugins(pluginsDirs, LoadAll, makeDescriptorFilter(descriptor))
+}
+
+// findPlugins is the internal implementation that uses the find and filter functions
+func findPlugins(pluginsDirs []string, findFn findFunc, filterFn filterFunc) ([]Plugin, error) {
+	var found []Plugin
+	for _, pluginsDir := range pluginsDirs {
+		ps, err := findFn(pluginsDir)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, p := range ps {
+			if filterFn(p) {
+				found = append(found, p)
+			}
+		}
+
+	}
+
+	return found, nil
+}
+
+// makeDescriptorFilter creates a filter function from a descriptor
+// Additional plugin filter criteria we wish to support can be added here
+func makeDescriptorFilter(descriptor Descriptor) filterFunc {
+	return func(p Plugin) bool {
+		// If name is specified, it must match
+		if descriptor.Name != "" && p.Metadata().Name != descriptor.Name {
+			return false
+
+		}
+		// If type is specified, it must match
+		if descriptor.Type != "" && p.Metadata().Type != descriptor.Type {
+			return false
+		}
+		return true
+	}
+}
+
+// FindPlugin returns a single plugin that matches the descriptor
+func FindPlugin(dirs []string, descriptor Descriptor) (Plugin, error) {
+	plugins, err := FindPlugins(dirs, descriptor)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(plugins) > 0 {
+		return plugins[0], nil
+	}
+
+	return nil, fmt.Errorf("plugin: %+v not found", descriptor)
+}
+
+func detectDuplicates(plugs []Plugin) error {
+	names := map[string]string{}
+
+	for _, plug := range plugs {
+		if oldpath, ok := names[plug.Metadata().Name]; ok {
+			return fmt.Errorf(
+				"two plugins claim the name %q at %q and %q",
+				plug.Metadata().Name,
+				oldpath,
+				plug.Dir(),
+			)
+		}
+		names[plug.Metadata().Name] = plug.Dir()
+	}
+
+	return nil
+}
diff --git a/internal/plugin/loader_test.go b/internal/plugin/loader_test.go
new file mode 100644
index 000000000..b80d6a096
--- /dev/null
+++ b/internal/plugin/loader_test.go
@@ -0,0 +1,197 @@
+/*
+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 plugin
+
+import (
+	"bytes"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPeekAPIVersion(t *testing.T) {
+	testCases := map[string]struct {
+		data     []byte
+		expected string
+	}{
+		"legacy": { // No apiVersion field
+			data: []byte(`---
+name: "test-plugin"
+`),
+			expected: "",
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			version, err := peekAPIVersion(bytes.NewReader(tc.data))
+			require.NoError(t, err)
+			assert.Equal(t, tc.expected, version)
+		})
+	}
+
+	// invalid yaml
+	{
+		data := []byte(`bad yaml`)
+		_, err := peekAPIVersion(bytes.NewReader(data))
+		assert.Error(t, err)
+	}
+}
+
+func TestLoadDir(t *testing.T) {
+
+	makeMetadata := func(apiVersion string) Metadata {
+		usage := "hello [params]..."
+		if apiVersion == "legacy" {
+			usage = "" // Legacy plugins don't have Usage field for command syntax
+		}
+		return Metadata{
+			APIVersion: apiVersion,
+			Name:       fmt.Sprintf("hello-%s", apiVersion),
+			Version:    "0.1.0",
+			Type:       "cli/v1",
+			Runtime:    "subprocess",
+			Config: &ConfigCLI{
+				Usage:       usage,
+				ShortHelp:   "echo hello message",
+				LongHelp:    "description",
+				IgnoreFlags: true,
+			},
+			RuntimeConfig: &RuntimeConfigSubprocess{
+				PlatformCommands: []PlatformCommand{
+					{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.sh"}},
+					{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.ps1"}},
+				},
+				PlatformHooks: map[string][]PlatformCommand{
+					Install: {
+						{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
+						{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"installing...\""}},
+					},
+				},
+			},
+		}
+	}
+
+	testCases := map[string]struct {
+		dirname    string
+		apiVersion string
+		expect     Metadata
+	}{
+		"legacy": {
+			dirname:    "testdata/plugdir/good/hello-legacy",
+			apiVersion: "legacy",
+			expect:     makeMetadata("legacy"),
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			plug, err := LoadDir(tc.dirname)
+			require.NoError(t, err, "error loading plugin from %s", tc.dirname)
+
+			assert.Equal(t, tc.dirname, plug.Dir())
+			assert.EqualValues(t, tc.expect, plug.Metadata())
+		})
+	}
+}
+
+func TestLoadDirDuplicateEntries(t *testing.T) {
+	testCases := map[string]string{
+		"legacy": "testdata/plugdir/bad/duplicate-entries-legacy",
+	}
+	for name, dirname := range testCases {
+		t.Run(name, func(t *testing.T) {
+			_, err := LoadDir(dirname)
+			assert.Error(t, err)
+		})
+	}
+}
+
+func TestDetectDuplicates(t *testing.T) {
+	plugs := []Plugin{
+		mockSubprocessCLIPlugin(t, "foo"),
+		mockSubprocessCLIPlugin(t, "bar"),
+	}
+	if err := detectDuplicates(plugs); err != nil {
+		t.Error("no duplicates in the first set")
+	}
+	plugs = append(plugs, mockSubprocessCLIPlugin(t, "foo"))
+	if err := detectDuplicates(plugs); err == nil {
+		t.Error("duplicates in the second set")
+	}
+}
+
+func TestLoadAll(t *testing.T) {
+	// Verify that empty dir loads:
+	{
+		plugs, err := LoadAll("testdata")
+		require.NoError(t, err)
+		assert.Len(t, plugs, 0)
+	}
+
+	basedir := "testdata/plugdir/good"
+	plugs, err := LoadAll(basedir)
+	require.NoError(t, err)
+	require.NotEmpty(t, plugs, "expected plugins to be loaded from %s", basedir)
+
+	plugsMap := map[string]Plugin{}
+	for _, p := range plugs {
+		plugsMap[p.Metadata().Name] = p
+	}
+
+	assert.Len(t, plugsMap, 3)
+	assert.Contains(t, plugsMap, "downloader")
+	assert.Contains(t, plugsMap, "echo-legacy")
+	assert.Contains(t, plugsMap, "hello-legacy")
+}
+
+func TestFindPlugins(t *testing.T) {
+	cases := []struct {
+		name     string
+		plugdirs string
+		expected int
+	}{
+		{
+			name:     "plugdirs is empty",
+			plugdirs: "",
+			expected: 0,
+		},
+		{
+			name:     "plugdirs isn't dir",
+			plugdirs: "./plugin_test.go",
+			expected: 0,
+		},
+		{
+			name:     "plugdirs doesn't have plugin",
+			plugdirs: ".",
+			expected: 0,
+		},
+		{
+			name:     "normal",
+			plugdirs: "./testdata/plugdir/good",
+			expected: 3,
+		},
+	}
+	for _, c := range cases {
+		t.Run(t.Name(), func(t *testing.T) {
+			plugin, err := LoadAll(c.plugdirs)
+			require.NoError(t, err)
+			assert.Len(t, plugin, c.expected, "expected %d plugins, got %d", c.expected, len(plugin))
+		})
+	}
+}
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
new file mode 100644
index 000000000..b899ef336
--- /dev/null
+++ b/internal/plugin/metadata.go
@@ -0,0 +1,155 @@
+/*
+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 plugin
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Metadata of a plugin, converted from the "on-disk" plugin.yaml
+// Specifically, Config and RuntimeConfig are converted to their respective types based on the plugin type and runtime
+type Metadata struct {
+	// APIVersion specifies the plugin API version
+	APIVersion string
+
+	// Name is the name of the plugin
+	Name string
+
+	// Type of plugin (eg, cli/v1, getter/v1)
+	Type string
+
+	// Runtime specifies the runtime type (subprocess, wasm)
+	Runtime string
+
+	// Version is the SemVer 2 version of the plugin.
+	Version string
+
+	// SourceURL is the URL where this plugin can be found
+	SourceURL string
+
+	// Config contains the type-specific configuration for this plugin
+	Config Config
+
+	// RuntimeConfig contains the runtime-specific configuration
+	RuntimeConfig RuntimeConfig
+}
+
+func (m Metadata) Validate() error {
+	var errs []error
+
+	if !validPluginName.MatchString(m.Name) {
+		errs = append(errs, fmt.Errorf("invalid name"))
+	}
+
+	if m.APIVersion == "" {
+		errs = append(errs, fmt.Errorf("empty APIVersion"))
+	}
+
+	if m.Type == "" {
+		errs = append(errs, fmt.Errorf("empty type field"))
+	}
+
+	if m.Runtime == "" {
+		errs = append(errs, fmt.Errorf("empty runtime field"))
+	}
+
+	if m.Config == nil {
+		errs = append(errs, fmt.Errorf("missing config field"))
+	}
+
+	if m.RuntimeConfig == nil {
+		errs = append(errs, fmt.Errorf("missing runtimeConfig field"))
+	}
+
+	// Validate the config itself
+	if m.Config != nil {
+		if err := m.Config.Validate(); err != nil {
+			errs = append(errs, fmt.Errorf("config validation failed: %w", err))
+		}
+	}
+
+	// Validate the runtime config itself
+	if m.RuntimeConfig != nil {
+		if err := m.RuntimeConfig.Validate(); err != nil {
+			errs = append(errs, fmt.Errorf("runtime config validation failed: %w", err))
+		}
+	}
+
+	if len(errs) > 0 {
+		return errors.Join(errs...)
+	}
+
+	return nil
+}
+
+func fromMetadataLegacy(m MetadataLegacy) *Metadata {
+	pluginType := "cli/v1"
+
+	if len(m.Downloaders) > 0 {
+		pluginType = "getter/v1"
+	}
+
+	return &Metadata{
+		APIVersion:    "legacy",
+		Name:          m.Name,
+		Version:       m.Version,
+		Type:          pluginType,
+		Runtime:       "subprocess",
+		Config:        buildLegacyConfig(m, pluginType),
+		RuntimeConfig: buildLegacyRuntimeConfig(m),
+	}
+}
+
+func buildLegacyConfig(m MetadataLegacy, pluginType string) Config {
+	switch pluginType {
+	case "getter/v1":
+		var protocols []string
+		for _, d := range m.Downloaders {
+			protocols = append(protocols, d.Protocols...)
+		}
+		return &ConfigGetter{
+			Protocols: protocols,
+		}
+	case "cli/v1":
+		return &ConfigCLI{
+			Usage:       "",            // Legacy plugins don't have Usage field for command syntax
+			ShortHelp:   m.Usage,       // Map legacy usage to shortHelp
+			LongHelp:    m.Description, // Map legacy description to longHelp
+			IgnoreFlags: m.IgnoreFlags,
+		}
+	default:
+		return nil
+	}
+}
+
+func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
+	var protocolCommands []SubprocessProtocolCommand
+	if len(m.Downloaders) > 0 {
+		protocolCommands =
+			make([]SubprocessProtocolCommand, 0, len(m.Downloaders))
+		for _, d := range m.Downloaders {
+			protocolCommands = append(protocolCommands, SubprocessProtocolCommand(d))
+		}
+	}
+	return &RuntimeConfigSubprocess{
+		PlatformCommands: m.PlatformCommands,
+		Command:          m.Command,
+		PlatformHooks:    m.PlatformHooks,
+		Hooks:            m.Hooks,
+		ProtocolCommands: protocolCommands,
+	}
+}
diff --git a/internal/plugin/metadata_legacy.go b/internal/plugin/metadata_legacy.go
new file mode 100644
index 000000000..ce9c2f580
--- /dev/null
+++ b/internal/plugin/metadata_legacy.go
@@ -0,0 +1,113 @@
+/*
+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 plugin
+
+import (
+	"fmt"
+	"strings"
+	"unicode"
+)
+
+// Downloaders represents the plugins capability if it can retrieve
+// charts from special sources
+type Downloaders struct {
+	// Protocols are the list of schemes from the charts URL.
+	Protocols []string `yaml:"protocols"`
+	// Command is the executable path with which the plugin performs
+	// the actual download for the corresponding Protocols
+	Command string `yaml:"command"`
+}
+
+// MetadataLegacy is the legacy plugin.yaml format
+type MetadataLegacy struct {
+	// Name is the name of the plugin
+	Name string `yaml:"name"`
+
+	// Version is a SemVer 2 version of the plugin.
+	Version string `yaml:"version"`
+
+	// Usage is the single-line usage text shown in help
+	Usage string `yaml:"usage"`
+
+	// Description is a long description shown in places like `helm help`
+	Description string `yaml:"description"`
+
+	// PlatformCommands is the plugin command, with a platform selector and support for args.
+	PlatformCommands []PlatformCommand `yaml:"platformCommand"`
+
+	// Command is the plugin command, as a single string.
+	// DEPRECATED: Use PlatformCommand instead. Removed in subprocess/v1 plugins.
+	Command string `yaml:"command"`
+
+	// IgnoreFlags ignores any flags passed in from Helm
+	IgnoreFlags bool `yaml:"ignoreFlags"`
+
+	// PlatformHooks are commands that will run on plugin events, with a platform selector and support for args.
+	PlatformHooks PlatformHooks `yaml:"platformHooks"`
+
+	// Hooks are commands that will run on plugin events, as a single string.
+	// DEPRECATED: Use PlatformHooks instead. Removed in subprocess/v1 plugins.
+	Hooks Hooks `yaml:"hooks"`
+
+	// Downloaders field is used if the plugin supply downloader mechanism
+	// for special protocols.
+	Downloaders []Downloaders `yaml:"downloaders"`
+}
+
+func (m *MetadataLegacy) Validate() error {
+	if !validPluginName.MatchString(m.Name) {
+		return fmt.Errorf("invalid plugin name")
+	}
+	m.Usage = sanitizeString(m.Usage)
+
+	if len(m.PlatformCommands) > 0 && len(m.Command) > 0 {
+		return fmt.Errorf("both platformCommand and command are set")
+	}
+
+	if len(m.PlatformHooks) > 0 && len(m.Hooks) > 0 {
+		return fmt.Errorf("both platformHooks and hooks are set")
+	}
+
+	// Validate downloader plugins
+	for i, downloader := range m.Downloaders {
+		if downloader.Command == "" {
+			return fmt.Errorf("downloader %d has empty command", i)
+		}
+		if len(downloader.Protocols) == 0 {
+			return fmt.Errorf("downloader %d has no protocols", i)
+		}
+		for j, protocol := range downloader.Protocols {
+			if protocol == "" {
+				return fmt.Errorf("downloader %d has empty protocol at index %d", i, j)
+			}
+		}
+	}
+
+	return nil
+}
+
+// sanitizeString normalize spaces and removes non-printable characters.
+func sanitizeString(str string) string {
+	return strings.Map(func(r rune) rune {
+		if unicode.IsSpace(r) {
+			return ' '
+		}
+		if unicode.IsPrint(r) {
+			return r
+		}
+		return -1
+	}, str)
+}
diff --git a/internal/plugin/metadata_test.go b/internal/plugin/metadata_test.go
new file mode 100644
index 000000000..810020a67
--- /dev/null
+++ b/internal/plugin/metadata_test.go
@@ -0,0 +1,141 @@
+/*
+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 plugin
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestValidatePluginData(t *testing.T) {
+
+	// A mock plugin with no commands
+	mockNoCommand := mockSubprocessCLIPlugin(t, "foo")
+	mockNoCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
+		PlatformCommands: []PlatformCommand{},
+		PlatformHooks:    map[string][]PlatformCommand{},
+	}
+
+	// A mock plugin with legacy commands
+	mockLegacyCommand := mockSubprocessCLIPlugin(t, "foo")
+	mockLegacyCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
+		PlatformCommands: []PlatformCommand{},
+		Command:          "echo \"mock plugin\"",
+		PlatformHooks:    map[string][]PlatformCommand{},
+		Hooks: map[string]string{
+			Install: "echo installing...",
+		},
+	}
+
+	// A mock plugin with a command also set
+	mockWithCommand := mockSubprocessCLIPlugin(t, "foo")
+	mockWithCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
+		PlatformCommands: []PlatformCommand{
+			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
+		},
+		Command: "echo \"mock plugin\"",
+	}
+
+	// A mock plugin with a hooks also set
+	mockWithHooks := mockSubprocessCLIPlugin(t, "foo")
+	mockWithHooks.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
+		PlatformCommands: []PlatformCommand{
+			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
+		},
+		PlatformHooks: map[string][]PlatformCommand{
+			Install: {
+				{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
+			},
+		},
+		Hooks: map[string]string{
+			Install: "echo installing...",
+		},
+	}
+
+	for i, item := range []struct {
+		pass      bool
+		plug      Plugin
+		errString string
+	}{
+		{true, mockSubprocessCLIPlugin(t, "abcdefghijklmnopqrstuvwxyz0123456789_-ABC"), ""},
+		{true, mockSubprocessCLIPlugin(t, "foo-bar-FOO-BAR_1234"), ""},
+		{false, mockSubprocessCLIPlugin(t, "foo -bar"), "invalid name"},
+		{false, mockSubprocessCLIPlugin(t, "$foo -bar"), "invalid name"}, // Test leading chars
+		{false, mockSubprocessCLIPlugin(t, "foo -bar "), "invalid name"}, // Test trailing chars
+		{false, mockSubprocessCLIPlugin(t, "foo\nbar"), "invalid name"},  // Test newline
+		{true, mockNoCommand, ""},     // Test no command metadata works
+		{true, mockLegacyCommand, ""}, // Test legacy command metadata works
+		{false, mockWithCommand, "runtime config validation failed: both platformCommand and command are set"}, // Test platformCommand and command both set fails
+		{false, mockWithHooks, "runtime config validation failed: both platformHooks and hooks are set"},       // Test platformHooks and hooks both set fails
+	} {
+		err := item.plug.Metadata().Validate()
+		if item.pass && err != nil {
+			t.Errorf("failed to validate case %d: %s", i, err)
+		} else if !item.pass && err == nil {
+			t.Errorf("expected case %d to fail", i)
+		}
+		if !item.pass && err.Error() != item.errString {
+			t.Errorf("index [%d]: expected the following error: %s, but got: %s", i, item.errString, err.Error())
+		}
+	}
+}
+
+func TestMetadataValidateMultipleErrors(t *testing.T) {
+	// Create metadata with multiple validation issues
+	metadata := Metadata{
+		Name:          "invalid name with spaces", // Invalid name
+		APIVersion:    "",                         // Empty API version
+		Type:          "",                         // Empty type
+		Runtime:       "",                         // Empty runtime
+		Config:        nil,                        // Missing config
+		RuntimeConfig: nil,                        // Missing runtime config
+	}
+
+	err := metadata.Validate()
+	if err == nil {
+		t.Fatal("expected validation to fail with multiple errors")
+	}
+
+	errStr := err.Error()
+
+	// Check that all expected errors are present in the joined error
+	expectedErrors := []string{
+		"invalid name",
+		"empty APIVersion",
+		"empty type field",
+		"empty runtime field",
+		"missing config field",
+		"missing runtimeConfig field",
+	}
+
+	for _, expectedErr := range expectedErrors {
+		if !strings.Contains(errStr, expectedErr) {
+			t.Errorf("expected error to contain %q, but got: %v", expectedErr, errStr)
+		}
+	}
+
+	// Verify that the error contains the correct number of error messages
+	errorCount := 0
+	for _, expectedErr := range expectedErrors {
+		if strings.Contains(errStr, expectedErr) {
+			errorCount++
+		}
+	}
+
+	if errorCount < len(expectedErrors) {
+		t.Errorf("expected %d errors, but only found %d in: %v", len(expectedErrors), errorCount, errStr)
+	}
+}
diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go
index 11ab71352..132b1739e 100644
--- a/internal/plugin/plugin.go
+++ b/internal/plugin/plugin.go
@@ -13,359 +13,69 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/v4/pkg/plugin"
+package plugin // import "helm.sh/helm/v4/internal/plugin"
 
 import (
-	"fmt"
-	"log/slog"
-	"os"
-	"path/filepath"
+	"context"
+	"io"
 	"regexp"
-	"runtime"
-	"strings"
-	"unicode"
-
-	"sigs.k8s.io/yaml"
-
-	"helm.sh/helm/v4/pkg/cli"
 )
 
 const PluginFileName = "plugin.yaml"
 
-// Downloaders represents the plugins capability if it can retrieve
-// charts from special sources
-type Downloaders struct {
-	// Protocols are the list of schemes from the charts URL.
-	Protocols []string `json:"protocols"`
-	// Command is the executable path with which the plugin performs
-	// the actual download for the corresponding Protocols
-	Command string `json:"command"`
-}
-
-// PlatformCommand represents a command for a particular operating system and architecture
-type PlatformCommand struct {
-	OperatingSystem string   `json:"os"`
-	Architecture    string   `json:"arch"`
-	Command         string   `json:"command"`
-	Args            []string `json:"args"`
-}
-
-// Metadata describes a plugin.
-//
-// This is the plugin equivalent of a chart.Metadata.
-type Metadata struct {
-	// Name is the name of the plugin
-	Name string `json:"name"`
-
-	// Version is a SemVer 2 version of the plugin.
-	Version string `json:"version"`
+// Plugin defines a plugin instance. The client (Helm codebase) facing type that can be used to introspect and invoke a plugin
+type Plugin interface {
+	// Dir return the plugin directory (as an absolute path) on the filesystem
+	Dir() string
 
-	// Usage is the single-line usage text shown in help
-	Usage string `json:"usage"`
+	// Metadata describes the plugin's type, version, etc.
+	// (This metadata type is the converted and plugin version independented in-memory representation of the plugin.yaml file)
+	Metadata() Metadata
 
-	// Description is a long description shown in places like `helm help`
-	Description string `json:"description"`
-
-	// PlatformCommand is the plugin command, with a platform selector and support for args.
-	//
-	// The command and args will be passed through environment expansion, so env vars can
-	// be present in this command. Unless IgnoreFlags is set, this will
-	// also merge the flags passed from Helm.
-	//
-	// Note that the command is not executed in a shell. To do so, we suggest
-	// pointing the command to a shell script.
-	//
-	// The following rules will apply to processing platform commands:
-	// - If PlatformCommand is present, it will be used
-	// - If both OS and Arch match the current platform, search will stop and the command will be executed
-	// - If OS matches and Arch is empty, the command will be executed
-	// - If no OS/Arch match is found, the default command will be executed
-	// - If no matches are found in platformCommand, Helm will exit with an error
-	PlatformCommand []PlatformCommand `json:"platformCommand"`
-
-	// Command is the plugin command, as a single string.
-	// Providing Command and PlatformCommand will result in a warning being emitted (PlatformCommand takes precedence).
-	//
-	// The command will be passed through environment expansion, so env vars can
-	// be present in this command. Unless IgnoreFlags is set, this will
-	// also merge the flags passed from Helm.
+	// Invoke takes the given input, and dispatches the contents to plugin instance
+	// The input is expected to be a JSON-serializable object, which the plugin will interpret according to its type
+	// The plugin is expected to return a JSON-serializable object, which the invoker
+	// will interpret according to the plugin's type
 	//
-	// Note that command is not executed in a shell. To do so, we suggest
-	// pointing the command to a shell script.
-	//
-	// DEPRECATED: Use PlatformCommand instead
-	Command string `json:"command"`
-
-	// IgnoreFlags ignores any flags passed in from Helm
+	// Invoke can be thought of as a request/response mechanism. Similar to e.g. http.RoundTripper
 	//
-	// For example, if the plugin is invoked as `helm --debug myplugin`, if this
-	// is false, `--debug` will be appended to `--command`. If this is true,
-	// the `--debug` flag will be discarded.
-	IgnoreFlags bool `json:"ignoreFlags"`
-
-	// PlatformHooks are commands that will run on plugin events, with a platform selector and support for args.
-	//
-	// The command and args will be passed through environment expansion, so env vars can
-	// be present in the command.
-	//
-	// Note that the command is not executed in a shell. To do so, we suggest
-	// pointing the command to a shell script.
-	//
-	// The following rules will apply to processing platform hooks:
-	// - If PlatformHooks is present, it will be used
-	// - If both OS and Arch match the current platform, search will stop and the command will be executed
-	// - If OS matches and Arch is empty, the command will be executed
-	// - If no OS/Arch match is found, the default command will be executed
-	// - If no matches are found in platformHooks, Helm will skip the event
-	PlatformHooks PlatformHooks `json:"platformHooks"`
-
-	// Hooks are commands that will run on plugin events, as a single string.
-	// Providing Hook and PlatformHooks will result in a warning being emitted (PlatformHooks takes precedence).
-	//
-	// The command will be passed through environment expansion, so env vars can
-	// be present in this command.
-	//
-	// Note that the command is executed in the sh shell.
-	//
-	// DEPRECATED: Use PlatformHooks instead
-	Hooks Hooks
-
-	// Downloaders field is used if the plugin supply downloader mechanism
-	// for special protocols.
-	Downloaders []Downloaders `json:"downloaders"`
-}
-
-// Plugin represents a plugin.
-type Plugin struct {
-	// Metadata is a parsed representation of a plugin.yaml
-	Metadata *Metadata
-	// Dir is the string path to the directory that holds the plugin.
-	Dir string
+	// If plugin's execution fails with a non-zero "return code" (this is plugin runtime implementation specific)
+	// an InvokeExecError is returned
+	Invoke(ctx context.Context, input *Input) (*Output, error)
 }
 
-// Returns command and args strings based on the following rules in priority order:
-// - From the PlatformCommand where OS and Arch match the current platform
-// - From the PlatformCommand where OS matches the current platform and Arch is empty/unspecified
-// - From the PlatformCommand where OS is empty/unspecified and Arch matches the current platform
-// - From the PlatformCommand where OS and Arch are both empty/unspecified
-// - Return nil, nil
-func getPlatformCommand(cmds []PlatformCommand) ([]string, []string) {
-	var command, args []string
-	found := false
-	foundOs := false
-
-	eq := strings.EqualFold
-	for _, c := range cmds {
-		if eq(c.OperatingSystem, runtime.GOOS) && eq(c.Architecture, runtime.GOARCH) {
-			// Return early for an exact match
-			return strings.Split(c.Command, " "), c.Args
-		}
-
-		if (len(c.OperatingSystem) > 0 && !eq(c.OperatingSystem, runtime.GOOS)) || len(c.Architecture) > 0 {
-			// Skip if OS is not empty and doesn't match or if arch is set as a set arch requires an OS match
-			continue
-		}
-
-		if !foundOs && len(c.OperatingSystem) > 0 && eq(c.OperatingSystem, runtime.GOOS) {
-			// First OS match with empty arch, can only be overridden by a direct match
-			command = strings.Split(c.Command, " ")
-			args = c.Args
-			found = true
-			foundOs = true
-		} else if !found {
-			// First empty match, can be overridden by a direct match or an OS match
-			command = strings.Split(c.Command, " ")
-			args = c.Args
-			found = true
-		}
-	}
-
-	return command, args
+// PluginHook allows plugins to implement hooks that are invoked on plugin management events (install, upgrade, etc)
+type PluginHook interface { //nolint:revive
+	InvokeHook(event string) error
 }
 
-// PrepareCommands takes a []Plugin.PlatformCommand
-// and prepares the command and arguments for execution.
-//
-// It merges extraArgs into any arguments supplied in the plugin. It
-// returns the main command and an args array.
-//
-// The result is suitable to pass to exec.Command.
-func PrepareCommands(cmds []PlatformCommand, expandArgs bool, extraArgs []string) (string, []string, error) {
-	cmdParts, args := getPlatformCommand(cmds)
-	if len(cmdParts) == 0 || cmdParts[0] == "" {
-		return "", nil, fmt.Errorf("no plugin command is applicable")
-	}
+// Input defines the input message and parameters to be passed to the plugin
+type Input struct {
+	// Message represents the type-elided value to be passed to the plugin.
+	// The plugin is expected to interpret the message according to its type
+	// The message object must be JSON-serializable
+	Message any
 
-	main := os.ExpandEnv(cmdParts[0])
-	baseArgs := []string{}
-	if len(cmdParts) > 1 {
-		for _, cmdPart := range cmdParts[1:] {
-			if expandArgs {
-				baseArgs = append(baseArgs, os.ExpandEnv(cmdPart))
-			} else {
-				baseArgs = append(baseArgs, cmdPart)
-			}
-		}
-	}
+	// Optional: Reader to be consumed plugin's "stdin"
+	Stdin io.Reader
 
-	for _, arg := range args {
-		if expandArgs {
-			baseArgs = append(baseArgs, os.ExpandEnv(arg))
-		} else {
-			baseArgs = append(baseArgs, arg)
-		}
-	}
+	// Optional: Writers to consume the plugin's "stdout" and "stderr"
+	Stdout, Stderr io.Writer
 
-	if len(extraArgs) > 0 {
-		baseArgs = append(baseArgs, extraArgs...)
-	}
-
-	return main, baseArgs, nil
+	// Optional: Env represents the environment as a list of "key=value" strings
+	// see os.Environ
+	Env []string
 }
 
-// PrepareCommand gets the correct command and arguments for a plugin.
-//
-// It merges extraArgs into any arguments supplied in the plugin. It returns the name of the command and an args array.
-//
-// The result is suitable to pass to exec.Command.
-func (p *Plugin) PrepareCommand(extraArgs []string) (string, []string, error) {
-	var extraArgsIn []string
-
-	if !p.Metadata.IgnoreFlags {
-		extraArgsIn = extraArgs
-	}
-
-	cmds := p.Metadata.PlatformCommand
-	if len(cmds) == 0 && len(p.Metadata.Command) > 0 {
-		cmds = []PlatformCommand{{Command: p.Metadata.Command}}
-	}
-
-	return PrepareCommands(cmds, true, extraArgsIn)
+// Output defines the output message and parameters the passed from the plugin
+type Output struct {
+	// Message represents the type-elided value returned from the plugin
+	// The invoker is expected to interpret the message according to the plugin's type
+	// The message object must be JSON-serializable
+	Message any
 }
 
 // validPluginName is a regular expression that validates plugin names.
 //
 // Plugin names can only contain the ASCII characters a-z, A-Z, 0-9, ​_​ and ​-.
 var validPluginName = regexp.MustCompile("^[A-Za-z0-9_-]+$")
-
-// validatePluginData validates a plugin's YAML data.
-func validatePluginData(plug *Plugin, filepath string) error {
-	// When metadata section missing, initialize with no data
-	if plug.Metadata == nil {
-		plug.Metadata = &Metadata{}
-	}
-	if !validPluginName.MatchString(plug.Metadata.Name) {
-		return fmt.Errorf("invalid plugin name at %q", filepath)
-	}
-	plug.Metadata.Usage = sanitizeString(plug.Metadata.Usage)
-
-	if len(plug.Metadata.PlatformCommand) > 0 && len(plug.Metadata.Command) > 0 {
-		slog.Warn("both 'platformCommand' and 'command' are set (this will become an error in a future Helm version)", slog.String("filepath", filepath))
-	}
-
-	if len(plug.Metadata.PlatformHooks) > 0 && len(plug.Metadata.Hooks) > 0 {
-		slog.Warn("both 'platformHooks' and 'hooks' are set (this will become an error in a future Helm version)", slog.String("filepath", filepath))
-	}
-
-	// We could also validate SemVer, executable, and other fields should we so choose.
-	return nil
-}
-
-// sanitizeString normalize spaces and removes non-printable characters.
-func sanitizeString(str string) string {
-	return strings.Map(func(r rune) rune {
-		if unicode.IsSpace(r) {
-			return ' '
-		}
-		if unicode.IsPrint(r) {
-			return r
-		}
-		return -1
-	}, str)
-}
-
-func detectDuplicates(plugs []*Plugin) error {
-	names := map[string]string{}
-
-	for _, plug := range plugs {
-		if oldpath, ok := names[plug.Metadata.Name]; ok {
-			return fmt.Errorf(
-				"two plugins claim the name %q at %q and %q",
-				plug.Metadata.Name,
-				oldpath,
-				plug.Dir,
-			)
-		}
-		names[plug.Metadata.Name] = plug.Dir
-	}
-
-	return nil
-}
-
-// LoadDir loads a plugin from the given directory.
-func LoadDir(dirname string) (*Plugin, error) {
-	pluginfile := filepath.Join(dirname, PluginFileName)
-	data, err := os.ReadFile(pluginfile)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read plugin at %q: %w", pluginfile, err)
-	}
-
-	plug := &Plugin{Dir: dirname}
-	if err := yaml.UnmarshalStrict(data, &plug.Metadata); err != nil {
-		return nil, fmt.Errorf("failed to load plugin at %q: %w", pluginfile, err)
-	}
-	return plug, validatePluginData(plug, pluginfile)
-}
-
-// LoadAll loads all plugins found beneath the base directory.
-//
-// This scans only one directory level.
-func LoadAll(basedir string) ([]*Plugin, error) {
-	plugins := []*Plugin{}
-	// We want basedir/*/plugin.yaml
-	scanpath := filepath.Join(basedir, "*", PluginFileName)
-	matches, err := filepath.Glob(scanpath)
-	if err != nil {
-		return plugins, fmt.Errorf("failed to find plugins in %q: %w", scanpath, err)
-	}
-
-	if matches == nil {
-		return plugins, nil
-	}
-
-	for _, yaml := range matches {
-		dir := filepath.Dir(yaml)
-		p, err := LoadDir(dir)
-		if err != nil {
-			return plugins, err
-		}
-		plugins = append(plugins, p)
-	}
-	return plugins, detectDuplicates(plugins)
-}
-
-// FindPlugins returns a list of YAML files that describe plugins.
-func FindPlugins(plugdirs string) ([]*Plugin, error) {
-	found := []*Plugin{}
-	// Let's get all UNIXy and allow path separators
-	for _, p := range filepath.SplitList(plugdirs) {
-		matches, err := LoadAll(p)
-		if err != nil {
-			return matches, err
-		}
-		found = append(found, matches...)
-	}
-	return found, nil
-}
-
-// SetupPluginEnv prepares os.Env for plugins. It operates on os.Env because
-// the plugin subsystem itself needs access to the environment variables
-// created here.
-func SetupPluginEnv(settings *cli.EnvSettings, name, base string) {
-	env := settings.EnvVars()
-	env["HELM_PLUGIN_NAME"] = name
-	env["HELM_PLUGIN_DIR"] = base
-	for key, val := range env {
-		os.Setenv(key, val)
-	}
-}
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index 20bd2f737..3c78006b7 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -13,290 +13,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package plugin // import "helm.sh/helm/v4/pkg/plugin"
+package plugin
 
 import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
 	"testing"
-
-	"helm.sh/helm/v4/pkg/cli"
 )
 
-func TestPrepareCommand(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-
-	p := &Plugin{
-		Dir: "/tmp", // Unused
-		Metadata: &Metadata{
-			Name:    "test",
-			Command: "echo \"error\"",
-			PlatformCommand: []PlatformCommand{
-				{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
-			},
-		},
-	}
-
-	cmd, args, err := p.PrepareCommand([]string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestPrepareCommandExtraArgs(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-	extraArgs := []string{"--debug", "--foo", "bar"}
-
-	p := &Plugin{
-		Dir: "/tmp", // Unused
-		Metadata: &Metadata{
-			Name:    "test",
-			Command: "echo \"error\"",
-			PlatformCommand: []PlatformCommand{
-				{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
-				{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-			},
-		},
-	}
-
-	expectedArgs := append(cmdArgs, extraArgs...)
-
-	cmd, args, err := p.PrepareCommand(extraArgs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, expectedArgs) {
-		t.Fatalf("Expected %v, got %v", expectedArgs, args)
-	}
-}
-
-func TestPrepareCommandExtraArgsIgnored(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-	extraArgs := []string{"--debug", "--foo", "bar"}
-
-	p := &Plugin{
-		Dir: "/tmp", // Unused
-		Metadata: &Metadata{
-			Name:    "test",
-			Command: "echo \"error\"",
-			PlatformCommand: []PlatformCommand{
-				{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
-				{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-				{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-			},
-			IgnoreFlags: true,
-		},
-	}
-
-	cmd, args, err := p.PrepareCommand(extraArgs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestPrepareCommands(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-
-	cmds := []PlatformCommand{
-		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
-		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-	}
-
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestPrepareCommandsExtraArgs(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-	extraArgs := []string{"--debug", "--foo", "bar"}
-
-	cmds := []PlatformCommand{
-		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: "sh", Args: []string{"-c", "echo \"test\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-	}
-
-	expectedArgs := append(cmdArgs, extraArgs...)
-
-	cmd, args, err := PrepareCommands(cmds, true, extraArgs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, expectedArgs) {
-		t.Fatalf("Expected %v, got %v", expectedArgs, args)
-	}
-}
-
-func TestPrepareCommandsNoArch(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-
-	cmds := []PlatformCommand{
-		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "sh", Args: []string{"-c", "echo \"test\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-	}
-
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestPrepareCommandsNoOsNoArch(t *testing.T) {
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"test\""}
-
-	cmds := []PlatformCommand{
-		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-		{OperatingSystem: "", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"test\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
-	}
-
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestPrepareCommandsNoMatch(t *testing.T) {
-	cmds := []PlatformCommand{
-		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "sh", Args: []string{"-c", "echo \"test\""}},
-		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "sh", Args: []string{"-c", "echo \"test\""}},
-		{OperatingSystem: "no-os", Architecture: runtime.GOARCH, Command: "sh", Args: []string{"-c", "echo \"test\""}},
-	}
-
-	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
-		t.Fatalf("Expected error to be returned")
-	}
-}
-
-func TestPrepareCommandsNoCommands(t *testing.T) {
-	cmds := []PlatformCommand{}
-
-	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
-		t.Fatalf("Expected error to be returned")
-	}
-}
-
-func TestPrepareCommandsExpand(t *testing.T) {
-	t.Setenv("TEST", "test")
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"${TEST}\""}
-	cmds := []PlatformCommand{
-		{OperatingSystem: "", Architecture: "", Command: cmdMain, Args: cmdArgs},
-	}
-
-	expectedArgs := []string{"-c", "echo \"test\""}
-
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, expectedArgs) {
-		t.Fatalf("Expected %v, got %v", expectedArgs, args)
-	}
-}
-
-func TestPrepareCommandsNoExpand(t *testing.T) {
-	t.Setenv("TEST", "test")
-	cmdMain := "sh"
-	cmdArgs := []string{"-c", "echo \"${TEST}\""}
-	cmds := []PlatformCommand{
-		{OperatingSystem: "", Architecture: "", Command: cmdMain, Args: cmdArgs},
-	}
-
-	cmd, args, err := PrepareCommands(cmds, false, []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cmd != cmdMain {
-		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
-	}
-	if !reflect.DeepEqual(args, cmdArgs) {
-		t.Fatalf("Expected %v, got %v", cmdArgs, args)
-	}
-}
-
-func TestLoadDir(t *testing.T) {
-	dirname := "testdata/plugdir/good/hello"
-	plug, err := LoadDir(dirname)
-	if err != nil {
-		t.Fatalf("error loading Hello plugin: %s", err)
-	}
-
-	if plug.Dir != dirname {
-		t.Fatalf("Expected dir %q, got %q", dirname, plug.Dir)
-	}
+func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginRuntime {
+	t.Helper()
 
-	expect := &Metadata{
-		Name:        "hello",
-		Version:     "0.1.0",
-		Usage:       "usage",
-		Description: "description",
-		PlatformCommand: []PlatformCommand{
-			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.sh"}},
-			{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.ps1"}},
+	rc := RuntimeConfigSubprocess{
+		PlatformCommands: []PlatformCommand{
+			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
+			{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"mock plugin\""}},
 		},
-		IgnoreFlags: true,
 		PlatformHooks: map[string][]PlatformCommand{
 			Install: {
 				{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
@@ -305,241 +35,24 @@ func TestLoadDir(t *testing.T) {
 		},
 	}
 
-	if !reflect.DeepEqual(expect, plug.Metadata) {
-		t.Fatalf("Expected plugin metadata %v, got %v", expect, plug.Metadata)
-	}
-}
-
-func TestLoadDirDuplicateEntries(t *testing.T) {
-	dirname := "testdata/plugdir/bad/duplicate-entries"
-	if _, err := LoadDir(dirname); err == nil {
-		t.Errorf("successfully loaded plugin with duplicate entries when it should've failed")
-	}
-}
+	pluginDir := t.TempDir()
 
-func TestDownloader(t *testing.T) {
-	dirname := "testdata/plugdir/good/downloader"
-	plug, err := LoadDir(dirname)
-	if err != nil {
-		t.Fatalf("error loading Hello plugin: %s", err)
-	}
-
-	if plug.Dir != dirname {
-		t.Fatalf("Expected dir %q, got %q", dirname, plug.Dir)
-	}
-
-	expect := &Metadata{
-		Name:        "downloader",
-		Version:     "1.2.3",
-		Usage:       "usage",
-		Description: "download something",
-		Command:     "echo Hello",
-		Downloaders: []Downloaders{
-			{
-				Protocols: []string{"myprotocol", "myprotocols"},
-				Command:   "echo Download",
-			},
-		},
-	}
-
-	if !reflect.DeepEqual(expect, plug.Metadata) {
-		t.Fatalf("Expected metadata %v, got %v", expect, plug.Metadata)
-	}
-}
-
-func TestLoadAll(t *testing.T) {
-	// Verify that empty dir loads:
-	if plugs, err := LoadAll("testdata"); err != nil {
-		t.Fatalf("error loading dir with no plugins: %s", err)
-	} else if len(plugs) > 0 {
-		t.Fatalf("expected empty dir to have 0 plugins")
-	}
-
-	basedir := "testdata/plugdir/good"
-	plugs, err := LoadAll(basedir)
-	if err != nil {
-		t.Fatalf("Could not load %q: %s", basedir, err)
-	}
-
-	if l := len(plugs); l != 3 {
-		t.Fatalf("expected 3 plugins, found %d", l)
-	}
-
-	if plugs[0].Metadata.Name != "downloader" {
-		t.Errorf("Expected first plugin to be echo, got %q", plugs[0].Metadata.Name)
-	}
-	if plugs[1].Metadata.Name != "echo" {
-		t.Errorf("Expected first plugin to be echo, got %q", plugs[0].Metadata.Name)
-	}
-	if plugs[2].Metadata.Name != "hello" {
-		t.Errorf("Expected second plugin to be hello, got %q", plugs[1].Metadata.Name)
-	}
-}
-
-func TestFindPlugins(t *testing.T) {
-	cases := []struct {
-		name     string
-		plugdirs string
-		expected int
-	}{
-		{
-			name:     "plugdirs is empty",
-			plugdirs: "",
-			expected: 0,
-		},
-		{
-			name:     "plugdirs isn't dir",
-			plugdirs: "./plugin_test.go",
-			expected: 0,
-		},
-		{
-			name:     "plugdirs doesn't have plugin",
-			plugdirs: ".",
-			expected: 0,
-		},
-		{
-			name:     "normal",
-			plugdirs: "./testdata/plugdir/good",
-			expected: 3,
-		},
-	}
-	for _, c := range cases {
-		t.Run(t.Name(), func(t *testing.T) {
-			plugin, _ := FindPlugins(c.plugdirs)
-			if len(plugin) != c.expected {
-				t.Errorf("expected: %v, got: %v", c.expected, len(plugin))
-			}
-		})
-	}
-}
-
-func TestSetupEnv(t *testing.T) {
-	name := "pequod"
-	base := filepath.Join("testdata/helmhome/helm/plugins", name)
-
-	s := cli.New()
-	s.PluginsDirectory = "testdata/helmhome/helm/plugins"
-
-	SetupPluginEnv(s, name, base)
-	for _, tt := range []struct {
-		name, expect string
-	}{
-		{"HELM_PLUGIN_NAME", name},
-		{"HELM_PLUGIN_DIR", base},
-	} {
-		if got := os.Getenv(tt.name); got != tt.expect {
-			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
-		}
-	}
-}
-
-func TestSetupEnvWithSpace(t *testing.T) {
-	name := "sureshdsk"
-	base := filepath.Join("testdata/helm home/helm/plugins", name)
-
-	s := cli.New()
-	s.PluginsDirectory = "testdata/helm home/helm/plugins"
-
-	SetupPluginEnv(s, name, base)
-	for _, tt := range []struct {
-		name, expect string
-	}{
-		{"HELM_PLUGIN_NAME", name},
-		{"HELM_PLUGIN_DIR", base},
-	} {
-		if got := os.Getenv(tt.name); got != tt.expect {
-			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
-		}
-	}
-}
-
-func TestValidatePluginData(t *testing.T) {
-	// A mock plugin missing any metadata.
-	mockMissingMeta := &Plugin{
-		Dir: "no-such-dir",
-	}
-
-	// A mock plugin with no commands
-	mockNoCommand := mockPlugin("foo")
-	mockNoCommand.Metadata.PlatformCommand = []PlatformCommand{}
-	mockNoCommand.Metadata.PlatformHooks = map[string][]PlatformCommand{}
-
-	// A mock plugin with legacy commands
-	mockLegacyCommand := mockPlugin("foo")
-	mockLegacyCommand.Metadata.PlatformCommand = []PlatformCommand{}
-	mockLegacyCommand.Metadata.Command = "echo \"mock plugin\""
-	mockLegacyCommand.Metadata.PlatformHooks = map[string][]PlatformCommand{}
-	mockLegacyCommand.Metadata.Hooks = map[string]string{
-		Install: "echo installing...",
-	}
-
-	// A mock plugin with a command also set
-	mockWithCommand := mockPlugin("foo")
-	mockWithCommand.Metadata.Command = "echo \"mock plugin\""
-
-	// A mock plugin with a hooks also set
-	mockWithHooks := mockPlugin("foo")
-	mockWithHooks.Metadata.Hooks = map[string]string{
-		Install: "echo installing...",
-	}
-
-	for i, item := range []struct {
-		pass bool
-		plug *Plugin
-	}{
-		{true, mockPlugin("abcdefghijklmnopqrstuvwxyz0123456789_-ABC")},
-		{true, mockPlugin("foo-bar-FOO-BAR_1234")},
-		{false, mockPlugin("foo -bar")},
-		{false, mockPlugin("$foo -bar")}, // Test leading chars
-		{false, mockPlugin("foo -bar ")}, // Test trailing chars
-		{false, mockPlugin("foo\nbar")},  // Test newline
-		{false, mockMissingMeta},         // Test if the metadata section missing
-		{true, mockNoCommand},            // Test no command metadata works
-		{true, mockLegacyCommand},        // Test legacy command metadata works
-		{true, mockWithCommand},          // Test platformCommand and command both set works
-		{true, mockWithHooks},            // Test platformHooks and hooks both set works
-	} {
-		err := validatePluginData(item.plug, fmt.Sprintf("test-%d", i))
-		if item.pass && err != nil {
-			t.Errorf("failed to validate case %d: %s", i, err)
-		} else if !item.pass && err == nil {
-			t.Errorf("expected case %d to fail", i)
-		}
-	}
-}
-
-func TestDetectDuplicates(t *testing.T) {
-	plugs := []*Plugin{
-		mockPlugin("foo"),
-		mockPlugin("bar"),
-	}
-	if err := detectDuplicates(plugs); err != nil {
-		t.Error("no duplicates in the first set")
-	}
-	plugs = append(plugs, mockPlugin("foo"))
-	if err := detectDuplicates(plugs); err == nil {
-		t.Error("duplicates in the second set")
-	}
-}
-
-func mockPlugin(name string) *Plugin {
-	return &Plugin{
-		Metadata: &Metadata{
-			Name:        name,
-			Version:     "v0.1.2",
-			Usage:       "Mock plugin",
-			Description: "Mock plugin for testing",
-			PlatformCommand: []PlatformCommand{
-				{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
-				{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"mock plugin\""}},
-			},
-			PlatformHooks: map[string][]PlatformCommand{
-				Install: {
-					{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
-					{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"installing...\""}},
-				},
+	return &SubprocessPluginRuntime{
+		metadata: Metadata{
+			Name:       pluginName,
+			Version:    "v0.1.2",
+			Type:       "cli/v1",
+			APIVersion: "legacy",
+			Runtime:    "subprocess",
+			Config: &ConfigCLI{
+				Usage:       "Mock plugin",
+				ShortHelp:   "Mock plugin",
+				LongHelp:    "Mock plugin for testing",
+				IgnoreFlags: false,
 			},
+			RuntimeConfig: &rc,
 		},
-		Dir: "no-such-dir",
+		pluginDir:     pluginDir, // NOTE: dir is empty (ie. plugin.yaml is not present)
+		RuntimeConfig: rc,
 	}
 }
diff --git a/internal/plugin/runtime.go b/internal/plugin/runtime.go
new file mode 100644
index 000000000..87f068724
--- /dev/null
+++ b/internal/plugin/runtime.go
@@ -0,0 +1,33 @@
+/*
+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 plugin
+
+// Runtime represents a plugin runtime (subprocess, extism, etc) ie. how a plugin should be executed
+// Runtime is responsible for instantiating plugins that implement the runtime
+// TODO: could call this something more like "PluginRuntimeCreator"?
+type Runtime interface {
+	// CreatePlugin creates a plugin instance from the given metadata
+	CreatePlugin(pluginDir string, metadata *Metadata) (Plugin, error)
+
+	// TODO: move config unmarshalling to the runtime?
+	// UnmarshalConfig(runtimeConfigRaw map[string]any) (RuntimeConfig, error)
+}
+
+// RuntimeConfig represents the assertable type for a plugin's runtime configuration.
+// It is expected to type assert (cast) the a RuntimeConfig to its expected type
+type RuntimeConfig interface {
+	Validate() error
+}
diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
new file mode 100644
index 000000000..286c1abeb
--- /dev/null
+++ b/internal/plugin/runtime_subprocess.go
@@ -0,0 +1,229 @@
+/*
+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 plugin
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"syscall"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+// SubprocessProtocolCommand maps a given protocol to the getter command used to retrieve artifacts for that protcol
+type SubprocessProtocolCommand struct {
+	// Protocols are the list of schemes from the charts URL.
+	Protocols []string `yaml:"protocols"`
+	// Command is the executable path with which the plugin performs
+	// the actual download for the corresponding Protocols
+	Command string `yaml:"command"`
+}
+
+// RuntimeConfigSubprocess represents configuration for subprocess runtime
+type RuntimeConfigSubprocess struct {
+	// PlatformCommand is a list containing a plugin command, with a platform selector and support for args.
+	PlatformCommands []PlatformCommand `yaml:"platformCommand"`
+	// Command is the plugin command, as a single string.
+	// DEPRECATED: Use PlatformCommand instead. Remove in Helm 4.
+	Command string `yaml:"command"`
+	// PlatformHooks are commands that will run on plugin events, with a platform selector and support for args.
+	PlatformHooks PlatformHooks `yaml:"platformHooks"`
+	// Hooks are commands that will run on plugin events, as a single string.
+	// DEPRECATED: Use PlatformHooks instead. Remove in Helm 4.
+	Hooks Hooks `yaml:"hooks"`
+	// ProtocolCommands field is used if the plugin supply downloader mechanism
+	// for special protocols.
+	// (This is a compatibility hangover from the old plugin downloader mechanism, which was extended to support multiple
+	// protocols in a given plugin)
+	ProtocolCommands []SubprocessProtocolCommand `yaml:"protocolCommands,omitempty"`
+}
+
+var _ RuntimeConfig = (*RuntimeConfigSubprocess)(nil)
+
+func (r *RuntimeConfigSubprocess) GetType() string { return "subprocess" }
+
+func (r *RuntimeConfigSubprocess) Validate() error {
+	if len(r.PlatformCommands) > 0 && len(r.Command) > 0 {
+		return fmt.Errorf("both platformCommand and command are set")
+	}
+	if len(r.PlatformHooks) > 0 && len(r.Hooks) > 0 {
+		return fmt.Errorf("both platformHooks and hooks are set")
+	}
+	return nil
+}
+
+type RuntimeSubprocess struct{}
+
+var _ Runtime = (*RuntimeSubprocess)(nil)
+
+// CreateRuntime implementation for RuntimeConfig
+func (r *RuntimeSubprocess) CreatePlugin(pluginDir string, metadata *Metadata) (Plugin, error) {
+	return &SubprocessPluginRuntime{
+		metadata:      *metadata,
+		pluginDir:     pluginDir,
+		RuntimeConfig: *(metadata.RuntimeConfig.(*RuntimeConfigSubprocess)),
+	}, nil
+}
+
+// RuntimeSubprocess implements the Runtime interface for subprocess execution
+type SubprocessPluginRuntime struct {
+	metadata      Metadata
+	pluginDir     string
+	RuntimeConfig RuntimeConfigSubprocess
+}
+
+var _ Plugin = (*SubprocessPluginRuntime)(nil)
+
+func (r *SubprocessPluginRuntime) Dir() string {
+	return r.pluginDir
+}
+
+func (r *SubprocessPluginRuntime) Metadata() Metadata {
+	return r.metadata
+}
+
+func (r *SubprocessPluginRuntime) Invoke(_ context.Context, input *Input) (*Output, error) {
+	switch input.Message.(type) {
+	case schema.InputMessageCLIV1:
+		return r.runCLI(input)
+	case schema.InputMessageGetterV1:
+		return r.runGetter(input)
+	default:
+		return nil, fmt.Errorf("unsupported subprocess plugin type %q", r.metadata.Type)
+	}
+}
+
+// InvokeWithEnv executes a plugin command with custom environment and I/O streams
+// This method allows execution with different command/args than the plugin's default
+func (r *SubprocessPluginRuntime) InvokeWithEnv(main string, argv []string, env []string, stdin io.Reader, stdout, stderr io.Writer) error {
+	mainCmdExp := os.ExpandEnv(main)
+	prog := exec.Command(mainCmdExp, argv...)
+	prog.Env = env
+	prog.Stdin = stdin
+	prog.Stdout = stdout
+	prog.Stderr = stderr
+
+	if err := prog.Run(); err != nil {
+		if eerr, ok := err.(*exec.ExitError); ok {
+			os.Stderr.Write(eerr.Stderr)
+			status := eerr.Sys().(syscall.WaitStatus)
+			return &InvokeExecError{
+				Err:  fmt.Errorf("plugin %q exited with error", r.metadata.Name),
+				Code: status.ExitStatus(),
+			}
+		}
+	}
+	return nil
+}
+
+func (r *SubprocessPluginRuntime) InvokeHook(event string) error {
+	// Get hook commands for the event
+	var cmds []PlatformCommand
+	expandArgs := true
+
+	cmds = r.RuntimeConfig.PlatformHooks[event]
+	if len(cmds) == 0 && len(r.RuntimeConfig.Hooks) > 0 {
+		cmd := r.RuntimeConfig.Hooks[event]
+		if len(cmd) > 0 {
+			cmds = []PlatformCommand{{Command: "sh", Args: []string{"-c", cmd}}}
+			expandArgs = false
+		}
+	}
+
+	// If no hook commands are defined, just return successfully
+	if len(cmds) == 0 {
+		return nil
+	}
+
+	main, argv, err := PrepareCommands(cmds, expandArgs, []string{})
+	if err != nil {
+		return err
+	}
+
+	prog := exec.Command(main, argv...)
+	prog.Stdout, prog.Stderr = os.Stdout, os.Stderr
+
+	if err := prog.Run(); err != nil {
+		if eerr, ok := err.(*exec.ExitError); ok {
+			os.Stderr.Write(eerr.Stderr)
+			return fmt.Errorf("plugin %s hook for %q exited with error", event, r.metadata.Name)
+		}
+		return err
+	}
+	return nil
+}
+
+// TODO decide the best way to handle this code
+// right now we implement status and error return in 3 slightly different ways in this file
+// then replace the other three with a call to this func
+func executeCmd(prog *exec.Cmd, pluginName string) error {
+	if err := prog.Run(); err != nil {
+		if eerr, ok := err.(*exec.ExitError); ok {
+			os.Stderr.Write(eerr.Stderr)
+			return &InvokeExecError{
+				Err:  fmt.Errorf("plugin %q exited with error", pluginName),
+				Code: eerr.ExitCode(),
+			}
+		}
+
+		return err
+	}
+
+	return nil
+}
+
+func (r *SubprocessPluginRuntime) runCLI(input *Input) (*Output, error) {
+	if _, ok := input.Message.(schema.InputMessageCLIV1); !ok {
+		return nil, fmt.Errorf("plugin %q input message does not implement InputMessageCLIV1", r.metadata.Name)
+	}
+
+	extraArgs := input.Message.(schema.InputMessageCLIV1).ExtraArgs
+
+	cmds := r.RuntimeConfig.PlatformCommands
+	if len(cmds) == 0 && len(r.RuntimeConfig.Command) > 0 {
+		cmds = []PlatformCommand{{Command: r.RuntimeConfig.Command}}
+	}
+
+	command, args, err := PrepareCommands(cmds, true, extraArgs)
+	if err != nil {
+		return nil, fmt.Errorf("failed to prepare plugin command: %w", err)
+	}
+
+	err2 := r.InvokeWithEnv(command, args, input.Env, input.Stdin, input.Stdout, input.Stderr)
+	if err2 != nil {
+		return nil, err2
+	}
+
+	return &Output{
+		Message: &schema.OutputMessageCLIV1{},
+	}, nil
+}
+
+// SetupPluginEnv prepares os.Env for plugins. It operates on os.Env because
+// the plugin subsystem itself needs access to the environment variables
+// created here.
+func SetupPluginEnv(settings *cli.EnvSettings, name, base string) { // TODO: remove
+	env := settings.EnvVars()
+	env["HELM_PLUGIN_NAME"] = name
+	env["HELM_PLUGIN_DIR"] = base
+	for key, val := range env {
+		os.Setenv(key, val)
+	}
+}
diff --git a/internal/plugin/runtime_subprocess_getter.go b/internal/plugin/runtime_subprocess_getter.go
new file mode 100644
index 000000000..6f9bfea91
--- /dev/null
+++ b/internal/plugin/runtime_subprocess_getter.go
@@ -0,0 +1,92 @@
+/*
+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 plugin
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"slices"
+	"strings"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+)
+
+func getProtocolCommand(commands []SubprocessProtocolCommand, protocol string) *SubprocessProtocolCommand {
+	for _, c := range commands {
+		if slices.Contains(c.Protocols, protocol) {
+			return &c
+		}
+	}
+
+	return nil
+}
+
+// TODO can we replace a lot of this func with RuntimeSubprocess.invokeWithEnv?
+func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
+	msg, ok := (input.Message).(schema.InputMessageGetterV1)
+	if !ok {
+		return nil, fmt.Errorf("expected input type schema.InputMessageGetterV1, got %T", input)
+	}
+
+	tmpDir, err := os.MkdirTemp(os.TempDir(), fmt.Sprintf("helm-plugin-%s-", r.metadata.Name))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create temporary directory: %w", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	d := getProtocolCommand(r.RuntimeConfig.ProtocolCommands, msg.Protocol)
+	if d == nil {
+		return nil, fmt.Errorf("no downloader found for protocol %q", msg.Protocol)
+	}
+
+	commands := strings.Split(d.Command, " ")
+	args := append(
+		commands[1:],
+		msg.Options.CertFile,
+		msg.Options.KeyFile,
+		msg.Options.CAFile,
+		msg.Href)
+
+	// TODO should we append to input.Env too?
+	env := append(
+		os.Environ(),
+		fmt.Sprintf("HELM_PLUGIN_USERNAME=%s", msg.Options.Username),
+		fmt.Sprintf("HELM_PLUGIN_PASSWORD=%s", msg.Options.Password),
+		fmt.Sprintf("HELM_PLUGIN_PASS_CREDENTIALS_ALL=%t", msg.Options.PassCredentialsAll))
+
+	// TODO should we pass along input.Stdout?
+	buf := bytes.Buffer{} // subprocess getters are expected to write content to stdout
+
+	pluginCommand := filepath.Join(r.pluginDir, commands[0])
+	prog := exec.Command(
+		pluginCommand,
+		args...)
+	prog.Env = env
+	prog.Stdout = &buf
+	prog.Stderr = os.Stderr
+	if err := executeCmd(prog, r.metadata.Name); err != nil {
+		return nil, err
+	}
+
+	return &Output{
+		Message: &schema.OutputMessageGetterV1{
+			Data: buf.Bytes(),
+		},
+	}, nil
+}
diff --git a/internal/plugin/hooks.go b/internal/plugin/runtime_subprocess_hooks.go
similarity index 100%
rename from internal/plugin/hooks.go
rename to internal/plugin/runtime_subprocess_hooks.go
diff --git a/internal/plugin/runtime_subprocess_test.go b/internal/plugin/runtime_subprocess_test.go
new file mode 100644
index 000000000..9d932816d
--- /dev/null
+++ b/internal/plugin/runtime_subprocess_test.go
@@ -0,0 +1,64 @@
+/*
+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 plugin
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+func TestSetupEnv(t *testing.T) {
+	name := "pequod"
+	base := filepath.Join("testdata/helmhome/helm/plugins", name)
+
+	s := cli.New()
+	s.PluginsDirectory = "testdata/helmhome/helm/plugins"
+
+	SetupPluginEnv(s, name, base)
+	for _, tt := range []struct {
+		name, expect string
+	}{
+		{"HELM_PLUGIN_NAME", name},
+		{"HELM_PLUGIN_DIR", base},
+	} {
+		if got := os.Getenv(tt.name); got != tt.expect {
+			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
+		}
+	}
+}
+
+func TestSetupEnvWithSpace(t *testing.T) {
+	name := "sureshdsk"
+	base := filepath.Join("testdata/helm home/helm/plugins", name)
+
+	s := cli.New()
+	s.PluginsDirectory = "testdata/helm home/helm/plugins"
+
+	SetupPluginEnv(s, name, base)
+	for _, tt := range []struct {
+		name, expect string
+	}{
+		{"HELM_PLUGIN_NAME", name},
+		{"HELM_PLUGIN_DIR", base},
+	} {
+		if got := os.Getenv(tt.name); got != tt.expect {
+			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
+		}
+	}
+}
diff --git a/internal/plugin/schema/cli.go b/internal/plugin/schema/cli.go
new file mode 100644
index 000000000..3976d3737
--- /dev/null
+++ b/internal/plugin/schema/cli.go
@@ -0,0 +1,29 @@
+/*
+ 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 schema
+
+import (
+	"bytes"
+
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+type InputMessageCLIV1 struct {
+	ExtraArgs []string         `json:"extraArgs"`
+	Settings  *cli.EnvSettings `json:"settings"`
+}
+
+type OutputMessageCLIV1 struct {
+	Data *bytes.Buffer `json:"data"`
+}
diff --git a/internal/plugin/schema/getter.go b/internal/plugin/schema/getter.go
new file mode 100644
index 000000000..f9840008e
--- /dev/null
+++ b/internal/plugin/schema/getter.go
@@ -0,0 +1,47 @@
+/*
+ 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 schema
+
+import (
+	"time"
+)
+
+// TODO: can we generate these plugin input/outputs?
+
+type GetterOptionsV1 struct {
+	URL                   string
+	CertFile              string
+	KeyFile               string
+	CAFile                string
+	UNTar                 bool
+	InsecureSkipVerifyTLS bool
+	PlainHTTP             bool
+	AcceptHeader          string
+	Username              string
+	Password              string
+	PassCredentialsAll    bool
+	UserAgent             string
+	Version               string
+	Timeout               time.Duration
+}
+
+type InputMessageGetterV1 struct {
+	Href     string          `json:"href"`
+	Protocol string          `json:"protocol"`
+	Options  GetterOptionsV1 `json:"options"`
+}
+
+type OutputMessageGetterV1 struct {
+	Data []byte `json:"data"`
+}
diff --git a/internal/plugin/subprocess_commands.go b/internal/plugin/subprocess_commands.go
new file mode 100644
index 000000000..d979f98e3
--- /dev/null
+++ b/internal/plugin/subprocess_commands.go
@@ -0,0 +1,111 @@
+/*
+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 plugin
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"strings"
+)
+
+// PlatformCommand represents a command for a particular operating system and architecture
+type PlatformCommand struct {
+	OperatingSystem string   `yaml:"os"`
+	Architecture    string   `yaml:"arch"`
+	Command         string   `yaml:"command"`
+	Args            []string `yaml:"args"`
+}
+
+// Returns command and args strings based on the following rules in priority order:
+// - From the PlatformCommand where OS and Arch match the current platform
+// - From the PlatformCommand where OS matches the current platform and Arch is empty/unspecified
+// - From the PlatformCommand where OS is empty/unspecified and Arch matches the current platform
+// - From the PlatformCommand where OS and Arch are both empty/unspecified
+// - Return nil, nil
+func getPlatformCommand(cmds []PlatformCommand) ([]string, []string) {
+	var command, args []string
+	found := false
+	foundOs := false
+
+	eq := strings.EqualFold
+	for _, c := range cmds {
+		if eq(c.OperatingSystem, runtime.GOOS) && eq(c.Architecture, runtime.GOARCH) {
+			// Return early for an exact match
+			return strings.Split(c.Command, " "), c.Args
+		}
+
+		if (len(c.OperatingSystem) > 0 && !eq(c.OperatingSystem, runtime.GOOS)) || len(c.Architecture) > 0 {
+			// Skip if OS is not empty and doesn't match or if arch is set as a set arch requires an OS match
+			continue
+		}
+
+		if !foundOs && len(c.OperatingSystem) > 0 && eq(c.OperatingSystem, runtime.GOOS) {
+			// First OS match with empty arch, can only be overridden by a direct match
+			command = strings.Split(c.Command, " ")
+			args = c.Args
+			found = true
+			foundOs = true
+		} else if !found {
+			// First empty match, can be overridden by a direct match or an OS match
+			command = strings.Split(c.Command, " ")
+			args = c.Args
+			found = true
+		}
+	}
+
+	return command, args
+}
+
+// PrepareCommands takes a []Plugin.PlatformCommand
+// and prepares the command and arguments for execution.
+//
+// It merges extraArgs into any arguments supplied in the plugin. It
+// returns the main command and an args array.
+//
+// The result is suitable to pass to exec.Command.
+func PrepareCommands(cmds []PlatformCommand, expandArgs bool, extraArgs []string) (string, []string, error) {
+	cmdParts, args := getPlatformCommand(cmds)
+	if len(cmdParts) == 0 || cmdParts[0] == "" {
+		return "", nil, fmt.Errorf("no plugin command is applicable")
+	}
+
+	main := os.ExpandEnv(cmdParts[0])
+	baseArgs := []string{}
+	if len(cmdParts) > 1 {
+		for _, cmdPart := range cmdParts[1:] {
+			if expandArgs {
+				baseArgs = append(baseArgs, os.ExpandEnv(cmdPart))
+			} else {
+				baseArgs = append(baseArgs, cmdPart)
+			}
+		}
+	}
+
+	for _, arg := range args {
+		if expandArgs {
+			baseArgs = append(baseArgs, os.ExpandEnv(arg))
+		} else {
+			baseArgs = append(baseArgs, arg)
+		}
+	}
+
+	if len(extraArgs) > 0 {
+		baseArgs = append(baseArgs, extraArgs...)
+	}
+
+	return main, baseArgs, nil
+}
diff --git a/internal/plugin/subprocess_commands_test.go b/internal/plugin/subprocess_commands_test.go
new file mode 100644
index 000000000..3879a4bd0
--- /dev/null
+++ b/internal/plugin/subprocess_commands_test.go
@@ -0,0 +1,259 @@
+/*
+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 plugin
+
+import (
+	"reflect"
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPrepareCommand(t *testing.T) {
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+
+	platformCommands := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
+	}
+
+	cmd, args, err := PrepareCommands(platformCommands, true, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, cmdArgs) {
+		t.Fatalf("Expected %v, got %v", cmdArgs, args)
+	}
+}
+
+func TestPrepareCommandExtraArgs(t *testing.T) {
+
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+	platformCommands := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+	}
+
+	extraArgs := []string{"--debug", "--foo", "bar"}
+
+	type testCaseExpected struct {
+		cmdMain string
+		args    []string
+	}
+
+	testCases := map[string]struct {
+		ignoreFlags bool
+		expected    testCaseExpected
+	}{
+		"ignoreFlags false": {
+			ignoreFlags: false,
+			expected: testCaseExpected{
+				cmdMain: cmdMain,
+				args:    []string{"-c", "echo \"test\"", "--debug", "--foo", "bar"},
+			},
+		},
+		"ignoreFlags true": {
+			ignoreFlags: true,
+			expected: testCaseExpected{
+				cmdMain: cmdMain,
+				args:    []string{"-c", "echo \"test\""},
+			},
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			//expectedArgs := append(cmdArgs, extraArgs...)
+
+			// extra args are expected when ignoreFlags is unset or false
+			testExtraArgs := extraArgs
+			if tc.ignoreFlags {
+				testExtraArgs = []string{}
+			}
+			cmd, args, err := PrepareCommands(platformCommands, true, testExtraArgs)
+			if err != nil {
+				t.Fatal(err)
+			}
+			assert.Equal(t, tc.expected.cmdMain, cmd, "Expected command to match")
+			assert.Equal(t, tc.expected.args, args, "Expected args to match")
+		})
+	}
+}
+
+func TestPrepareCommands(t *testing.T) {
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+
+	cmds := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+	}
+
+	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, cmdArgs) {
+		t.Fatalf("Expected %v, got %v", cmdArgs, args)
+	}
+}
+
+func TestPrepareCommandsExtraArgs(t *testing.T) {
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+	extraArgs := []string{"--debug", "--foo", "bar"}
+
+	cmds := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: "sh", Args: []string{"-c", "echo \"test\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+	}
+
+	expectedArgs := append(cmdArgs, extraArgs...)
+
+	cmd, args, err := PrepareCommands(cmds, true, extraArgs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, expectedArgs) {
+		t.Fatalf("Expected %v, got %v", expectedArgs, args)
+	}
+}
+
+func TestPrepareCommandsNoArch(t *testing.T) {
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+
+	cmds := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "sh", Args: []string{"-c", "echo \"test\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+	}
+
+	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, cmdArgs) {
+		t.Fatalf("Expected %v, got %v", cmdArgs, args)
+	}
+}
+
+func TestPrepareCommandsNoOsNoArch(t *testing.T) {
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"test\""}
+
+	cmds := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+		{OperatingSystem: "", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"test\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
+	}
+
+	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, cmdArgs) {
+		t.Fatalf("Expected %v, got %v", cmdArgs, args)
+	}
+}
+
+func TestPrepareCommandsNoMatch(t *testing.T) {
+	cmds := []PlatformCommand{
+		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "sh", Args: []string{"-c", "echo \"test\""}},
+		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "sh", Args: []string{"-c", "echo \"test\""}},
+		{OperatingSystem: "no-os", Architecture: runtime.GOARCH, Command: "sh", Args: []string{"-c", "echo \"test\""}},
+	}
+
+	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
+		t.Fatalf("Expected error to be returned")
+	}
+}
+
+func TestPrepareCommandsNoCommands(t *testing.T) {
+	cmds := []PlatformCommand{}
+
+	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
+		t.Fatalf("Expected error to be returned")
+	}
+}
+
+func TestPrepareCommandsExpand(t *testing.T) {
+	t.Setenv("TEST", "test")
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"${TEST}\""}
+	cmds := []PlatformCommand{
+		{OperatingSystem: "", Architecture: "", Command: cmdMain, Args: cmdArgs},
+	}
+
+	expectedArgs := []string{"-c", "echo \"test\""}
+
+	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, expectedArgs) {
+		t.Fatalf("Expected %v, got %v", expectedArgs, args)
+	}
+}
+
+func TestPrepareCommandsNoExpand(t *testing.T) {
+	t.Setenv("TEST", "test")
+	cmdMain := "sh"
+	cmdArgs := []string{"-c", "echo \"${TEST}\""}
+	cmds := []PlatformCommand{
+		{OperatingSystem: "", Architecture: "", Command: cmdMain, Args: cmdArgs},
+	}
+
+	cmd, args, err := PrepareCommands(cmds, false, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cmd != cmdMain {
+		t.Fatalf("Expected %q, got %q", cmdMain, cmd)
+	}
+	if !reflect.DeepEqual(args, cmdArgs) {
+		t.Fatalf("Expected %v, got %v", cmdArgs, args)
+	}
+}
diff --git a/internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml b/internal/plugin/testdata/plugdir/bad/duplicate-entries-legacy/plugin.yaml
similarity index 100%
rename from internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
rename to internal/plugin/testdata/plugdir/bad/duplicate-entries-legacy/plugin.yaml
diff --git a/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml b/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
index c0b90379b..4e85f1f79 100644
--- a/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
@@ -1,3 +1,4 @@
+---
 name: "downloader"
 version: "1.2.3"
 usage: "usage"
diff --git a/internal/plugin/testdata/plugdir/good/echo/plugin.yaml b/internal/plugin/testdata/plugdir/good/echo-legacy/plugin.yaml
similarity index 85%
rename from internal/plugin/testdata/plugdir/good/echo/plugin.yaml
rename to internal/plugin/testdata/plugdir/good/echo-legacy/plugin.yaml
index 8baa35b6d..ef84a4d8f 100644
--- a/internal/plugin/testdata/plugdir/good/echo/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/echo-legacy/plugin.yaml
@@ -1,4 +1,5 @@
-name: "echo"
+---
+name: "echo-legacy"
 version: "1.2.3"
 usage: "echo something"
 description: |-
diff --git a/internal/plugin/testdata/plugdir/good/hello/hello.ps1 b/internal/plugin/testdata/plugdir/good/hello-legacy/hello.ps1
similarity index 100%
rename from internal/plugin/testdata/plugdir/good/hello/hello.ps1
rename to internal/plugin/testdata/plugdir/good/hello-legacy/hello.ps1
diff --git a/internal/plugin/testdata/plugdir/good/hello/hello.sh b/internal/plugin/testdata/plugdir/good/hello-legacy/hello.sh
similarity index 100%
rename from internal/plugin/testdata/plugdir/good/hello/hello.sh
rename to internal/plugin/testdata/plugdir/good/hello-legacy/hello.sh
diff --git a/internal/plugin/testdata/plugdir/good/hello/plugin.yaml b/internal/plugin/testdata/plugdir/good/hello-legacy/plugin.yaml
similarity index 84%
rename from internal/plugin/testdata/plugdir/good/hello/plugin.yaml
rename to internal/plugin/testdata/plugdir/good/hello-legacy/plugin.yaml
index 71dc88259..bf37e0626 100644
--- a/internal/plugin/testdata/plugdir/good/hello/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/hello-legacy/plugin.yaml
@@ -1,25 +1,22 @@
-name: "hello"
+---
+name: "hello-legacy"
 version: "0.1.0"
-usage: "usage"
+usage: "echo hello message"
 description: |-
   description
 platformCommand:
   - os: linux
-    arch:
     command: "sh"
     args: ["-c", "${HELM_PLUGIN_DIR}/hello.sh"]
   - os: windows
-    arch:
     command: "pwsh"
     args: ["-c", "${HELM_PLUGIN_DIR}/hello.ps1"]
 ignoreFlags: true
 platformHooks:
   install:
     - os: linux
-      arch: ""
       command: "sh"
       args: ["-c", 'echo "installing..."']
     - os: windows
-      arch: ""
       command: "pwsh"
       args: ["-c", 'echo "installing..."']
diff --git a/pkg/action/action.go b/pkg/action/action.go
index 69bcf4da2..42dc56c96 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -177,7 +177,7 @@ func splitAndDeannotate(postrendered string) (map[string]string, error) {
 //
 //	This code has to do with writing files to disk.
 func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrender.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) {
-	hs := []*release.Hook{}
+	var hs []*release.Hook
 	b := bytes.NewBuffer(nil)
 
 	caps, err := cfg.getCapabilities()
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 78c86cdc0..8f76eee7b 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -237,7 +237,7 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
 	return i.RunWithContext(ctx, chrt, vals)
 }
 
-// Run executes the installation with Context
+// RunWithContext executes the installation with Context
 //
 // When the task is cancelled through ctx, the function returns and the install
 // proceeds in the background.
diff --git a/pkg/cmd/flags.go b/pkg/cmd/flags.go
index 74c3c8352..420631264 100644
--- a/pkg/cmd/flags.go
+++ b/pkg/cmd/flags.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+
 	"k8s.io/klog/v2"
 
 	"helm.sh/helm/v4/pkg/action"
@@ -163,6 +164,7 @@ func (o *outputValue) Set(s string) error {
 	return nil
 }
 
+// TODO there is probably a better way to pass cobra settings than as a param
 func bindPostRenderFlag(cmd *cobra.Command, varRef *postrender.PostRenderer) {
 	p := &postRendererOptions{varRef, "", []string{}}
 	cmd.Flags().Var(&postRendererString{p}, postRenderFlag, "the path to an executable to be used for post rendering. If it exists in $PATH, the binary will be used, otherwise it will try to look for the executable at the given path")
diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go
index 8c06db4ae..40478c30e 100644
--- a/pkg/cmd/helpers_test.go
+++ b/pkg/cmd/helpers_test.go
@@ -104,6 +104,10 @@ func executeActionCommandStdinC(store *storage.Storage, in *os.File, cmd string)
 	root.SetArgs(args)
 
 	oldStdin := os.Stdin
+	defer func() {
+		os.Stdin = oldStdin
+	}()
+
 	if in != nil {
 		root.SetIn(in)
 		os.Stdin = in
@@ -116,8 +120,6 @@ func executeActionCommandStdinC(store *storage.Storage, in *os.File, cmd string)
 
 	result := buf.String()
 
-	os.Stdin = oldStdin
-
 	return c, result, err
 }
 
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index e340ba1b6..5057c1033 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -17,16 +17,17 @@ package cmd
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"log"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"slices"
 	"strconv"
 	"strings"
-	"syscall"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"
@@ -34,6 +35,12 @@ import (
 	"helm.sh/helm/v4/internal/plugin"
 )
 
+// TODO: move pluginDynamicCompletionExecutable pkg/plugin/runtime_subprocess.go
+// any references to executables should be for [plugin.SubprocessPluginRuntime] only
+// this should also be for backwards compatibility in [plugin.Legacy] only
+//
+// TODO: for v1 make this configurable with a new CompletionCommand field for
+// [plugin.RuntimeConfigSubprocess]
 const (
 	pluginStaticCompletionFile        = "completion.yaml"
 	pluginDynamicCompletionExecutable = "plugin.complete"
@@ -44,18 +51,22 @@ type PluginError struct {
 	Code int
 }
 
-// loadPlugins loads plugins into the command list.
+// loadCLIPlugins loads CLI plugins into the command list.
 //
 // This follows a different pattern than the other commands because it has
 // to inspect its environment and then add commands to the base command
 // as it finds them.
-func loadPlugins(baseCmd *cobra.Command, out io.Writer) {
+func loadCLIPlugins(baseCmd *cobra.Command, out io.Writer) {
 	// If HELM_NO_PLUGINS is set to 1, do not load plugins.
 	if os.Getenv("HELM_NO_PLUGINS") == "1" {
 		return
 	}
 
-	found, err := plugin.FindPlugins(settings.PluginsDirectory)
+	dirs := filepath.SplitList(settings.PluginsDirectory)
+	descriptor := plugin.Descriptor{
+		Type: "cli/v1",
+	}
+	found, err := plugin.FindPlugins(dirs, descriptor)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed to load plugins: %s\n", err)
 		return
@@ -63,32 +74,69 @@ func loadPlugins(baseCmd *cobra.Command, out io.Writer) {
 
 	// Now we create commands for all of these.
 	for _, plug := range found {
-		md := plug.Metadata
-		if md.Usage == "" {
-			md.Usage = fmt.Sprintf("the %q plugin", md.Name)
+		var use, short, long string
+		var ignoreFlags bool
+		if cliConfig, ok := plug.Metadata().Config.(*plugin.ConfigCLI); ok {
+			use = cliConfig.Usage
+			short = cliConfig.ShortHelp
+			long = cliConfig.LongHelp
+			ignoreFlags = cliConfig.IgnoreFlags
+		}
+
+		// Set defaults
+		if use == "" {
+			use = plug.Metadata().Name
+		}
+		if short == "" {
+			short = fmt.Sprintf("the %q plugin", plug.Metadata().Name)
 		}
+		// long has no default, empty is ok
 
 		c := &cobra.Command{
-			Use:   md.Name,
-			Short: md.Usage,
-			Long:  md.Description,
+			Use:   use,
+			Short: short,
+			Long:  long,
 			RunE: func(cmd *cobra.Command, args []string) error {
 				u, err := processParent(cmd, args)
 				if err != nil {
 					return err
 				}
+				// Setup plugin environment
+				plugin.SetupPluginEnv(settings, plug.Metadata().Name, plug.Dir())
+
+				// For CLI plugin types runtime, set extra args and settings
+				extraArgs := []string{}
+				if !ignoreFlags {
+					extraArgs = u
+				}
 
-				// Call setupEnv before PrepareCommand because
-				// PrepareCommand uses os.ExpandEnv and expects the
-				// setupEnv vars.
-				plugin.SetupPluginEnv(settings, md.Name, plug.Dir)
-				main, argv, prepCmdErr := plug.PrepareCommand(u)
-				if prepCmdErr != nil {
-					os.Stderr.WriteString(prepCmdErr.Error())
-					return fmt.Errorf("plugin %q exited with error", md.Name)
+				// Prepare environment
+				env := os.Environ()
+				for k, v := range settings.EnvVars() {
+					env = append(env, fmt.Sprintf("%s=%s", k, v))
 				}
 
-				return callPluginExecutable(md.Name, main, argv, out)
+				// Invoke plugin
+				input := &plugin.Input{
+					Message: schema.InputMessageCLIV1{
+						ExtraArgs: extraArgs,
+						Settings:  settings,
+					},
+					Env:    env,
+					Stdin:  os.Stdin,
+					Stdout: out,
+					Stderr: os.Stderr,
+				}
+				_, err = plug.Invoke(context.Background(), input)
+				// TODO do we want to keep execErr here?
+				if execErr, ok := err.(*plugin.InvokeExecError); ok {
+					// TODO can we replace cmd.PluginError with plugin.Error?
+					return PluginError{
+						error: execErr.Err,
+						Code:  execErr.Code,
+					}
+				}
+				return err
 			},
 			// This passes all the flags to the subcommand.
 			DisableFlagParsing: true,
@@ -118,34 +166,6 @@ func processParent(cmd *cobra.Command, args []string) ([]string, error) {
 	return u, nil
 }
 
-// This function is used to setup the environment for the plugin and then
-// call the executable specified by the parameter 'main'
-func callPluginExecutable(pluginName string, main string, argv []string, out io.Writer) error {
-	env := os.Environ()
-	for k, v := range settings.EnvVars() {
-		env = append(env, fmt.Sprintf("%s=%s", k, v))
-	}
-
-	mainCmdExp := os.ExpandEnv(main)
-	prog := exec.Command(mainCmdExp, argv...)
-	prog.Env = env
-	prog.Stdin = os.Stdin
-	prog.Stdout = out
-	prog.Stderr = os.Stderr
-	if err := prog.Run(); err != nil {
-		if eerr, ok := err.(*exec.ExitError); ok {
-			os.Stderr.Write(eerr.Stderr)
-			status := eerr.Sys().(syscall.WaitStatus)
-			return PluginError{
-				error: fmt.Errorf("plugin %q exited with error", pluginName),
-				Code:  status.ExitStatus(),
-			}
-		}
-		return err
-	}
-	return nil
-}
-
 // manuallyProcessArgs processes an arg array, removing special args.
 //
 // Returns two sets of args: known and unknown (in that order)
@@ -200,10 +220,10 @@ type pluginCommand struct {
 
 // loadCompletionForPlugin will load and parse any completion.yaml provided by the plugin
 // and add the dynamic completion hook to call the optional plugin.complete
-func loadCompletionForPlugin(pluginCmd *cobra.Command, plugin *plugin.Plugin) {
+func loadCompletionForPlugin(pluginCmd *cobra.Command, plug plugin.Plugin) {
 	// Parse the yaml file providing the plugin's sub-commands and flags
 	cmds, err := loadFile(strings.Join(
-		[]string{plugin.Dir, pluginStaticCompletionFile}, string(filepath.Separator)))
+		[]string{plug.Dir(), pluginStaticCompletionFile}, string(filepath.Separator)))
 
 	if err != nil {
 		// The file could be missing or invalid.  No static completion for this plugin.
@@ -217,12 +237,12 @@ func loadCompletionForPlugin(pluginCmd *cobra.Command, plugin *plugin.Plugin) {
 	// Preserve the Usage string specified for the plugin
 	cmds.Name = pluginCmd.Use
 
-	addPluginCommands(plugin, pluginCmd, cmds)
+	addPluginCommands(plug, pluginCmd, cmds)
 }
 
 // addPluginCommands is a recursive method that adds each different level
 // of sub-commands and flags for the plugins that have provided such information
-func addPluginCommands(plugin *plugin.Plugin, baseCmd *cobra.Command, cmds *pluginCommand) {
+func addPluginCommands(plug plugin.Plugin, baseCmd *cobra.Command, cmds *pluginCommand) {
 	if cmds == nil {
 		return
 	}
@@ -245,7 +265,7 @@ func addPluginCommands(plugin *plugin.Plugin, baseCmd *cobra.Command, cmds *plug
 		// calling plugin.complete at every completion, which greatly simplifies
 		// development of plugin.complete for plugin developers.
 		baseCmd.ValidArgsFunction = func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return pluginDynamicComp(plugin, cmd, args, toComplete)
+			return pluginDynamicComp(plug, cmd, args, toComplete)
 		}
 	}
 
@@ -300,7 +320,7 @@ func addPluginCommands(plugin *plugin.Plugin, baseCmd *cobra.Command, cmds *plug
 			Run: func(_ *cobra.Command, _ []string) {},
 		}
 		baseCmd.AddCommand(subCmd)
-		addPluginCommands(plugin, subCmd, &cmd)
+		addPluginCommands(plug, subCmd, &cmd)
 	}
 }
 
@@ -319,8 +339,19 @@ func loadFile(path string) (*pluginCommand, error) {
 // pluginDynamicComp call the plugin.complete script of the plugin (if available)
 // to obtain the dynamic completion choices.  It must pass all the flags and sub-commands
 // specified in the command-line to the plugin.complete executable (except helm's global flags)
-func pluginDynamicComp(plug *plugin.Plugin, cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	md := plug.Metadata
+func pluginDynamicComp(plug plugin.Plugin, cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+
+	subprocessPlug, ok := plug.(*plugin.SubprocessPluginRuntime)
+	if !ok {
+		// Completion only supported for subprocess plugins (TODO: fix this)
+		cobra.CompDebugln(fmt.Sprintf("Unsupported plugin runtime: %q", plug.Metadata().Runtime), settings.Debug)
+		return nil, cobra.ShellCompDirectiveDefault
+	}
+
+	var ignoreFlags bool
+	if cliConfig, ok := subprocessPlug.Metadata().Config.(*plugin.ConfigCLI); ok {
+		ignoreFlags = cliConfig.IgnoreFlags
+	}
 
 	u, err := processParent(cmd, args)
 	if err != nil {
@@ -328,21 +359,29 @@ func pluginDynamicComp(plug *plugin.Plugin, cmd *cobra.Command, args []string, t
 	}
 
 	// We will call the dynamic completion script of the plugin
-	main := strings.Join([]string{plug.Dir, pluginDynamicCompletionExecutable}, string(filepath.Separator))
+	main := strings.Join([]string{plug.Dir(), pluginDynamicCompletionExecutable}, string(filepath.Separator))
 
 	// We must include all sub-commands passed on the command-line.
 	// To do that, we pass-in the entire CommandPath, except the first two elements
 	// which are 'helm' and 'pluginName'.
 	argv := strings.Split(cmd.CommandPath(), " ")[2:]
-	if !md.IgnoreFlags {
+	if !ignoreFlags {
 		argv = append(argv, u...)
 		argv = append(argv, toComplete)
 	}
-	plugin.SetupPluginEnv(settings, md.Name, plug.Dir)
+	plugin.SetupPluginEnv(settings, plug.Metadata().Name, plug.Dir())
 
 	cobra.CompDebugln(fmt.Sprintf("calling %s with args %v", main, argv), settings.Debug)
 	buf := new(bytes.Buffer)
-	if err := callPluginExecutable(md.Name, main, argv, buf); err != nil {
+
+	// Prepare environment
+	env := os.Environ()
+	for k, v := range settings.EnvVars() {
+		env = append(env, fmt.Sprintf("%s=%s", k, v))
+	}
+
+	// For subprocess runtime, use InvokeWithEnv for dynamic completion
+	if err := subprocessPlug.InvokeWithEnv(main, argv, env, nil, buf, buf); err != nil {
 		// The dynamic completion file is optional for a plugin, so this error is ok.
 		cobra.CompDebugln(fmt.Sprintf("Unable to call %s: %v", main, err.Error()), settings.Debug)
 		return nil, cobra.ShellCompDirectiveDefault
diff --git a/pkg/cmd/plugin.go b/pkg/cmd/plugin.go
index 76bc99915..b03000ad4 100644
--- a/pkg/cmd/plugin.go
+++ b/pkg/cmd/plugin.go
@@ -16,11 +16,7 @@ limitations under the License.
 package cmd
 
 import (
-	"fmt"
 	"io"
-	"log/slog"
-	"os"
-	"os/exec"
 
 	"github.com/spf13/cobra"
 
@@ -47,35 +43,12 @@ func newPluginCmd(out io.Writer) *cobra.Command {
 }
 
 // runHook will execute a plugin hook.
-func runHook(p *plugin.Plugin, event string) error {
-	plugin.SetupPluginEnv(settings, p.Metadata.Name, p.Dir)
-
-	cmds := p.Metadata.PlatformHooks[event]
-	expandArgs := true
-	if len(cmds) == 0 && len(p.Metadata.Hooks) > 0 {
-		cmd := p.Metadata.Hooks[event]
-		if len(cmd) > 0 {
-			cmds = []plugin.PlatformCommand{{Command: "sh", Args: []string{"-c", cmd}}}
-			expandArgs = false
-		}
-	}
-
-	main, argv, err := plugin.PrepareCommands(cmds, expandArgs, []string{})
-	if err != nil {
-		return nil
+func runHook(p plugin.Plugin, event string) error {
+	pluginHook, ok := p.(plugin.PluginHook)
+	if ok {
+		plugin.SetupPluginEnv(settings, p.Metadata().Name, p.Dir())
+		return pluginHook.InvokeHook(event)
 	}
 
-	prog := exec.Command(main, argv...)
-
-	slog.Debug("running hook", "event", event, "program", prog)
-
-	prog.Stdout, prog.Stderr = os.Stdout, os.Stderr
-	if err := prog.Run(); err != nil {
-		if eerr, ok := err.(*exec.ExitError); ok {
-			os.Stderr.Write(eerr.Stderr)
-			return fmt.Errorf("plugin %s hook for %q exited with error", event, p.Metadata.Name)
-		}
-		return err
-	}
 	return nil
 }
diff --git a/pkg/cmd/plugin_install.go b/pkg/cmd/plugin_install.go
index 7dd1623e7..7dae39505 100644
--- a/pkg/cmd/plugin_install.go
+++ b/pkg/cmd/plugin_install.go
@@ -89,6 +89,6 @@ func (o *pluginInstallOptions) run(out io.Writer) error {
 		return err
 	}
 
-	fmt.Fprintf(out, "Installed plugin: %s\n", p.Metadata.Name)
+	fmt.Fprintf(out, "Installed plugin: %s\n", p.Metadata().Name)
 	return nil
 }
diff --git a/pkg/cmd/plugin_list.go b/pkg/cmd/plugin_list.go
index faf41b91e..31a76330d 100644
--- a/pkg/cmd/plugin_list.go
+++ b/pkg/cmd/plugin_list.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"path/filepath"
 	"slices"
 
 	"github.com/gosuri/uitable"
@@ -28,6 +29,7 @@ import (
 )
 
 func newPluginListCmd(out io.Writer) *cobra.Command {
+	var pluginType string
 	cmd := &cobra.Command{
 		Use:               "list",
 		Aliases:           []string{"ls"},
@@ -35,33 +37,46 @@ func newPluginListCmd(out io.Writer) *cobra.Command {
 		ValidArgsFunction: noMoreArgsCompFunc,
 		RunE: func(_ *cobra.Command, _ []string) error {
 			slog.Debug("pluginDirs", "directory", settings.PluginsDirectory)
-			plugins, err := plugin.FindPlugins(settings.PluginsDirectory)
+			dirs := filepath.SplitList(settings.PluginsDirectory)
+			descriptor := plugin.Descriptor{
+				Type: pluginType,
+			}
+			plugins, err := plugin.FindPlugins(dirs, descriptor)
 			if err != nil {
 				return err
 			}
 
 			table := uitable.New()
-			table.AddRow("NAME", "VERSION", "DESCRIPTION")
+			table.AddRow("NAME", "VERSION", "TYPE", "APIVERSION", "SOURCE")
 			for _, p := range plugins {
-				table.AddRow(p.Metadata.Name, p.Metadata.Version, p.Metadata.Description)
+				m := p.Metadata()
+				sourceURL := m.SourceURL
+				if sourceURL == "" {
+					sourceURL = "unknown"
+				}
+				table.AddRow(m.Name, m.Version, m.Type, m.APIVersion, sourceURL)
 			}
 			fmt.Fprintln(out, table)
 			return nil
 		},
 	}
+
+	f := cmd.Flags()
+	f.StringVar(&pluginType, "type", "", "Plugin type")
+
 	return cmd
 }
 
 // Returns all plugins from plugins, except those with names matching ignoredPluginNames
-func filterPlugins(plugins []*plugin.Plugin, ignoredPluginNames []string) []*plugin.Plugin {
-	// if ignoredPluginNames is nil, just return plugins
-	if ignoredPluginNames == nil {
+func filterPlugins(plugins []plugin.Plugin, ignoredPluginNames []string) []plugin.Plugin {
+	// if ignoredPluginNames is nil or empty, just return plugins
+	if len(ignoredPluginNames) == 0 {
 		return plugins
 	}
 
-	var filteredPlugins []*plugin.Plugin
+	var filteredPlugins []plugin.Plugin
 	for _, plugin := range plugins {
-		found := slices.Contains(ignoredPluginNames, plugin.Metadata.Name)
+		found := slices.Contains(ignoredPluginNames, plugin.Metadata().Name)
 		if !found {
 			filteredPlugins = append(filteredPlugins, plugin)
 		}
@@ -73,11 +88,20 @@ func filterPlugins(plugins []*plugin.Plugin, ignoredPluginNames []string) []*plu
 // Provide dynamic auto-completion for plugin names
 func compListPlugins(_ string, ignoredPluginNames []string) []string {
 	var pNames []string
-	plugins, err := plugin.FindPlugins(settings.PluginsDirectory)
+	dirs := filepath.SplitList(settings.PluginsDirectory)
+	descriptor := plugin.Descriptor{
+		Type: "cli/v1",
+	}
+	plugins, err := plugin.FindPlugins(dirs, descriptor)
 	if err == nil && len(plugins) > 0 {
 		filteredPlugins := filterPlugins(plugins, ignoredPluginNames)
 		for _, p := range filteredPlugins {
-			pNames = append(pNames, fmt.Sprintf("%s\t%s", p.Metadata.Name, p.Metadata.Usage))
+			m := p.Metadata()
+			var shortHelp string
+			if config, ok := m.Config.(*plugin.ConfigCLI); ok {
+				shortHelp = config.ShortHelp
+			}
+			pNames = append(pNames, fmt.Sprintf("%s\t%s", p.Metadata().Name, shortHelp))
 		}
 	}
 	return pNames
diff --git a/pkg/cmd/plugin_test.go b/pkg/cmd/plugin_test.go
index 74f7a276a..b476b80d2 100644
--- a/pkg/cmd/plugin_test.go
+++ b/pkg/cmd/plugin_test.go
@@ -19,12 +19,13 @@ import (
 	"bytes"
 	"os"
 	"runtime"
-	"sort"
 	"strings"
 	"testing"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
@@ -81,7 +82,7 @@ func TestManuallyProcessArgs(t *testing.T) {
 	}
 }
 
-func TestLoadPlugins(t *testing.T) {
+func TestLoadCLIPlugins(t *testing.T) {
 	settings.PluginsDirectory = "testdata/helmhome/helm/plugins"
 	settings.RepositoryConfig = "testdata/helmhome/helm/repositories.yaml"
 	settings.RepositoryCache = "testdata/helmhome/helm/repository"
@@ -90,7 +91,7 @@ func TestLoadPlugins(t *testing.T) {
 		out bytes.Buffer
 		cmd cobra.Command
 	)
-	loadPlugins(&cmd, &out)
+	loadCLIPlugins(&cmd, &out)
 
 	envs := strings.Join([]string{
 		"fullenv",
@@ -119,9 +120,7 @@ func TestLoadPlugins(t *testing.T) {
 
 	plugins := cmd.Commands()
 
-	if len(plugins) != len(tests) {
-		t.Fatalf("Expected %d plugins, got %d", len(tests), len(plugins))
-	}
+	require.Len(t, plugins, len(tests), "Expected %d plugins, got %d", len(tests), len(plugins))
 
 	for i := 0; i < len(plugins); i++ {
 		out.Reset()
@@ -153,9 +152,7 @@ func TestLoadPlugins(t *testing.T) {
 					t.Errorf("Error running %s: %+v", tt.use, err)
 				}
 			}
-			if out.String() != tt.expect {
-				t.Errorf("Expected %s to output:\n%s\ngot\n%s", tt.use, tt.expect, out.String())
-			}
+			assert.Equal(t, tt.expect, out.String(), "expected output for %s", tt.use)
 		}
 	}
 }
@@ -169,7 +166,7 @@ func TestLoadPluginsWithSpace(t *testing.T) {
 		out bytes.Buffer
 		cmd cobra.Command
 	)
-	loadPlugins(&cmd, &out)
+	loadCLIPlugins(&cmd, &out)
 
 	envs := strings.Join([]string{
 		"fullenv",
@@ -228,9 +225,7 @@ func TestLoadPluginsWithSpace(t *testing.T) {
 					t.Errorf("Error running %s: %+v", tt.use, err)
 				}
 			}
-			if out.String() != tt.expect {
-				t.Errorf("Expected %s to output:\n%s\ngot\n%s", tt.use, tt.expect, out.String())
-			}
+			assert.Equal(t, tt.expect, out.String(), "expected output for %s", tt.use)
 		}
 	}
 }
@@ -242,7 +237,7 @@ type staticCompletionDetails struct {
 	next      []staticCompletionDetails
 }
 
-func TestLoadPluginsForCompletion(t *testing.T) {
+func TestLoadCLIPluginsForCompletion(t *testing.T) {
 	settings.PluginsDirectory = "testdata/helmhome/helm/plugins"
 
 	var out bytes.Buffer
@@ -250,8 +245,7 @@ func TestLoadPluginsForCompletion(t *testing.T) {
 	cmd := &cobra.Command{
 		Use: "completion",
 	}
-
-	loadPlugins(cmd, &out)
+	loadCLIPlugins(cmd, &out)
 
 	tests := []staticCompletionDetails{
 		{"args", []string{}, []string{}, []staticCompletionDetails{}},
@@ -276,30 +270,17 @@ func TestLoadPluginsForCompletion(t *testing.T) {
 
 func checkCommand(t *testing.T, plugins []*cobra.Command, tests []staticCompletionDetails) {
 	t.Helper()
-	if len(plugins) != len(tests) {
-		t.Fatalf("Expected commands %v, got %v", tests, plugins)
-	}
+	require.Len(t, plugins, len(tests), "Expected commands %v, got %v", tests, plugins)
 
-	for i := 0; i < len(plugins); i++ {
+	is := assert.New(t)
+	for i := range plugins {
 		pp := plugins[i]
 		tt := tests[i]
-		if pp.Use != tt.use {
-			t.Errorf("%s: Expected Use=%q, got %q", pp.Name(), tt.use, pp.Use)
-		}
+		is.Equal(pp.Use, tt.use, "Expected Use=%q, got %q", tt.use, pp.Use)
 
 		targs := tt.validArgs
 		pargs := pp.ValidArgs
-		if len(targs) != len(pargs) {
-			t.Fatalf("%s: expected args %v, got %v", pp.Name(), targs, pargs)
-		}
-
-		sort.Strings(targs)
-		sort.Strings(pargs)
-		for j := range targs {
-			if targs[j] != pargs[j] {
-				t.Errorf("%s: expected validArg=%q, got %q", pp.Name(), targs[j], pargs[j])
-			}
-		}
+		is.ElementsMatch(targs, pargs)
 
 		tflags := tt.flags
 		var pflags []string
@@ -309,17 +290,8 @@ func checkCommand(t *testing.T, plugins []*cobra.Command, tests []staticCompleti
 				pflags = append(pflags, flag.Shorthand)
 			}
 		})
-		if len(tflags) != len(pflags) {
-			t.Fatalf("%s: expected flags %v, got %v", pp.Name(), tflags, pflags)
-		}
+		is.ElementsMatch(tflags, pflags)
 
-		sort.Strings(tflags)
-		sort.Strings(pflags)
-		for j := range tflags {
-			if tflags[j] != pflags[j] {
-				t.Errorf("%s: expected flag=%q, got %q", pp.Name(), tflags[j], pflags[j])
-			}
-		}
 		// Check the next level
 		checkCommand(t, pp.Commands(), tt.next)
 	}
@@ -358,7 +330,7 @@ func TestPluginDynamicCompletion(t *testing.T) {
 	}
 }
 
-func TestLoadPlugins_HelmNoPlugins(t *testing.T) {
+func TestLoadCLIPlugins_HelmNoPlugins(t *testing.T) {
 	settings.PluginsDirectory = "testdata/helmhome/helm/plugins"
 	settings.RepositoryConfig = "testdata/helmhome/helm/repository"
 
@@ -366,7 +338,7 @@ func TestLoadPlugins_HelmNoPlugins(t *testing.T) {
 
 	out := bytes.NewBuffer(nil)
 	cmd := &cobra.Command{}
-	loadPlugins(cmd, out)
+	loadCLIPlugins(cmd, out)
 	plugins := cmd.Commands()
 
 	if len(plugins) != 0 {
diff --git a/pkg/cmd/plugin_uninstall.go b/pkg/cmd/plugin_uninstall.go
index 808cad92f..a925c66dd 100644
--- a/pkg/cmd/plugin_uninstall.go
+++ b/pkg/cmd/plugin_uninstall.go
@@ -61,7 +61,7 @@ func (o *pluginUninstallOptions) complete(args []string) error {
 
 func (o *pluginUninstallOptions) run(out io.Writer) error {
 	slog.Debug("loading installer plugins", "dir", settings.PluginsDirectory)
-	plugins, err := plugin.FindPlugins(settings.PluginsDirectory)
+	plugins, err := plugin.LoadAll(settings.PluginsDirectory)
 	if err != nil {
 		return err
 	}
@@ -83,16 +83,17 @@ func (o *pluginUninstallOptions) run(out io.Writer) error {
 	return nil
 }
 
-func uninstallPlugin(p *plugin.Plugin) error {
-	if err := os.RemoveAll(p.Dir); err != nil {
+func uninstallPlugin(p plugin.Plugin) error {
+	if err := os.RemoveAll(p.Dir()); err != nil {
 		return err
 	}
 	return runHook(p, plugin.Delete)
 }
 
-func findPlugin(plugins []*plugin.Plugin, name string) *plugin.Plugin {
+// TODO should this be in pkg/plugin/loader.go?
+func findPlugin(plugins []plugin.Plugin, name string) plugin.Plugin {
 	for _, p := range plugins {
-		if p.Metadata.Name == name {
+		if p.Metadata().Name == name {
 			return p
 		}
 	}
diff --git a/pkg/cmd/plugin_update.go b/pkg/cmd/plugin_update.go
index 4fed3772d..c6d4b8530 100644
--- a/pkg/cmd/plugin_update.go
+++ b/pkg/cmd/plugin_update.go
@@ -63,7 +63,7 @@ func (o *pluginUpdateOptions) complete(args []string) error {
 func (o *pluginUpdateOptions) run(out io.Writer) error {
 	installer.Debug = settings.Debug
 	slog.Debug("loading installed plugins", "path", settings.PluginsDirectory)
-	plugins, err := plugin.FindPlugins(settings.PluginsDirectory)
+	plugins, err := plugin.LoadAll(settings.PluginsDirectory)
 	if err != nil {
 		return err
 	}
@@ -86,8 +86,8 @@ func (o *pluginUpdateOptions) run(out io.Writer) error {
 	return nil
 }
 
-func updatePlugin(p *plugin.Plugin) error {
-	exactLocation, err := filepath.EvalSymlinks(p.Dir)
+func updatePlugin(p plugin.Plugin) error {
+	exactLocation, err := filepath.EvalSymlinks(p.Dir())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index f43ce7abe..836df834d 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -291,8 +291,8 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 		newPushCmd(actionConfig, out),
 	)
 
-	// Find and add plugins
-	loadPlugins(cmd, out)
+	// Find and add CLI plugins
+	loadCLIPlugins(cmd, out)
 
 	// Check for expired repositories
 	checkForExpiredRepos(settings.RepositoryConfig)
diff --git a/pkg/cmd/testdata/testplugin/plugin.yaml b/pkg/cmd/testdata/testplugin/plugin.yaml
deleted file mode 100644
index 890292cbf..000000000
--- a/pkg/cmd/testdata/testplugin/plugin.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: testplugin
-usage: "echo test"
-description: "This echos test"
-command: "echo test"
diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go
index 5605e043f..8585ac449 100644
--- a/pkg/getter/getter.go
+++ b/pkg/getter/getter.go
@@ -27,10 +27,11 @@ import (
 	"helm.sh/helm/v4/pkg/registry"
 )
 
-// options are generic parameters to be provided to the getter during instantiation.
+// getterOptions are generic parameters to be provided to the getter during instantiation.
 //
 // Getters may or may not ignore these parameters as they are passed in.
-type options struct {
+// TODO what is the difference between this and schema.GetterOptionsV1?
+type getterOptions struct {
 	url                   string
 	certFile              string
 	keyFile               string
@@ -51,54 +52,54 @@ type options struct {
 
 // Option allows specifying various settings configurable by the user for overriding the defaults
 // used when performing Get operations with the Getter.
-type Option func(*options)
+type Option func(*getterOptions)
 
 // WithURL informs the getter the server name that will be used when fetching objects. Used in conjunction with
 // WithTLSClientConfig to set the TLSClientConfig's server name.
 func WithURL(url string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.url = url
 	}
 }
 
 // WithAcceptHeader sets the request's Accept header as some REST APIs serve multiple content types
 func WithAcceptHeader(header string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.acceptHeader = header
 	}
 }
 
 // WithBasicAuth sets the request's Authorization header to use the provided credentials
 func WithBasicAuth(username, password string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.username = username
 		opts.password = password
 	}
 }
 
 func WithPassCredentialsAll(pass bool) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.passCredentialsAll = pass
 	}
 }
 
 // WithUserAgent sets the request's User-Agent header to use the provided agent name.
 func WithUserAgent(userAgent string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.userAgent = userAgent
 	}
 }
 
 // WithInsecureSkipVerifyTLS determines if a TLS Certificate will be checked
 func WithInsecureSkipVerifyTLS(insecureSkipVerifyTLS bool) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.insecureSkipVerifyTLS = insecureSkipVerifyTLS
 	}
 }
 
 // WithTLSClientConfig sets the client auth with the provided credentials.
 func WithTLSClientConfig(certFile, keyFile, caFile string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.certFile = certFile
 		opts.keyFile = keyFile
 		opts.caFile = caFile
@@ -106,39 +107,39 @@ func WithTLSClientConfig(certFile, keyFile, caFile string) Option {
 }
 
 func WithPlainHTTP(plainHTTP bool) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.plainHTTP = plainHTTP
 	}
 }
 
 // WithTimeout sets the timeout for requests
 func WithTimeout(timeout time.Duration) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.timeout = timeout
 	}
 }
 
 func WithTagName(tagname string) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.version = tagname
 	}
 }
 
 func WithRegistryClient(client *registry.Client) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.registryClient = client
 	}
 }
 
 func WithUntar() Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.unTar = true
 	}
 }
 
 // WithTransport sets the http.Transport to allow overwriting the HTTPGetter default.
 func WithTransport(transport *http.Transport) Option {
-	return func(opts *options) {
+	return func(opts *getterOptions) {
 		opts.transport = transport
 	}
 }
@@ -217,7 +218,7 @@ func Getters(extraOpts ...Option) Providers {
 // notations are collected.
 func All(settings *cli.EnvSettings, opts ...Option) Providers {
 	result := Getters(opts...)
-	pluginDownloaders, _ := collectPlugins(settings)
+	pluginDownloaders, _ := collectGetterPlugins(settings)
 	result = append(result, pluginDownloaders...)
 	return result
 }
diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 4cf528797..110f45c54 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -30,7 +30,7 @@ import (
 
 // HTTPGetter is the default HTTP(/S) backend handler
 type HTTPGetter struct {
-	opts      options
+	opts      getterOptions
 	transport *http.Transport
 	once      sync.Once
 }
diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go
index a997c7f03..f87d71877 100644
--- a/pkg/getter/httpgetter_test.go
+++ b/pkg/getter/httpgetter_test.go
@@ -50,7 +50,7 @@ func TestHTTPGetter(t *testing.T) {
 	timeout := time.Second * 5
 	transport := &http.Transport{}
 
-	// Test with options
+	// Test with getterOptions
 	g, err = NewHTTPGetter(
 		WithBasicAuth("I", "Am"),
 		WithPassCredentialsAll(false),
diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go
index 7e8bcfcfb..45e7263fe 100644
--- a/pkg/getter/ocigetter.go
+++ b/pkg/getter/ocigetter.go
@@ -33,7 +33,7 @@ import (
 
 // OCIGetter is the default HTTP(/S) backend handler
 type OCIGetter struct {
-	opts      options
+	opts      getterOptions
 	transport *http.Transport
 	once      sync.Once
 }
@@ -63,6 +63,8 @@ func (g *OCIGetter) get(href string) (*bytes.Buffer, error) {
 	if version := g.opts.version; version != "" && !strings.Contains(path.Base(ref), ":") {
 		ref = fmt.Sprintf("%s:%s", ref, version)
 	}
+
+	// Default to chart behavior for backward compatibility
 	var pullOpts []registry.PullOption
 	requestingProv := strings.HasSuffix(ref, ".prov")
 	if requestingProv {
diff --git a/pkg/getter/ocigetter_test.go b/pkg/getter/ocigetter_test.go
index e3d9278a5..ef196afcc 100644
--- a/pkg/getter/ocigetter_test.go
+++ b/pkg/getter/ocigetter_test.go
@@ -42,7 +42,7 @@ func TestOCIGetter(t *testing.T) {
 	insecureSkipVerifyTLS := false
 	plainHTTP := false
 
-	// Test with options
+	// Test with getterOptions
 	g, err = NewOCIGetter(
 		WithBasicAuth("I", "Am"),
 		WithTLSClientConfig(pub, priv, ca),
diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index 1893e8327..2b7669f23 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -17,92 +17,109 @@ package getter
 
 import (
 	"bytes"
+	"context"
 	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
+
+	"net/url"
 
 	"helm.sh/helm/v4/internal/plugin"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 	"helm.sh/helm/v4/pkg/cli"
 )
 
-// collectPlugins scans for getter plugins.
+// collectGetterPlugins scans for getter plugins.
 // This will load plugins according to the cli.
-func collectPlugins(settings *cli.EnvSettings) (Providers, error) {
-	plugins, err := plugin.FindPlugins(settings.PluginsDirectory)
+func collectGetterPlugins(settings *cli.EnvSettings) (Providers, error) {
+	d := plugin.Descriptor{
+		Type: "getter/v1",
+	}
+	plgs, err := plugin.FindPlugins([]string{settings.PluginsDirectory}, d)
 	if err != nil {
 		return nil, err
 	}
-	var result Providers
-	for _, plugin := range plugins {
-		for _, downloader := range plugin.Metadata.Downloaders {
-			result = append(result, Provider{
-				Schemes: downloader.Protocols,
-				New: NewPluginGetter(
-					downloader.Command,
-					settings,
-					plugin.Metadata.Name,
-					plugin.Dir,
-				),
+	pluginConstructorBuilder := func(plg plugin.Plugin) Constructor {
+		return func(option ...Option) (Getter, error) {
+
+			return &getterPlugin{
+				options: append([]Option{}, option...),
+				plg:     plg,
+			}, nil
+		}
+	}
+	results := make([]Provider, 0, len(plgs))
+	for _, plg := range plgs {
+		if c, ok := plg.Metadata().Config.(*plugin.ConfigGetter); ok {
+			results = append(results, Provider{
+				Schemes: c.Protocols,
+				New:     pluginConstructorBuilder(plg),
 			})
 		}
 	}
-	return result, nil
+	return results, nil
 }
 
-// pluginGetter is a generic type to invoke custom downloaders,
-// implemented in plugins.
-type pluginGetter struct {
-	command  string
-	settings *cli.EnvSettings
-	name     string
-	base     string
-	opts     options
+func convertOptions(globalOptions, options []Option) schema.GetterOptionsV1 {
+	opts := getterOptions{}
+	for _, opt := range globalOptions {
+		opt(&opts)
+	}
+	for _, opt := range options {
+		opt(&opts)
+	}
+
+	result := schema.GetterOptionsV1{
+		URL:                   opts.url,
+		CertFile:              opts.certFile,
+		KeyFile:               opts.keyFile,
+		CAFile:                opts.caFile,
+		UNTar:                 opts.unTar,
+		InsecureSkipVerifyTLS: opts.insecureSkipVerifyTLS,
+		PlainHTTP:             opts.plainHTTP,
+		AcceptHeader:          opts.acceptHeader,
+		Username:              opts.username,
+		Password:              opts.password,
+		PassCredentialsAll:    opts.passCredentialsAll,
+		UserAgent:             opts.userAgent,
+		Version:               opts.version,
+		Timeout:               opts.timeout,
+	}
+
+	return result
 }
 
-func (p *pluginGetter) setupOptionsEnv(env []string) []string {
-	env = append(env, fmt.Sprintf("HELM_PLUGIN_USERNAME=%s", p.opts.username))
-	env = append(env, fmt.Sprintf("HELM_PLUGIN_PASSWORD=%s", p.opts.password))
-	env = append(env, fmt.Sprintf("HELM_PLUGIN_PASS_CREDENTIALS_ALL=%t", p.opts.passCredentialsAll))
-	return env
+type getterPlugin struct {
+	options []Option
+	plg     plugin.Plugin
 }
 
-// Get runs downloader plugin command
-func (p *pluginGetter) Get(href string, options ...Option) (*bytes.Buffer, error) {
-	for _, opt := range options {
-		opt(&p.opts)
-	}
-	commands := strings.Split(p.command, " ")
-	argv := append(commands[1:], p.opts.certFile, p.opts.keyFile, p.opts.caFile, href)
-	prog := exec.Command(filepath.Join(p.base, commands[0]), argv...)
-	plugin.SetupPluginEnv(p.settings, p.name, p.base)
-	prog.Env = p.setupOptionsEnv(os.Environ())
-	buf := bytes.NewBuffer(nil)
-	prog.Stdout = buf
-	prog.Stderr = os.Stderr
-	if err := prog.Run(); err != nil {
-		if eerr, ok := err.(*exec.ExitError); ok {
-			os.Stderr.Write(eerr.Stderr)
-			return nil, fmt.Errorf("plugin %q exited with error", p.command)
-		}
+func (g *getterPlugin) Get(href string, options ...Option) (*bytes.Buffer, error) {
+	opts := convertOptions(g.options, options)
+
+	// TODO optimization: pass this along to Get() instead of re-parsing here
+	u, err := url.Parse(href)
+	if err != nil {
 		return nil, err
 	}
-	return buf, nil
-}
 
-// NewPluginGetter constructs a valid plugin getter
-func NewPluginGetter(command string, settings *cli.EnvSettings, name, base string) Constructor {
-	return func(options ...Option) (Getter, error) {
-		result := &pluginGetter{
-			command:  command,
-			settings: settings,
-			name:     name,
-			base:     base,
-		}
-		for _, opt := range options {
-			opt(&result.opts)
-		}
-		return result, nil
+	input := &plugin.Input{
+		Message: schema.InputMessageGetterV1{
+			Href:     href,
+			Options:  opts,
+			Protocol: u.Scheme,
+		},
+		// TODO should we pass Stdin, Stdout, and Stderr through Input here to getter plugins?
+		//Stdout: os.Stdout,
+	}
+	output, err := g.plg.Invoke(context.Background(), input)
+	if err != nil {
+		return nil, fmt.Errorf("plugin %q failed to invoke: %w", g.plg, err)
 	}
+
+	outputMessage, ok := output.Message.(*schema.OutputMessageGetterV1)
+	if !ok {
+		return nil, fmt.Errorf("invalid output message type from plugin %q", g.plg.Metadata().Name)
+	}
+
+	return bytes.NewBuffer(outputMessage.Data), nil
 }
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index 310ab9e07..e7354819b 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -16,9 +16,16 @@ limitations under the License.
 package getter
 
 import (
-	"runtime"
-	"strings"
+	"context"
+
 	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/schema"
 
 	"helm.sh/helm/v4/pkg/cli"
 )
@@ -27,7 +34,7 @@ func TestCollectPlugins(t *testing.T) {
 	env := cli.New()
 	env.PluginsDirectory = pluginDir
 
-	p, err := collectPlugins(env)
+	p, err := collectGetterPlugins(env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -49,53 +56,88 @@ func TestCollectPlugins(t *testing.T) {
 	}
 }
 
-func TestPluginGetter(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("TODO: refactor this test to work on windows")
+func TestConvertOptions(t *testing.T) {
+	opts := convertOptions(
+		[]Option{
+			WithURL("example://foo"),
+			WithAcceptHeader("Accept-Header"),
+			WithBasicAuth("username", "password"),
+			WithPassCredentialsAll(true),
+			WithUserAgent("User-agent"),
+			WithInsecureSkipVerifyTLS(true),
+			WithTLSClientConfig("certFile.pem", "keyFile.pem", "caFile.pem"),
+			WithPlainHTTP(true),
+			WithTimeout(10),
+			WithTagName("1.2.3"),
+			WithUntar(),
+		},
+		[]Option{
+			WithTimeout(20),
+		},
+	)
+
+	expected := schema.GetterOptionsV1{
+		URL:                   "example://foo",
+		CertFile:              "certFile.pem",
+		KeyFile:               "keyFile.pem",
+		CAFile:                "caFile.pem",
+		UNTar:                 true,
+		Timeout:               20,
+		InsecureSkipVerifyTLS: true,
+		PlainHTTP:             true,
+		AcceptHeader:          "Accept-Header",
+		Username:              "username",
+		Password:              "password",
+		PassCredentialsAll:    true,
+		UserAgent:             "User-agent",
+		Version:               "1.2.3",
 	}
+	assert.Equal(t, expected, opts)
+}
 
-	env := cli.New()
-	env.PluginsDirectory = pluginDir
-	pg := NewPluginGetter("echo", env, "test", ".")
-	g, err := pg()
-	if err != nil {
-		t.Fatal(err)
-	}
+type TestPlugin struct {
+	t   *testing.T
+	dir string
+}
 
-	data, err := g.Get("test://foo/bar")
-	if err != nil {
-		t.Fatal(err)
-	}
+func (t *TestPlugin) Dir() string {
+	return t.dir
+}
 
-	expect := "test://foo/bar"
-	got := strings.TrimSpace(data.String())
-	if got != expect {
-		t.Errorf("Expected %q, got %q", expect, got)
+func (t *TestPlugin) Metadata() plugin.Metadata {
+	return plugin.Metadata{
+		Name:   "fake-plugin",
+		Config: &plugin.ConfigGetter{},
+		RuntimeConfig: &plugin.RuntimeConfigSubprocess{
+			PlatformCommands: []plugin.PlatformCommand{
+				{
+					Command: "echo fake-plugin",
+				},
+			},
+		},
 	}
 }
 
-func TestPluginSubCommands(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("TODO: refactor this test to work on windows")
+func (t *TestPlugin) Invoke(_ context.Context, _ *plugin.Input) (*plugin.Output, error) {
+	// Simulate a plugin invocation
+	output := &plugin.Output{
+		Message: &schema.OutputMessageGetterV1{
+			Data: []byte("fake-plugin output"),
+		},
 	}
+	return output, nil
+}
 
-	env := cli.New()
-	env.PluginsDirectory = pluginDir
+var _ plugin.Plugin = (*TestPlugin)(nil)
 
-	pg := NewPluginGetter("echo -n", env, "test", ".")
-	g, err := pg()
-	if err != nil {
-		t.Fatal(err)
+func TestGetterPlugin(t *testing.T) {
+	gp := getterPlugin{
+		options: []Option{},
+		plg:     &TestPlugin{t: t, dir: "fake/dir"},
 	}
 
-	data, err := g.Get("test://foo/bar")
-	if err != nil {
-		t.Fatal(err)
-	}
+	buf, err := gp.Get("test://example.com", WithTimeout(5*time.Second))
+	require.NoError(t, err)
 
-	expect := "   test://foo/bar"
-	got := data.String()
-	if got != expect {
-		t.Errorf("Expected %q, got %q", expect, got)
-	}
+	assert.Equal(t, "fake-plugin output", buf.String())
 }
diff --git a/pkg/getter/testdata/plugins/testgetter/get.sh b/pkg/getter/testdata/plugins/testgetter/get.sh
deleted file mode 100755
index cdd992369..000000000
--- a/pkg/getter/testdata/plugins/testgetter/get.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo ENVIRONMENT
-env
-
-echo ""
-echo ARGUMENTS
-echo $@
diff --git a/pkg/getter/testdata/plugins/testgetter/plugin.yaml b/pkg/getter/testdata/plugins/testgetter/plugin.yaml
index d1b929e3f..625b8b462 100644
--- a/pkg/getter/testdata/plugins/testgetter/plugin.yaml
+++ b/pkg/getter/testdata/plugins/testgetter/plugin.yaml
@@ -1,15 +1,6 @@
 name: "testgetter"
 version: "0.1.0"
-usage: "Fetch a package from a test:// source"
-description: |-
-  Print the environment that the plugin was given, then exit.
-
-  This registers the test:// protocol.
-
-command: "$HELM_PLUGIN_DIR/get.sh"
-ignoreFlags: true
 downloaders:
-#- command: "$HELM_PLUGIN_DIR/get.sh"
-- command: "echo"
-  protocols:
-    - "test"
+  - command: "echo"
+    protocols:
+      - "test"
diff --git a/pkg/getter/testdata/plugins/testgetter2/get.sh b/pkg/getter/testdata/plugins/testgetter2/get.sh
deleted file mode 100755
index cdd992369..000000000
--- a/pkg/getter/testdata/plugins/testgetter2/get.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-echo ENVIRONMENT
-env
-
-echo ""
-echo ARGUMENTS
-echo $@
diff --git a/pkg/getter/testdata/plugins/testgetter2/plugin.yaml b/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
index f1a527ef9..4657bc9c1 100644
--- a/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
+++ b/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
@@ -1,10 +1,6 @@
 name: "testgetter2"
 version: "0.1.0"
-usage: "Fetch a different package from a test2:// source"
-description: "Handle test2 scheme"
-command: "$HELM_PLUGIN_DIR/get.sh"
-ignoreFlags: true
 downloaders:
-- command: "echo"
-  protocols:
-    - "test2"
+  - command: "echo"
+    protocols:
+      - "test2"

From a7578fec748de1d747aa220cd13e7237670d5c84 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Sun, 17 Aug 2025 18:18:05 -0400
Subject: [PATCH 152/211] Plugin types and plugin apiVersion v1

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/config.go                     | 16 +++++
 internal/plugin/doc.go                        |  4 +-
 .../plugin/installer/local_installer_test.go  |  6 +-
 .../plugin/installer/vcs_installer_test.go    |  2 +-
 internal/plugin/loader.go                     | 25 +++++++
 internal/plugin/loader_test.go                | 48 ++++++++++++-
 internal/plugin/metadata.go                   | 63 ++++++++++++++++-
 internal/plugin/metadata_v1.go                | 67 +++++++++++++++++++
 internal/plugin/plugin_test.go                |  2 +-
 internal/plugin/runtime.go                    | 16 +++++
 internal/plugin/subprocess_commands_test.go   |  2 -
 .../bad/duplicate-entries-v1/plugin.yaml      | 16 +++++
 .../testdata/plugdir/good/echo-v1/plugin.yaml | 15 +++++
 .../testdata/plugdir/good/getter/plugin.yaml  | 16 +++++
 .../testdata/plugdir/good/hello-v1/hello.ps1  |  3 +
 .../testdata/plugdir/good/hello-v1/hello.sh   |  9 +++
 .../plugdir/good/hello-v1/plugin.yaml         | 32 +++++++++
 pkg/cmd/flags.go                              |  1 -
 .../helm/plugins/fullenv/plugin.yaml          | 12 +++-
 .../helmhome/helm/plugins/args/plugin.yaml    | 12 +++-
 .../helmhome/helm/plugins/echo/plugin.yaml    | 12 +++-
 .../helmhome/helm/plugins/env/plugin.yaml     | 12 +++-
 .../helm/plugins/exitwith/plugin.yaml         | 12 +++-
 .../helmhome/helm/plugins/fullenv/plugin.yaml | 12 +++-
 pkg/getter/plugingetter_test.go               |  6 +-
 .../testdata/plugins/testgetter/plugin.yaml   | 15 +++--
 .../testdata/plugins/testgetter2/plugin.yaml  | 15 +++--
 27 files changed, 411 insertions(+), 40 deletions(-)
 create mode 100644 internal/plugin/metadata_v1.go
 create mode 100644 internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
 create mode 100644 internal/plugin/testdata/plugdir/good/echo-v1/plugin.yaml
 create mode 100644 internal/plugin/testdata/plugdir/good/getter/plugin.yaml
 create mode 100644 internal/plugin/testdata/plugdir/good/hello-v1/hello.ps1
 create mode 100755 internal/plugin/testdata/plugdir/good/hello-v1/hello.sh
 create mode 100644 internal/plugin/testdata/plugdir/good/hello-v1/plugin.yaml

diff --git a/internal/plugin/config.go b/internal/plugin/config.go
index f308e7ae9..812dba7f6 100644
--- a/internal/plugin/config.go
+++ b/internal/plugin/config.go
@@ -17,6 +17,8 @@ package plugin
 
 import (
 	"fmt"
+
+	"go.yaml.in/yaml/v3"
 )
 
 // Config interface defines the methods that all plugin type configurations must implement
@@ -64,3 +66,17 @@ func (c *ConfigGetter) Validate() error {
 	}
 	return nil
 }
+
+func remarshalConfig[T Config](configData map[string]any) (Config, error) {
+	data, err := yaml.Marshal(configData)
+	if err != nil {
+		return nil, err
+	}
+
+	var config T
+	if err := yaml.Unmarshal(data, &config); err != nil {
+		return nil, err
+	}
+
+	return config, nil
+}
diff --git a/internal/plugin/doc.go b/internal/plugin/doc.go
index f150358bd..39ba6300b 100644
--- a/internal/plugin/doc.go
+++ b/internal/plugin/doc.go
@@ -55,7 +55,7 @@ Helm plugins are exposed to uses as the "Plugin" type, the basic interface that
 Internally, plugins must be implemented by a "runtime" that is responsible for creating the plugin instance, and dispatching the plugin's invocation to the plugin's implementation.
 For example:
 - forming environment variables and command line args for subprocess execution
-- converting input to JSON and invoking a function in a future runtime (eg, Wasm)
+- converting input to JSON and invoking a function in a Wasm runtime
 
 Internally, the code structure is:
 Runtime.CreatePlugin()
@@ -78,7 +78,7 @@ Each plugin must have a `plugin.yaml`, that defines the plugin's metadata. The m
 
 For legacy plugins, the type is inferred by which fields are set on the plugin: a downloader plugin is inferred when metadata contains a "downloaders" yaml node, otherwise it is assumed to define a Helm CLI subcommand.
 
-For future plugin api versions, the metadata will include explicit apiVersion and type fields. It will also contain type and runtime specific Config and RuntimeConfig fields.
+For v1 plugins, the metadata includes explicit apiVersion and type fields. It will also contain type-specific Config, and RuntimeConfig fields.
 
 # Runtime and type cardinality
 From a cardinality perspective, this means there a "few" runtimes, and "many" plugins types. It is also expected that the subprocess runtime will not be extended to support extra plugin types, and deprecated in a future version of Helm.
diff --git a/internal/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
index 3b1c0f680..fdb669314 100644
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -34,7 +34,7 @@ func TestLocalInstaller(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	source := "../testdata/plugdir/good/echo-legacy"
+	source := "../testdata/plugdir/good/echo-v1"
 	i, err := NewForSource(source, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -44,14 +44,14 @@ func TestLocalInstaller(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if i.Path() != helmpath.DataPath("plugins", "echo-legacy") {
+	if i.Path() != helmpath.DataPath("plugins", "echo-v1") {
 		t.Fatalf("expected path '$XDG_CONFIG_HOME/helm/plugins/helm-env', got %q", i.Path())
 	}
 	defer os.RemoveAll(filepath.Dir(helmpath.DataPath())) // helmpath.DataPath is like /tmp/helm013130971/helm
 }
 
 func TestLocalInstallerNotAFolder(t *testing.T) {
-	source := "../testdata/plugdir/good/echo-legacy/plugin.yaml"
+	source := "../testdata/plugdir/good/echo-v1/plugin.yaml"
 	i, err := NewForSource(source, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
diff --git a/internal/plugin/installer/vcs_installer_test.go b/internal/plugin/installer/vcs_installer_test.go
index 9c65d244c..f024b4b40 100644
--- a/internal/plugin/installer/vcs_installer_test.go
+++ b/internal/plugin/installer/vcs_installer_test.go
@@ -57,7 +57,7 @@ func TestVCSInstaller(t *testing.T) {
 	}
 
 	source := "https://github.com/adamreese/helm-env"
-	testRepoPath, _ := filepath.Abs("../testdata/plugdir/good/echo-legacy")
+	testRepoPath, _ := filepath.Abs("../testdata/plugdir/good/echo-v1")
 	repo := &testRepo{
 		local: testRepoPath,
 		tags:  []string{"0.1.0", "0.1.1"},
diff --git a/internal/plugin/loader.go b/internal/plugin/loader.go
index b47b15d34..eb05cb722 100644
--- a/internal/plugin/loader.go
+++ b/internal/plugin/loader.go
@@ -58,6 +58,29 @@ func loadMetadataLegacy(metadataData []byte) (*Metadata, error) {
 	return m, nil
 }
 
+func loadMetadataV1(metadataData []byte) (*Metadata, error) {
+
+	var mv1 MetadataV1
+	d := yaml.NewDecoder(bytes.NewReader(metadataData))
+	if err := d.Decode(&mv1); err != nil {
+		return nil, err
+	}
+
+	if err := mv1.Validate(); err != nil {
+		return nil, err
+	}
+
+	m, err := fromMetadataV1(mv1)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert MetadataV1 to Metadata: %w", err)
+	}
+
+	if err := m.Validate(); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 func loadMetadata(metadataData []byte) (*Metadata, error) {
 	apiVersion, err := peekAPIVersion(bytes.NewReader(metadataData))
 	if err != nil {
@@ -67,6 +90,8 @@ func loadMetadata(metadataData []byte) (*Metadata, error) {
 	switch apiVersion {
 	case "": // legacy
 		return loadMetadataLegacy(metadataData)
+	case "v1":
+		return loadMetadataV1(metadataData)
 	}
 
 	return nil, fmt.Errorf("invalid plugin apiVersion: %q", apiVersion)
diff --git a/internal/plugin/loader_test.go b/internal/plugin/loader_test.go
index b80d6a096..81ef26e02 100644
--- a/internal/plugin/loader_test.go
+++ b/internal/plugin/loader_test.go
@@ -29,6 +29,13 @@ func TestPeekAPIVersion(t *testing.T) {
 		data     []byte
 		expected string
 	}{
+		"v1": {
+			data: []byte(`---
+apiVersion: v1
+name: "test-plugin"
+`),
+			expected: "v1",
+		},
 		"legacy": { // No apiVersion field
 			data: []byte(`---
 name: "test-plugin"
@@ -97,6 +104,11 @@ func TestLoadDir(t *testing.T) {
 			apiVersion: "legacy",
 			expect:     makeMetadata("legacy"),
 		},
+		"v1": {
+			dirname:    "testdata/plugdir/good/hello-v1",
+			apiVersion: "v1",
+			expect:     makeMetadata("v1"),
+		},
 	}
 
 	for name, tc := range testCases {
@@ -113,6 +125,7 @@ func TestLoadDir(t *testing.T) {
 func TestLoadDirDuplicateEntries(t *testing.T) {
 	testCases := map[string]string{
 		"legacy": "testdata/plugdir/bad/duplicate-entries-legacy",
+		"v1":     "testdata/plugdir/bad/duplicate-entries-v1",
 	}
 	for name, dirname := range testCases {
 		t.Run(name, func(t *testing.T) {
@@ -122,6 +135,34 @@ func TestLoadDirDuplicateEntries(t *testing.T) {
 	}
 }
 
+func TestLoadDirGetter(t *testing.T) {
+	dirname := "testdata/plugdir/good/getter"
+
+	expect := Metadata{
+		Name:       "getter",
+		Version:    "1.2.3",
+		Type:       "getter/v1",
+		APIVersion: "v1",
+		Runtime:    "subprocess",
+		Config: &ConfigGetter{
+			Protocols: []string{"myprotocol", "myprotocols"},
+		},
+		RuntimeConfig: &RuntimeConfigSubprocess{
+			ProtocolCommands: []SubprocessProtocolCommand{
+				{
+					Protocols: []string{"myprotocol", "myprotocols"},
+					Command:   "echo getter",
+				},
+			},
+		},
+	}
+
+	plug, err := LoadDir(dirname)
+	require.NoError(t, err)
+	assert.Equal(t, dirname, plug.Dir())
+	assert.Equal(t, expect, plug.Metadata())
+}
+
 func TestDetectDuplicates(t *testing.T) {
 	plugs := []Plugin{
 		mockSubprocessCLIPlugin(t, "foo"),
@@ -154,10 +195,13 @@ func TestLoadAll(t *testing.T) {
 		plugsMap[p.Metadata().Name] = p
 	}
 
-	assert.Len(t, plugsMap, 3)
+	assert.Len(t, plugsMap, 6)
 	assert.Contains(t, plugsMap, "downloader")
 	assert.Contains(t, plugsMap, "echo-legacy")
+	assert.Contains(t, plugsMap, "echo-v1")
+	assert.Contains(t, plugsMap, "getter")
 	assert.Contains(t, plugsMap, "hello-legacy")
+	assert.Contains(t, plugsMap, "hello-v1")
 }
 
 func TestFindPlugins(t *testing.T) {
@@ -184,7 +228,7 @@ func TestFindPlugins(t *testing.T) {
 		{
 			name:     "normal",
 			plugdirs: "./testdata/plugdir/good",
-			expected: 3,
+			expected: 6,
 		},
 	}
 	for _, c := range cases {
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
index b899ef336..48741474e 100644
--- a/internal/plugin/metadata.go
+++ b/internal/plugin/metadata.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 )
 
-// Metadata of a plugin, converted from the "on-disk" plugin.yaml
+// Metadata of a plugin, converted from the "on-disk" legacy or v1 plugin.yaml
 // Specifically, Config and RuntimeConfig are converted to their respective types based on the plugin type and runtime
 type Metadata struct {
 	// APIVersion specifies the plugin API version
@@ -153,3 +153,64 @@ func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
 		ProtocolCommands: protocolCommands,
 	}
 }
+
+func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) {
+
+	config, err := convertMetadataConfig(mv1.Type, mv1.Config)
+	if err != nil {
+		return nil, err
+	}
+
+	runtimeConfig, err := convertMetdataRuntimeConfig(mv1.Runtime, mv1.RuntimeConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Metadata{
+		APIVersion:    mv1.APIVersion,
+		Name:          mv1.Name,
+		Type:          mv1.Type,
+		Runtime:       mv1.Runtime,
+		Version:       mv1.Version,
+		SourceURL:     mv1.SourceURL,
+		Config:        config,
+		RuntimeConfig: runtimeConfig,
+	}, nil
+}
+
+func convertMetadataConfig(pluginType string, configRaw map[string]any) (Config, error) {
+	var err error
+	var config Config
+
+	switch pluginType {
+	case "cli/v1":
+		config, err = remarshalConfig[*ConfigCLI](configRaw)
+	case "getter/v1":
+		config, err = remarshalConfig[*ConfigGetter](configRaw)
+	default:
+		return nil, fmt.Errorf("unsupported plugin type: %s", pluginType)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal config for %s plugin type: %w", pluginType, err)
+	}
+
+	return config, nil
+}
+
+func convertMetdataRuntimeConfig(runtimeType string, runtimeConfigRaw map[string]any) (RuntimeConfig, error) {
+	var runtimeConfig RuntimeConfig
+	var err error
+
+	switch runtimeType {
+	case "subprocess":
+		runtimeConfig, err = remarshalRuntimeConfig[*RuntimeConfigSubprocess](runtimeConfigRaw)
+	default:
+		return nil, fmt.Errorf("unsupported plugin runtime type: %q", runtimeType)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal runtimeConfig for %s runtime: %w", runtimeType, err)
+	}
+	return runtimeConfig, nil
+}
diff --git a/internal/plugin/metadata_v1.go b/internal/plugin/metadata_v1.go
new file mode 100644
index 000000000..654aa8900
--- /dev/null
+++ b/internal/plugin/metadata_v1.go
@@ -0,0 +1,67 @@
+/*
+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 plugin
+
+import (
+	"fmt"
+)
+
+// MetadataV1 is the APIVersion V1 plugin.yaml format
+type MetadataV1 struct {
+	// APIVersion specifies the plugin API version
+	APIVersion string `yaml:"apiVersion"`
+
+	// Name is the name of the plugin
+	Name string `yaml:"name"`
+
+	// Type of plugin (eg, cli/v1, getter/v1)
+	Type string `yaml:"type"`
+
+	// Runtime specifies the runtime type (subprocess, wasm)
+	Runtime string `yaml:"runtime"`
+
+	// Version is a SemVer 2 version of the plugin.
+	Version string `yaml:"version"`
+
+	// SourceURL is the URL where this plugin can be found
+	SourceURL string `yaml:"sourceURL,omitempty"`
+
+	// Config contains the type-specific configuration for this plugin
+	Config map[string]any `yaml:"config"`
+
+	// RuntimeConfig contains the runtime-specific configuration
+	RuntimeConfig map[string]any `yaml:"runtimeConfig"`
+}
+
+func (m *MetadataV1) Validate() error {
+	if !validPluginName.MatchString(m.Name) {
+		return fmt.Errorf("invalid plugin `name`")
+	}
+
+	if m.APIVersion != "v1" {
+		return fmt.Errorf("invalid `apiVersion`: %q", m.APIVersion)
+	}
+
+	if m.Type == "" {
+		return fmt.Errorf("`type` missing")
+	}
+
+	if m.Runtime == "" {
+		return fmt.Errorf("`runtime` missing")
+	}
+
+	return nil
+}
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index 3c78006b7..fbebecac4 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -42,7 +42,7 @@ func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginR
 			Name:       pluginName,
 			Version:    "v0.1.2",
 			Type:       "cli/v1",
-			APIVersion: "legacy",
+			APIVersion: "v1",
 			Runtime:    "subprocess",
 			Config: &ConfigCLI{
 				Usage:       "Mock plugin",
diff --git a/internal/plugin/runtime.go b/internal/plugin/runtime.go
index 87f068724..8add92dea 100644
--- a/internal/plugin/runtime.go
+++ b/internal/plugin/runtime.go
@@ -15,6 +15,8 @@ limitations under the License.
 
 package plugin
 
+import "go.yaml.in/yaml/v3"
+
 // Runtime represents a plugin runtime (subprocess, extism, etc) ie. how a plugin should be executed
 // Runtime is responsible for instantiating plugins that implement the runtime
 // TODO: could call this something more like "PluginRuntimeCreator"?
@@ -31,3 +33,17 @@ type Runtime interface {
 type RuntimeConfig interface {
 	Validate() error
 }
+
+func remarshalRuntimeConfig[T RuntimeConfig](runtimeData map[string]any) (RuntimeConfig, error) {
+	data, err := yaml.Marshal(runtimeData)
+	if err != nil {
+		return nil, err
+	}
+
+	var config T
+	if err := yaml.Unmarshal(data, &config); err != nil {
+		return nil, err
+	}
+
+	return config, nil
+}
diff --git a/internal/plugin/subprocess_commands_test.go b/internal/plugin/subprocess_commands_test.go
index 3879a4bd0..3cb9325ab 100644
--- a/internal/plugin/subprocess_commands_test.go
+++ b/internal/plugin/subprocess_commands_test.go
@@ -86,8 +86,6 @@ func TestPrepareCommandExtraArgs(t *testing.T) {
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
-			//expectedArgs := append(cmdArgs, extraArgs...)
-
 			// extra args are expected when ignoreFlags is unset or false
 			testExtraArgs := extraArgs
 			if tc.ignoreFlags {
diff --git a/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml b/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
new file mode 100644
index 000000000..030ae6aca
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
@@ -0,0 +1,16 @@
+name: "duplicate-entries"
+version: "0.1.0"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "test duplicate entries"
+  longHelp: |-
+    description
+  ignoreFlags: true
+runtimeConfig:
+  command: "echo hello"
+  hooks:
+    install: "echo installing..."
+  hooks:
+    install: "echo installing something different"
diff --git a/internal/plugin/testdata/plugdir/good/echo-v1/plugin.yaml b/internal/plugin/testdata/plugdir/good/echo-v1/plugin.yaml
new file mode 100644
index 000000000..8bbef9c0f
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/echo-v1/plugin.yaml
@@ -0,0 +1,15 @@
+---
+name: "echo-v1"
+version: "1.2.3"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "echo something"
+  longHelp: |-
+    This is a testing fixture.
+  ignoreFlags: false
+runtimeConfig:
+  command: "echo Hello"
+  hooks:
+    install: "echo Installing"
diff --git a/internal/plugin/testdata/plugdir/good/getter/plugin.yaml b/internal/plugin/testdata/plugdir/good/getter/plugin.yaml
new file mode 100644
index 000000000..cfe80fbdc
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/getter/plugin.yaml
@@ -0,0 +1,16 @@
+---
+name: "getter"
+version: "1.2.3"
+type: getter/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  protocols:
+    - "myprotocol"
+    - "myprotocols"
+runtimeConfig:
+  protocolCommands:
+    - command: "echo getter"
+      protocols:
+        - "myprotocol"
+        - "myprotocols"
diff --git a/internal/plugin/testdata/plugdir/good/hello-v1/hello.ps1 b/internal/plugin/testdata/plugdir/good/hello-v1/hello.ps1
new file mode 100644
index 000000000..bee61f27d
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/hello-v1/hello.ps1
@@ -0,0 +1,3 @@
+#!/usr/bin/env pwsh
+
+Write-Host "Hello, world!"
diff --git a/internal/plugin/testdata/plugdir/good/hello-v1/hello.sh b/internal/plugin/testdata/plugdir/good/hello-v1/hello.sh
new file mode 100755
index 000000000..dcfd58876
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/hello-v1/hello.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Hello from a Helm plugin"
+
+echo "PARAMS"
+echo $*
+
+$HELM_BIN ls --all
+
diff --git a/internal/plugin/testdata/plugdir/good/hello-v1/plugin.yaml b/internal/plugin/testdata/plugdir/good/hello-v1/plugin.yaml
new file mode 100644
index 000000000..044a3476d
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/hello-v1/plugin.yaml
@@ -0,0 +1,32 @@
+---
+name: "hello-v1"
+version: "0.1.0"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  usage: hello [params]...
+  shortHelp: "echo hello message"
+  longHelp: |-
+    description
+  ignoreFlags: true
+runtimeConfig:
+  platformCommand:
+    - os: linux
+      arch:
+      command: "sh"
+      args: ["-c", "${HELM_PLUGIN_DIR}/hello.sh"]
+    - os: windows
+      arch:
+      command: "pwsh"
+      args: ["-c", "${HELM_PLUGIN_DIR}/hello.ps1"]
+  platformHooks:
+    install:
+      - os: linux
+        arch: ""
+        command: "sh"
+        args: ["-c", 'echo "installing..."']
+      - os: windows
+        arch: ""
+        command: "pwsh"
+        args: ["-c", 'echo "installing..."']
diff --git a/pkg/cmd/flags.go b/pkg/cmd/flags.go
index 420631264..d11073e5f 100644
--- a/pkg/cmd/flags.go
+++ b/pkg/cmd/flags.go
@@ -164,7 +164,6 @@ func (o *outputValue) Set(s string) error {
 	return nil
 }
 
-// TODO there is probably a better way to pass cobra settings than as a param
 func bindPostRenderFlag(cmd *cobra.Command, varRef *postrender.PostRenderer) {
 	p := &postRendererOptions{varRef, "", []string{}}
 	cmd.Flags().Var(&postRendererString{p}, postRenderFlag, "the path to an executable to be used for post rendering. If it exists in $PATH, the binary will be used, otherwise it will try to look for the executable at the given path")
diff --git a/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml b/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml
index 63f2f12db..8b874da1d 100644
--- a/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml	
+++ b/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml	
@@ -1,4 +1,10 @@
 name: fullenv
-usage: "show env vars"
-description: "show all env vars"
-command: "$HELM_PLUGIN_DIR/fullenv.sh"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "show env vars"
+  longHelp: "show all env vars"
+  ignoreFlags: false
+runtimeConfig:
+  command: "$HELM_PLUGIN_DIR/fullenv.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
index 21e28a7c2..57312cbfa 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
@@ -1,4 +1,10 @@
 name: args
-usage: "echo args"
-description: "This echos args"
-command: "$HELM_PLUGIN_DIR/args.sh"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "echo args"
+  longHelp: "This echos args"
+  ignoreFlags: false
+runtimeConfig:
+  command: "$HELM_PLUGIN_DIR/args.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
index 7b9362a08..544efa85e 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
@@ -1,4 +1,10 @@
 name: echo
-usage: "echo stuff"
-description: "This echos stuff"
-command: "echo hello"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "echo stuff"
+  longHelp: "This echos stuff"
+  ignoreFlags: false
+runtimeConfig:
+  command: "echo hello"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
index 52cb7a848..d7a4c229c 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
@@ -1,4 +1,10 @@
 name: env
-usage: "env stuff"
-description: "show the env"
-command: "echo $HELM_PLUGIN_NAME"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "env stuff"
+  longHelp: "show the env"
+  ignoreFlags: false
+runtimeConfig:
+  command: "echo $HELM_PLUGIN_NAME"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
index 5691d1712..06a350f83 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
@@ -1,4 +1,10 @@
 name: exitwith
-usage: "exitwith code"
-description: "This exits with the specified exit code"
-command: "$HELM_PLUGIN_DIR/exitwith.sh"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "exitwith code"
+  longHelp: "This exits with the specified exit code"
+  ignoreFlags: false
+runtimeConfig:
+  command: "$HELM_PLUGIN_DIR/exitwith.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
index 63f2f12db..8b874da1d 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
@@ -1,4 +1,10 @@
 name: fullenv
-usage: "show env vars"
-description: "show all env vars"
-command: "$HELM_PLUGIN_DIR/fullenv.sh"
+type: cli/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  shortHelp: "show env vars"
+  longHelp: "show all env vars"
+  ignoreFlags: false
+runtimeConfig:
+  command: "$HELM_PLUGIN_DIR/fullenv.sh"
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index e7354819b..85c847752 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -106,7 +106,11 @@ func (t *TestPlugin) Dir() string {
 
 func (t *TestPlugin) Metadata() plugin.Metadata {
 	return plugin.Metadata{
-		Name:   "fake-plugin",
+		Name:       "fake-plugin",
+		Type:       "cli/v1",
+		APIVersion: "v1",
+		Runtime:    "subprocess",
+		// TODO: either change Config to plugin.ConfigCLI, or change APIVersion to getter/v1?
 		Config: &plugin.ConfigGetter{},
 		RuntimeConfig: &plugin.RuntimeConfigSubprocess{
 			PlatformCommands: []plugin.PlatformCommand{
diff --git a/pkg/getter/testdata/plugins/testgetter/plugin.yaml b/pkg/getter/testdata/plugins/testgetter/plugin.yaml
index 625b8b462..ca11b95ea 100644
--- a/pkg/getter/testdata/plugins/testgetter/plugin.yaml
+++ b/pkg/getter/testdata/plugins/testgetter/plugin.yaml
@@ -1,6 +1,13 @@
 name: "testgetter"
 version: "0.1.0"
-downloaders:
-  - command: "echo"
-    protocols:
-      - "test"
+type: getter/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  protocols:
+    - "test"
+runtimeConfig:
+  protocolCommands:
+    - command: "echo"
+      protocols:
+        - "test"
diff --git a/pkg/getter/testdata/plugins/testgetter2/plugin.yaml b/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
index 4657bc9c1..1c944a7c7 100644
--- a/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
+++ b/pkg/getter/testdata/plugins/testgetter2/plugin.yaml
@@ -1,6 +1,13 @@
 name: "testgetter2"
 version: "0.1.0"
-downloaders:
-  - command: "echo"
-    protocols:
-      - "test2"
+type: getter/v1
+apiVersion: v1
+runtime: subprocess
+config:
+  protocols:
+    - "test2"
+runtimeConfig:
+  protocolCommands:
+    - command: "echo"
+      protocols:
+        - "test2"

From 533eddc57d4727f1422d6e8a3e5d8fa6fbf8697e Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Fri, 22 Aug 2025 15:41:47 -0400
Subject: [PATCH 153/211] Add content cache to helm env

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 pkg/cli/environment.go               | 1 +
 pkg/cmd/testdata/output/env-comp.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go
index 19563cba3..106d24336 100644
--- a/pkg/cli/environment.go
+++ b/pkg/cli/environment.go
@@ -249,6 +249,7 @@ func (s *EnvSettings) EnvVars() map[string]string {
 		"HELM_PLUGINS":           s.PluginsDirectory,
 		"HELM_REGISTRY_CONFIG":   s.RegistryConfig,
 		"HELM_REPOSITORY_CACHE":  s.RepositoryCache,
+		"HELM_CONTENT_CACHE":     s.ContentCache,
 		"HELM_REPOSITORY_CONFIG": s.RepositoryConfig,
 		"HELM_NAMESPACE":         s.Namespace(),
 		"HELM_MAX_HISTORY":       strconv.Itoa(s.MaxHistory),
diff --git a/pkg/cmd/testdata/output/env-comp.txt b/pkg/cmd/testdata/output/env-comp.txt
index 8f9c53fc7..9d38ee464 100644
--- a/pkg/cmd/testdata/output/env-comp.txt
+++ b/pkg/cmd/testdata/output/env-comp.txt
@@ -2,6 +2,7 @@ HELM_BIN
 HELM_BURST_LIMIT
 HELM_CACHE_HOME
 HELM_CONFIG_HOME
+HELM_CONTENT_CACHE
 HELM_DATA_HOME
 HELM_DEBUG
 HELM_KUBEAPISERVER

From 7d22bb25faea807a4d2162e1a5c7f61ea3877f8b Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Thu, 21 Aug 2025 03:18:32 -0400
Subject: [PATCH 154/211] Plugin OCI installer

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/oci_installer.go    | 229 +++++
 .../plugin/installer/oci_installer_test.go    | 814 ++++++++++++++++++
 pkg/cmd/plugin_install.go                     |  40 +-
 pkg/cmd/plugin_uninstall.go                   |  31 +
 pkg/cmd/plugin_uninstall_test.go              | 146 ++++
 pkg/getter/getter.go                          |   8 +
 pkg/getter/ocigetter.go                       |  29 +
 pkg/getter/plugingetter_test.go               |   3 +-
 pkg/registry/client.go                        | 144 ++--
 pkg/registry/generic.go                       | 162 ++++
 pkg/registry/plugin.go                        | 176 ++++
 11 files changed, 1705 insertions(+), 77 deletions(-)
 create mode 100644 internal/plugin/installer/oci_installer.go
 create mode 100644 internal/plugin/installer/oci_installer_test.go
 create mode 100644 pkg/cmd/plugin_uninstall_test.go
 create mode 100644 pkg/registry/generic.go
 create mode 100644 pkg/registry/plugin.go

diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go
new file mode 100644
index 000000000..acb28ccf9
--- /dev/null
+++ b/internal/plugin/installer/oci_installer.go
@@ -0,0 +1,229 @@
+/*
+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 installer
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"helm.sh/helm/v4/internal/plugin/cache"
+	"helm.sh/helm/v4/internal/third_party/dep/fs"
+	"helm.sh/helm/v4/pkg/cli"
+	"helm.sh/helm/v4/pkg/getter"
+	"helm.sh/helm/v4/pkg/helmpath"
+	"helm.sh/helm/v4/pkg/registry"
+)
+
+// OCIInstaller installs plugins from OCI registries
+type OCIInstaller struct {
+	CacheDir   string
+	PluginName string
+	base
+	settings *cli.EnvSettings
+	getter   getter.Getter
+}
+
+// NewOCIInstaller creates a new OCIInstaller with optional getter options
+func NewOCIInstaller(source string, options ...getter.Option) (*OCIInstaller, error) {
+	ref := strings.TrimPrefix(source, fmt.Sprintf("%s://", registry.OCIScheme))
+
+	// Extract plugin name from OCI reference
+	// e.g., "ghcr.io/user/plugin-name:v1.0.0" -> "plugin-name"
+	parts := strings.Split(ref, "/")
+	if len(parts) < 2 {
+		return nil, fmt.Errorf("invalid OCI reference: %s", source)
+	}
+	lastPart := parts[len(parts)-1]
+	pluginName := lastPart
+	if idx := strings.LastIndex(lastPart, ":"); idx > 0 {
+		pluginName = lastPart[:idx]
+	}
+	if idx := strings.LastIndex(lastPart, "@"); idx > 0 {
+		pluginName = lastPart[:idx]
+	}
+
+	key, err := cache.Key(source)
+	if err != nil {
+		return nil, err
+	}
+
+	settings := cli.New()
+
+	// Always add plugin artifact type and any provided options
+	pluginOptions := append([]getter.Option{getter.WithArtifactType("plugin")}, options...)
+	getterProvider, err := getter.NewOCIGetter(pluginOptions...)
+	if err != nil {
+		return nil, err
+	}
+
+	i := &OCIInstaller{
+		CacheDir:   helmpath.CachePath("plugins", key),
+		PluginName: pluginName,
+		base:       newBase(source),
+		settings:   settings,
+		getter:     getterProvider,
+	}
+	return i, nil
+}
+
+// Install downloads and installs a plugin from OCI registry
+// Implements Installer.
+func (i *OCIInstaller) Install() error {
+	slog.Debug("pulling OCI plugin", "source", i.Source)
+
+	// Use getter to download the plugin
+	pluginData, err := i.getter.Get(i.Source)
+	if err != nil {
+		return fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+	}
+
+	// Create cache directory
+	if err := os.MkdirAll(i.CacheDir, 0755); err != nil {
+		return fmt.Errorf("failed to create cache directory: %w", err)
+	}
+
+	// Check if this is a gzip compressed file
+	pluginBytes := pluginData.Bytes()
+	if len(pluginBytes) < 2 || pluginBytes[0] != 0x1f || pluginBytes[1] != 0x8b {
+		return fmt.Errorf("plugin data is not a gzip compressed archive")
+	}
+
+	// Extract as gzipped tar
+	if err := extractTarGz(bytes.NewReader(pluginBytes), i.CacheDir); err != nil {
+		return fmt.Errorf("failed to extract plugin: %w", err)
+	}
+
+	// Verify plugin.yaml exists - check root and subdirectories
+	pluginDir := i.CacheDir
+	if !isPlugin(pluginDir) {
+		// Check if plugin.yaml is in a subdirectory
+		entries, err := os.ReadDir(i.CacheDir)
+		if err != nil {
+			return err
+		}
+
+		foundPluginDir := ""
+		for _, entry := range entries {
+			if entry.IsDir() {
+				subDir := filepath.Join(i.CacheDir, entry.Name())
+				if isPlugin(subDir) {
+					foundPluginDir = subDir
+					break
+				}
+			}
+		}
+
+		if foundPluginDir == "" {
+			return ErrMissingMetadata
+		}
+
+		// Use the subdirectory as the plugin directory
+		pluginDir = foundPluginDir
+	}
+
+	// Copy from cache to final destination
+	src, err := filepath.Abs(pluginDir)
+	if err != nil {
+		return err
+	}
+
+	slog.Debug("copying", "source", src, "path", i.Path())
+	return fs.CopyDir(src, i.Path())
+}
+
+// Update updates a plugin by reinstalling it
+func (i *OCIInstaller) Update() error {
+	// For OCI, update means removing the old version and installing the new one
+	if err := os.RemoveAll(i.Path()); err != nil {
+		return err
+	}
+	return i.Install()
+}
+
+// Path is where the plugin will be installed
+func (i OCIInstaller) Path() string {
+	if i.Source == "" {
+		return ""
+	}
+	return filepath.Join(i.settings.PluginsDirectory, i.PluginName)
+}
+
+// extractTarGz extracts a gzipped tar archive to a directory
+func extractTarGz(r io.Reader, targetDir string) error {
+	gzr, err := gzip.NewReader(r)
+	if err != nil {
+		return err
+	}
+	defer gzr.Close()
+
+	return extractTar(gzr, targetDir)
+}
+
+// extractTar extracts a tar archive to a directory
+func extractTar(r io.Reader, targetDir string) error {
+	tarReader := tar.NewReader(r)
+
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+
+		path, err := cleanJoin(targetDir, header.Name)
+		if err != nil {
+			return err
+		}
+
+		switch header.Typeflag {
+		case tar.TypeDir:
+			if err := os.MkdirAll(path, 0755); err != nil {
+				return err
+			}
+		case tar.TypeReg:
+			dir := filepath.Dir(path)
+			if err := os.MkdirAll(dir, 0755); err != nil {
+				return err
+			}
+
+			outFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
+			if err != nil {
+				return err
+			}
+			if _, err := io.Copy(outFile, tarReader); err != nil {
+				outFile.Close()
+				return err
+			}
+			outFile.Close()
+		case tar.TypeXGlobalHeader, tar.TypeXHeader:
+			// Skip these
+			continue
+		default:
+			return fmt.Errorf("unknown type: %b in %s", header.Typeflag, header.Name)
+		}
+	}
+
+	return nil
+}
diff --git a/internal/plugin/installer/oci_installer_test.go b/internal/plugin/installer/oci_installer_test.go
new file mode 100644
index 000000000..1ed10ff8e
--- /dev/null
+++ b/internal/plugin/installer/oci_installer_test.go
@@ -0,0 +1,814 @@
+/*
+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 installer // import "helm.sh/helm/v4/internal/plugin/installer"
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"crypto/sha256"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/opencontainers/go-digest"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+
+	"helm.sh/helm/v4/pkg/cli"
+	"helm.sh/helm/v4/pkg/getter"
+	"helm.sh/helm/v4/pkg/helmpath"
+)
+
+var _ Installer = new(OCIInstaller)
+
+// createTestPluginTarGz creates a test plugin tar.gz with plugin.yaml
+func createTestPluginTarGz(t *testing.T, pluginName string) []byte {
+	t.Helper()
+
+	var buf bytes.Buffer
+	gzWriter := gzip.NewWriter(&buf)
+	tarWriter := tar.NewWriter(gzWriter)
+
+	// Add plugin.yaml
+	pluginYAML := fmt.Sprintf(`name: %s
+version: "1.0.0"
+description: "Test plugin for OCI installer"
+command: "$HELM_PLUGIN_DIR/bin/%s"
+`, pluginName, pluginName)
+	header := &tar.Header{
+		Name:     "plugin.yaml",
+		Mode:     0644,
+		Size:     int64(len(pluginYAML)),
+		Typeflag: tar.TypeReg,
+	}
+	if err := tarWriter.WriteHeader(header); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := tarWriter.Write([]byte(pluginYAML)); err != nil {
+		t.Fatal(err)
+	}
+
+	// Add bin directory
+	dirHeader := &tar.Header{
+		Name:     "bin/",
+		Mode:     0755,
+		Typeflag: tar.TypeDir,
+	}
+	if err := tarWriter.WriteHeader(dirHeader); err != nil {
+		t.Fatal(err)
+	}
+
+	// Add executable
+	execContent := fmt.Sprintf("#!/bin/sh\necho '%s test plugin'", pluginName)
+	execHeader := &tar.Header{
+		Name:     fmt.Sprintf("bin/%s", pluginName),
+		Mode:     0755,
+		Size:     int64(len(execContent)),
+		Typeflag: tar.TypeReg,
+	}
+	if err := tarWriter.WriteHeader(execHeader); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := tarWriter.Write([]byte(execContent)); err != nil {
+		t.Fatal(err)
+	}
+
+	tarWriter.Close()
+	gzWriter.Close()
+
+	return buf.Bytes()
+}
+
+// mockOCIRegistryWithArtifactType creates a mock OCI registry server using the new artifact type approach
+func mockOCIRegistryWithArtifactType(t *testing.T, pluginName string) (*httptest.Server, string) {
+	t.Helper()
+
+	pluginData := createTestPluginTarGz(t, pluginName)
+	layerDigest := fmt.Sprintf("sha256:%x", sha256Sum(pluginData))
+
+	// Create empty config data (as per OCI v1.1+ spec)
+	configData := []byte("{}")
+	configDigest := fmt.Sprintf("sha256:%x", sha256Sum(configData))
+
+	// Create manifest with artifact type
+	manifest := ocispec.Manifest{
+		MediaType:    ocispec.MediaTypeImageManifest,
+		ArtifactType: "application/vnd.helm.plugin.v1+json", // Using artifact type
+		Config: ocispec.Descriptor{
+			MediaType: "application/vnd.oci.empty.v1+json", // Empty config
+			Digest:    digest.Digest(configDigest),
+			Size:      int64(len(configData)),
+		},
+		Layers: []ocispec.Descriptor{
+			{
+				MediaType: "application/vnd.oci.image.layer.v1.tar",
+				Digest:    digest.Digest(layerDigest),
+				Size:      int64(len(pluginData)),
+				Annotations: map[string]string{
+					ocispec.AnnotationTitle: pluginName + ".tgz", // Layer named properly
+				},
+			},
+		},
+	}
+
+	manifestData, err := json.Marshal(manifest)
+	if err != nil {
+		t.Fatal(err)
+	}
+	manifestDigest := fmt.Sprintf("sha256:%x", sha256Sum(manifestData))
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch {
+		case r.Method == http.MethodGet && strings.Contains(r.URL.Path, "/v2/") && !strings.Contains(r.URL.Path, "/manifests/") && !strings.Contains(r.URL.Path, "/blobs/"):
+			// API version check
+			w.Header().Set("Docker-Distribution-API-Version", "registry/2.0")
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte("{}"))
+
+		case r.Method == http.MethodGet && strings.Contains(r.URL.Path, "/manifests/") && strings.Contains(r.URL.Path, pluginName):
+			// Return manifest
+			w.Header().Set("Content-Type", ocispec.MediaTypeImageManifest)
+			w.Header().Set("Docker-Content-Digest", manifestDigest)
+			w.WriteHeader(http.StatusOK)
+			w.Write(manifestData)
+
+		case r.Method == http.MethodGet && strings.Contains(r.URL.Path, "/blobs/"+layerDigest):
+			// Return layer data
+			w.Header().Set("Content-Type", "application/vnd.oci.image.layer.v1.tar")
+			w.WriteHeader(http.StatusOK)
+			w.Write(pluginData)
+
+		case r.Method == http.MethodGet && strings.Contains(r.URL.Path, "/blobs/"+configDigest):
+			// Return config data
+			w.Header().Set("Content-Type", "application/vnd.oci.empty.v1+json")
+			w.WriteHeader(http.StatusOK)
+			w.Write(configData)
+
+		default:
+			w.WriteHeader(http.StatusNotFound)
+		}
+	}))
+
+	// Parse server URL to get host:port format for OCI reference
+	serverURL, err := url.Parse(server.URL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	registryHost := serverURL.Host
+
+	return server, registryHost
+}
+
+// sha256Sum calculates SHA256 sum of data
+func sha256Sum(data []byte) []byte {
+	h := sha256.New()
+	h.Write(data)
+	return h.Sum(nil)
+}
+
+func TestNewOCIInstaller(t *testing.T) {
+	tests := []struct {
+		name        string
+		source      string
+		expectName  string
+		expectError bool
+	}{
+		{
+			name:        "valid OCI reference with tag",
+			source:      "oci://ghcr.io/user/plugin-name:v1.0.0",
+			expectName:  "plugin-name",
+			expectError: false,
+		},
+		{
+			name:        "valid OCI reference with digest",
+			source:      "oci://ghcr.io/user/plugin-name@sha256:1234567890abcdef",
+			expectName:  "plugin-name",
+			expectError: false,
+		},
+		{
+			name:        "valid OCI reference without tag",
+			source:      "oci://ghcr.io/user/plugin-name",
+			expectName:  "plugin-name",
+			expectError: false,
+		},
+		{
+			name:        "valid OCI reference with multiple path segments",
+			source:      "oci://registry.example.com/org/team/plugin-name:latest",
+			expectName:  "plugin-name",
+			expectError: false,
+		},
+		{
+			name:        "invalid OCI reference - no path",
+			source:      "oci://registry.example.com",
+			expectName:  "",
+			expectError: true,
+		},
+		{
+			name:        "valid OCI reference - single path segment",
+			source:      "oci://registry.example.com/plugin",
+			expectName:  "plugin",
+			expectError: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			installer, err := NewOCIInstaller(tt.source)
+
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("expected error but got none")
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+				return
+			}
+
+			// Check all fields thoroughly
+			if installer.PluginName != tt.expectName {
+				t.Errorf("expected plugin name %s, got %s", tt.expectName, installer.PluginName)
+			}
+
+			if installer.Source != tt.source {
+				t.Errorf("expected source %s, got %s", tt.source, installer.Source)
+			}
+
+			if installer.CacheDir == "" {
+				t.Error("expected non-empty cache directory")
+			}
+
+			if !strings.Contains(installer.CacheDir, "plugins") {
+				t.Errorf("expected cache directory to contain 'plugins', got %s", installer.CacheDir)
+			}
+
+			if installer.settings == nil {
+				t.Error("expected settings to be initialized")
+			}
+
+			// Check that Path() method works
+			expectedPath := helmpath.DataPath("plugins", tt.expectName)
+			if installer.Path() != expectedPath {
+				t.Errorf("expected path %s, got %s", expectedPath, installer.Path())
+			}
+		})
+	}
+}
+
+func TestOCIInstaller_Path(t *testing.T) {
+	tests := []struct {
+		name       string
+		source     string
+		pluginName string
+		expectPath string
+	}{
+		{
+			name:       "valid plugin name",
+			source:     "oci://ghcr.io/user/plugin-name:v1.0.0",
+			pluginName: "plugin-name",
+			expectPath: helmpath.DataPath("plugins", "plugin-name"),
+		},
+		{
+			name:       "empty source",
+			source:     "",
+			pluginName: "",
+			expectPath: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			installer := &OCIInstaller{
+				PluginName: tt.pluginName,
+				base:       newBase(tt.source),
+				settings:   cli.New(),
+			}
+
+			path := installer.Path()
+			if path != tt.expectPath {
+				t.Errorf("expected path %s, got %s", tt.expectPath, path)
+			}
+		})
+	}
+}
+
+func TestOCIInstaller_Install(t *testing.T) {
+	// Set up isolated test environment FIRST
+	testPluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", testPluginsDir)
+
+	pluginName := "test-plugin-basic"
+	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
+	defer server.Close()
+
+	// Test OCI reference
+	source := fmt.Sprintf("oci://%s/%s:latest", registryHost, pluginName)
+
+	// Test with plain HTTP (since test server uses HTTP)
+	installer, err := NewOCIInstaller(source, getter.WithPlainHTTP(true))
+	if err != nil {
+		t.Fatalf("Expected no error, got %v", err)
+	}
+
+	// The OCI installer uses helmpath.DataPath, which now points to our test directory
+	actualPath := installer.Path()
+	t.Logf("Installer will use path: %s", actualPath)
+
+	// Verify the path is actually in our test directory
+	if !strings.HasPrefix(actualPath, testPluginsDir) {
+		t.Fatalf("Expected path %s to be under test directory %s", actualPath, testPluginsDir)
+	}
+
+	// Install the plugin
+	if err := Install(installer); err != nil {
+		t.Fatalf("Expected installation to succeed, got error: %v", err)
+	}
+
+	// Verify plugin was installed to the correct location
+	if !isPlugin(actualPath) {
+		t.Errorf("Expected plugin directory %s to contain plugin.yaml", actualPath)
+	}
+
+	// Debug: list what was actually created
+	if entries, err := os.ReadDir(actualPath); err != nil {
+		t.Fatalf("Could not read plugin directory %s: %v", actualPath, err)
+	} else {
+		t.Logf("Plugin directory %s contains:", actualPath)
+		for _, entry := range entries {
+			t.Logf("  - %s", entry.Name())
+		}
+	}
+
+	// Verify the plugin.yaml file exists and is valid
+	pluginFile := filepath.Join(actualPath, "plugin.yaml")
+	if _, err := os.Stat(pluginFile); err != nil {
+		t.Errorf("Expected plugin.yaml to exist, got error: %v", err)
+	}
+}
+
+func TestOCIInstaller_Install_WithGetterOptions(t *testing.T) {
+	testCases := []struct {
+		name       string
+		pluginName string
+		options    []getter.Option
+		wantErr    bool
+	}{
+		{
+			name:       "plain HTTP",
+			pluginName: "example-cli-plain-http",
+			options:    []getter.Option{getter.WithPlainHTTP(true)},
+			wantErr:    false,
+		},
+		{
+			name:       "insecure skip TLS verify",
+			pluginName: "example-cli-insecure",
+			options:    []getter.Option{getter.WithPlainHTTP(true), getter.WithInsecureSkipVerifyTLS(true)},
+			wantErr:    false,
+		},
+		{
+			name:       "with timeout",
+			pluginName: "example-cli-timeout",
+			options:    []getter.Option{getter.WithPlainHTTP(true), getter.WithTimeout(30 * time.Second)},
+			wantErr:    false,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Set up isolated test environment for each subtest
+			testPluginsDir := t.TempDir()
+			t.Setenv("HELM_PLUGINS", testPluginsDir)
+
+			server, registryHost := mockOCIRegistryWithArtifactType(t, tc.pluginName)
+			defer server.Close()
+
+			source := fmt.Sprintf("oci://%s/%s:latest", registryHost, tc.pluginName)
+
+			installer, err := NewOCIInstaller(source, tc.options...)
+			if err != nil {
+				if !tc.wantErr {
+					t.Fatalf("Expected no error creating installer, got %v", err)
+				}
+				return
+			}
+
+			// The installer now uses our isolated test directory
+			actualPath := installer.Path()
+
+			// Install the plugin
+			err = Install(installer)
+			if tc.wantErr {
+				if err == nil {
+					t.Errorf("Expected installation to fail, but it succeeded")
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Expected installation to succeed, got error: %v", err)
+				} else {
+					// Verify plugin was installed to the actual path
+					if !isPlugin(actualPath) {
+						t.Errorf("Expected plugin directory %s to contain plugin.yaml", actualPath)
+					}
+				}
+			}
+		})
+	}
+}
+
+func TestOCIInstaller_Install_AlreadyExists(t *testing.T) {
+	// Set up isolated test environment
+	testPluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", testPluginsDir)
+
+	pluginName := "test-plugin-exists"
+	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
+	defer server.Close()
+
+	source := fmt.Sprintf("oci://%s/%s:latest", registryHost, pluginName)
+	installer, err := NewOCIInstaller(source, getter.WithPlainHTTP(true))
+	if err != nil {
+		t.Fatalf("Expected no error, got %v", err)
+	}
+
+	// First install should succeed
+	if err := Install(installer); err != nil {
+		t.Fatalf("Expected first installation to succeed, got error: %v", err)
+	}
+
+	// Verify plugin was installed
+	if !isPlugin(installer.Path()) {
+		t.Errorf("Expected plugin directory %s to contain plugin.yaml", installer.Path())
+	}
+
+	// Second install should fail with "plugin already exists"
+	err = Install(installer)
+	if err == nil {
+		t.Error("Expected error when installing plugin that already exists")
+	} else if !strings.Contains(err.Error(), "plugin already exists") {
+		t.Errorf("Expected 'plugin already exists' error, got: %v", err)
+	}
+}
+
+func TestOCIInstaller_Update(t *testing.T) {
+	// Set up isolated test environment
+	testPluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", testPluginsDir)
+
+	pluginName := "test-plugin-update"
+	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
+	defer server.Close()
+
+	source := fmt.Sprintf("oci://%s/%s:latest", registryHost, pluginName)
+	installer, err := NewOCIInstaller(source, getter.WithPlainHTTP(true))
+	if err != nil {
+		t.Fatalf("Expected no error, got %v", err)
+	}
+
+	// Test update when plugin does not exist - should fail
+	err = Update(installer)
+	if err == nil {
+		t.Error("Expected error when updating plugin that does not exist")
+	} else if !strings.Contains(err.Error(), "plugin does not exist") {
+		t.Errorf("Expected 'plugin does not exist' error, got: %v", err)
+	}
+
+	// Install plugin first
+	if err := Install(installer); err != nil {
+		t.Fatalf("Expected installation to succeed, got error: %v", err)
+	}
+
+	// Verify plugin was installed
+	if !isPlugin(installer.Path()) {
+		t.Errorf("Expected plugin directory %s to contain plugin.yaml", installer.Path())
+	}
+
+	// Test update when plugin exists - should succeed
+	// For OCI, Update() removes old version and reinstalls
+	if err := Update(installer); err != nil {
+		t.Errorf("Expected update to succeed, got error: %v", err)
+	}
+
+	// Verify plugin is still installed after update
+	if !isPlugin(installer.Path()) {
+		t.Errorf("Expected plugin directory %s to contain plugin.yaml after update", installer.Path())
+	}
+}
+
+func TestOCIInstaller_Install_ComponentExtraction(t *testing.T) {
+	// Test that we can extract a plugin archive properly
+	// This tests the extraction logic that Install() uses
+	tempDir := t.TempDir()
+	pluginName := "test-plugin-extract"
+
+	pluginData := createTestPluginTarGz(t, pluginName)
+
+	// Test extraction
+	err := extractTarGz(bytes.NewReader(pluginData), tempDir)
+	if err != nil {
+		t.Fatalf("Failed to extract plugin: %v", err)
+	}
+
+	// Verify plugin.yaml exists
+	pluginYAMLPath := filepath.Join(tempDir, "plugin.yaml")
+	if _, err := os.Stat(pluginYAMLPath); os.IsNotExist(err) {
+		t.Errorf("plugin.yaml not found after extraction")
+	}
+
+	// Verify bin directory exists
+	binPath := filepath.Join(tempDir, "bin")
+	if _, err := os.Stat(binPath); os.IsNotExist(err) {
+		t.Errorf("bin directory not found after extraction")
+	}
+
+	// Verify executable exists and has correct permissions
+	execPath := filepath.Join(tempDir, "bin", pluginName)
+	if info, err := os.Stat(execPath); err != nil {
+		t.Errorf("executable not found: %v", err)
+	} else if info.Mode()&0111 == 0 {
+		t.Errorf("file is not executable")
+	}
+
+	// Verify this would be recognized as a plugin
+	if !isPlugin(tempDir) {
+		t.Errorf("extracted directory is not a valid plugin")
+	}
+}
+
+func TestExtractTarGz(t *testing.T) {
+	tempDir := t.TempDir()
+
+	// Create a test tar.gz file
+	var buf bytes.Buffer
+	gzWriter := gzip.NewWriter(&buf)
+	tarWriter := tar.NewWriter(gzWriter)
+
+	// Add a test file to the archive
+	testContent := "test content"
+	header := &tar.Header{
+		Name:     "test-file.txt",
+		Mode:     0644,
+		Size:     int64(len(testContent)),
+		Typeflag: tar.TypeReg,
+	}
+
+	if err := tarWriter.WriteHeader(header); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := tarWriter.Write([]byte(testContent)); err != nil {
+		t.Fatal(err)
+	}
+
+	// Add a test directory
+	dirHeader := &tar.Header{
+		Name:     "test-dir/",
+		Mode:     0755,
+		Typeflag: tar.TypeDir,
+	}
+
+	if err := tarWriter.WriteHeader(dirHeader); err != nil {
+		t.Fatal(err)
+	}
+
+	tarWriter.Close()
+	gzWriter.Close()
+
+	// Test extraction
+	err := extractTarGz(bytes.NewReader(buf.Bytes()), tempDir)
+	if err != nil {
+		t.Errorf("extractTarGz failed: %v", err)
+	}
+
+	// Verify extracted file
+	extractedFile := filepath.Join(tempDir, "test-file.txt")
+	content, err := os.ReadFile(extractedFile)
+	if err != nil {
+		t.Errorf("failed to read extracted file: %v", err)
+	}
+
+	if string(content) != testContent {
+		t.Errorf("expected content %s, got %s", testContent, string(content))
+	}
+
+	// Verify extracted directory
+	extractedDir := filepath.Join(tempDir, "test-dir")
+	if _, err := os.Stat(extractedDir); os.IsNotExist(err) {
+		t.Errorf("extracted directory does not exist: %s", extractedDir)
+	}
+}
+
+func TestExtractTarGz_InvalidGzip(t *testing.T) {
+	tempDir := t.TempDir()
+
+	// Test with invalid gzip data
+	invalidGzipData := []byte("not gzip data")
+	err := extractTarGz(bytes.NewReader(invalidGzipData), tempDir)
+	if err == nil {
+		t.Error("expected error for invalid gzip data")
+	}
+}
+
+func TestExtractTar_UnknownFileType(t *testing.T) {
+	tempDir := t.TempDir()
+
+	// Create a test tar file
+	var buf bytes.Buffer
+	tarWriter := tar.NewWriter(&buf)
+
+	// Add a test file
+	testContent := "test content"
+	header := &tar.Header{
+		Name:     "test-file.txt",
+		Mode:     0644,
+		Size:     int64(len(testContent)),
+		Typeflag: tar.TypeReg,
+	}
+
+	if err := tarWriter.WriteHeader(header); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := tarWriter.Write([]byte(testContent)); err != nil {
+		t.Fatal(err)
+	}
+
+	// Test unknown file type
+	unknownHeader := &tar.Header{
+		Name:     "unknown-type",
+		Mode:     0644,
+		Typeflag: tar.TypeSymlink, // Use a type that's not handled
+	}
+
+	if err := tarWriter.WriteHeader(unknownHeader); err != nil {
+		t.Fatal(err)
+	}
+
+	tarWriter.Close()
+
+	// Test extraction - should fail due to unknown type
+	err := extractTar(bytes.NewReader(buf.Bytes()), tempDir)
+	if err == nil {
+		t.Error("expected error for unknown tar file type")
+	}
+
+	if !strings.Contains(err.Error(), "unknown type") {
+		t.Errorf("expected 'unknown type' error, got: %v", err)
+	}
+}
+
+func TestExtractTar_SuccessfulExtraction(t *testing.T) {
+	tempDir := t.TempDir()
+
+	// Since we can't easily create extended headers with Go's tar package,
+	// we'll test the logic that skips them by creating a simple tar with regular files
+	// and then testing that the extraction works correctly.
+
+	// Create a test tar file
+	var buf bytes.Buffer
+	tarWriter := tar.NewWriter(&buf)
+
+	// Add a regular file
+	testContent := "test content"
+	header := &tar.Header{
+		Name:     "test-file.txt",
+		Mode:     0644,
+		Size:     int64(len(testContent)),
+		Typeflag: tar.TypeReg,
+	}
+
+	if err := tarWriter.WriteHeader(header); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := tarWriter.Write([]byte(testContent)); err != nil {
+		t.Fatal(err)
+	}
+
+	tarWriter.Close()
+
+	// Test extraction
+	err := extractTar(bytes.NewReader(buf.Bytes()), tempDir)
+	if err != nil {
+		t.Errorf("extractTar failed: %v", err)
+	}
+
+	// Verify the regular file was extracted
+	extractedFile := filepath.Join(tempDir, "test-file.txt")
+	content, err := os.ReadFile(extractedFile)
+	if err != nil {
+		t.Errorf("failed to read extracted file: %v", err)
+	}
+
+	if string(content) != testContent {
+		t.Errorf("expected content %s, got %s", testContent, string(content))
+	}
+}
+
+func TestOCIInstaller_Install_PlainHTTPOption(t *testing.T) {
+	// Test that PlainHTTP option is properly passed to getter
+	source := "oci://example.com/test-plugin:v1.0.0"
+
+	// Test with PlainHTTP=false (default)
+	installer1, err := NewOCIInstaller(source)
+	if err != nil {
+		t.Fatalf("failed to create installer: %v", err)
+	}
+	if installer1.getter == nil {
+		t.Error("getter should be initialized")
+	}
+
+	// Test with PlainHTTP=true
+	installer2, err := NewOCIInstaller(source, getter.WithPlainHTTP(true))
+	if err != nil {
+		t.Fatalf("failed to create installer with PlainHTTP=true: %v", err)
+	}
+	if installer2.getter == nil {
+		t.Error("getter should be initialized with PlainHTTP=true")
+	}
+
+	// Both installers should have the same basic properties
+	if installer1.PluginName != installer2.PluginName {
+		t.Error("plugin names should match")
+	}
+	if installer1.Source != installer2.Source {
+		t.Error("sources should match")
+	}
+
+	// Test with multiple options
+	installer3, err := NewOCIInstaller(source,
+		getter.WithPlainHTTP(true),
+		getter.WithBasicAuth("user", "pass"),
+	)
+	if err != nil {
+		t.Fatalf("failed to create installer with multiple options: %v", err)
+	}
+	if installer3.getter == nil {
+		t.Error("getter should be initialized with multiple options")
+	}
+}
+
+func TestOCIInstaller_Install_ValidationErrors(t *testing.T) {
+	tests := []struct {
+		name        string
+		layerData   []byte
+		expectError bool
+		errorMsg    string
+	}{
+		{
+			name:        "non-gzip layer",
+			layerData:   []byte("not gzip data"),
+			expectError: true,
+			errorMsg:    "is not a gzip compressed archive",
+		},
+		{
+			name:        "empty layer",
+			layerData:   []byte{},
+			expectError: true,
+			errorMsg:    "is not a gzip compressed archive",
+		},
+		{
+			name:        "single byte layer",
+			layerData:   []byte{0x1f},
+			expectError: true,
+			errorMsg:    "is not a gzip compressed archive",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Test the gzip validation logic that's used in the Install method
+			if len(tt.layerData) < 2 || tt.layerData[0] != 0x1f || tt.layerData[1] != 0x8b {
+				// This matches the validation in the Install method
+				if !tt.expectError {
+					t.Error("expected valid gzip data")
+				}
+				if !strings.Contains(tt.errorMsg, "is not a gzip compressed archive") {
+					t.Errorf("expected error message to contain 'is not a gzip compressed archive'")
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/cmd/plugin_install.go b/pkg/cmd/plugin_install.go
index 7dae39505..960404a76 100644
--- a/pkg/cmd/plugin_install.go
+++ b/pkg/cmd/plugin_install.go
@@ -19,17 +19,28 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"strings"
 
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/internal/plugin/installer"
 	"helm.sh/helm/v4/pkg/cmd/require"
+	"helm.sh/helm/v4/pkg/getter"
+	"helm.sh/helm/v4/pkg/registry"
 )
 
 type pluginInstallOptions struct {
 	source  string
 	version string
+	// OCI-specific options
+	certFile              string
+	keyFile               string
+	caFile                string
+	insecureSkipTLSverify bool
+	plainHTTP             bool
+	password              string
+	username              string
 }
 
 const pluginInstallDesc = `
@@ -60,6 +71,15 @@ func newPluginInstallCmd(out io.Writer) *cobra.Command {
 		},
 	}
 	cmd.Flags().StringVar(&o.version, "version", "", "specify a version constraint. If this is not specified, the latest version is installed")
+
+	// Add OCI-specific flags
+	cmd.Flags().StringVar(&o.certFile, "cert-file", "", "identify registry client using this SSL certificate file")
+	cmd.Flags().StringVar(&o.keyFile, "key-file", "", "identify registry client using this SSL key file")
+	cmd.Flags().StringVar(&o.caFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
+	cmd.Flags().BoolVar(&o.insecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the plugin download")
+	cmd.Flags().BoolVar(&o.plainHTTP, "plain-http", false, "use insecure HTTP connections for the plugin download")
+	cmd.Flags().StringVar(&o.username, "username", "", "registry username")
+	cmd.Flags().StringVar(&o.password, "password", "", "registry password")
 	return cmd
 }
 
@@ -68,10 +88,28 @@ func (o *pluginInstallOptions) complete(args []string) error {
 	return nil
 }
 
+func (o *pluginInstallOptions) newInstallerForSource() (installer.Installer, error) {
+	// Check if source is an OCI registry reference
+	if strings.HasPrefix(o.source, fmt.Sprintf("%s://", registry.OCIScheme)) {
+		// Build getter options for OCI
+		options := []getter.Option{
+			getter.WithTLSClientConfig(o.certFile, o.keyFile, o.caFile),
+			getter.WithInsecureSkipVerifyTLS(o.insecureSkipTLSverify),
+			getter.WithPlainHTTP(o.plainHTTP),
+			getter.WithBasicAuth(o.username, o.password),
+		}
+
+		return installer.NewOCIInstaller(o.source, options...)
+	}
+
+	// For non-OCI sources, use the original logic
+	return installer.NewForSource(o.source, o.version)
+}
+
 func (o *pluginInstallOptions) run(out io.Writer) error {
 	installer.Debug = settings.Debug
 
-	i, err := installer.NewForSource(o.source, o.version)
+	i, err := o.newInstallerForSource()
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/plugin_uninstall.go b/pkg/cmd/plugin_uninstall.go
index a925c66dd..85eb46219 100644
--- a/pkg/cmd/plugin_uninstall.go
+++ b/pkg/cmd/plugin_uninstall.go
@@ -21,6 +21,7 @@ import (
 	"io"
 	"log/slog"
 	"os"
+	"path/filepath"
 
 	"github.com/spf13/cobra"
 
@@ -87,6 +88,36 @@ func uninstallPlugin(p plugin.Plugin) error {
 	if err := os.RemoveAll(p.Dir()); err != nil {
 		return err
 	}
+
+	// Clean up versioned tarball and provenance files from HELM_PLUGINS directory
+	// These files are saved with pattern: PLUGIN_NAME-VERSION.tgz and PLUGIN_NAME-VERSION.tgz.prov
+	pluginName := p.Metadata().Name
+	pluginVersion := p.Metadata().Version
+	pluginsDir := settings.PluginsDirectory
+
+	// Remove versioned files: plugin-name-version.tgz and plugin-name-version.tgz.prov
+	if pluginVersion != "" {
+		versionedBasename := fmt.Sprintf("%s-%s.tgz", pluginName, pluginVersion)
+
+		// Remove tarball file
+		tarballPath := filepath.Join(pluginsDir, versionedBasename)
+		if _, err := os.Stat(tarballPath); err == nil {
+			slog.Debug("removing versioned tarball", "path", tarballPath)
+			if err := os.Remove(tarballPath); err != nil {
+				slog.Debug("failed to remove tarball file", "path", tarballPath, "error", err)
+			}
+		}
+
+		// Remove provenance file
+		provPath := filepath.Join(pluginsDir, versionedBasename+".prov")
+		if _, err := os.Stat(provPath); err == nil {
+			slog.Debug("removing versioned provenance", "path", provPath)
+			if err := os.Remove(provPath); err != nil {
+				slog.Debug("failed to remove provenance file", "path", provPath, "error", err)
+			}
+		}
+	}
+
 	return runHook(p, plugin.Delete)
 }
 
diff --git a/pkg/cmd/plugin_uninstall_test.go b/pkg/cmd/plugin_uninstall_test.go
new file mode 100644
index 000000000..93d4dc8a8
--- /dev/null
+++ b/pkg/cmd/plugin_uninstall_test.go
@@ -0,0 +1,146 @@
+/*
+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 cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/test/ensure"
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+func TestPluginUninstallCleansUpVersionedFiles(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a fake plugin directory structure in a temp directory
+	pluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", pluginsDir)
+
+	// Create a new settings instance that will pick up the environment variable
+	testSettings := cli.New()
+	pluginName := "test-plugin"
+
+	// Create plugin directory
+	pluginDir := filepath.Join(pluginsDir, pluginName)
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create plugin.yaml
+	pluginYAML := `name: test-plugin
+version: 1.2.3
+description: Test plugin
+command: $HELM_PLUGIN_DIR/test-plugin
+`
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(pluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create versioned tarball and provenance files
+	tarballFile := filepath.Join(pluginsDir, "test-plugin-1.2.3.tgz")
+	provFile := filepath.Join(pluginsDir, "test-plugin-1.2.3.tgz.prov")
+	otherVersionTarball := filepath.Join(pluginsDir, "test-plugin-2.0.0.tgz")
+
+	if err := os.WriteFile(tarballFile, []byte("fake tarball"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(provFile, []byte("fake provenance"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	// Create another version that should NOT be removed
+	if err := os.WriteFile(otherVersionTarball, []byte("other version"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Load the plugin
+	p, err := plugin.LoadDir(pluginDir)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a test uninstall function that uses our test settings
+	testUninstallPlugin := func(plugin plugin.Plugin) error {
+		if err := os.RemoveAll(plugin.Dir()); err != nil {
+			return err
+		}
+
+		// Clean up versioned tarball and provenance files from test HELM_PLUGINS directory
+		pluginName := plugin.Metadata().Name
+		pluginVersion := plugin.Metadata().Version
+		testPluginsDir := testSettings.PluginsDirectory
+
+		// Remove versioned files: plugin-name-version.tgz and plugin-name-version.tgz.prov
+		if pluginVersion != "" {
+			versionedBasename := fmt.Sprintf("%s-%s.tgz", pluginName, pluginVersion)
+
+			// Remove tarball file
+			tarballPath := filepath.Join(testPluginsDir, versionedBasename)
+			if _, err := os.Stat(tarballPath); err == nil {
+				if err := os.Remove(tarballPath); err != nil {
+					t.Logf("failed to remove tarball file: %v", err)
+				}
+			}
+
+			// Remove provenance file
+			provPath := filepath.Join(testPluginsDir, versionedBasename+".prov")
+			if _, err := os.Stat(provPath); err == nil {
+				if err := os.Remove(provPath); err != nil {
+					t.Logf("failed to remove provenance file: %v", err)
+				}
+			}
+		}
+
+		// Skip runHook in test
+		return nil
+	}
+
+	// Verify files exist before uninstall
+	if _, err := os.Stat(tarballFile); os.IsNotExist(err) {
+		t.Fatal("tarball file should exist before uninstall")
+	}
+	if _, err := os.Stat(provFile); os.IsNotExist(err) {
+		t.Fatal("provenance file should exist before uninstall")
+	}
+	if _, err := os.Stat(otherVersionTarball); os.IsNotExist(err) {
+		t.Fatal("other version tarball should exist before uninstall")
+	}
+
+	// Uninstall the plugin
+	if err := testUninstallPlugin(p); err != nil {
+		t.Fatal(err)
+	}
+
+	// Verify plugin directory is removed
+	if _, err := os.Stat(pluginDir); !os.IsNotExist(err) {
+		t.Error("plugin directory should be removed")
+	}
+
+	// Verify only exact version files are removed
+	if _, err := os.Stat(tarballFile); !os.IsNotExist(err) {
+		t.Error("versioned tarball file should be removed")
+	}
+	if _, err := os.Stat(provFile); !os.IsNotExist(err) {
+		t.Error("versioned provenance file should be removed")
+	}
+	// Verify other version files are NOT removed
+	if _, err := os.Stat(otherVersionTarball); os.IsNotExist(err) {
+		t.Error("other version tarball should NOT be removed")
+	}
+}
diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go
index 8585ac449..a2d0f0ee2 100644
--- a/pkg/getter/getter.go
+++ b/pkg/getter/getter.go
@@ -48,6 +48,7 @@ type getterOptions struct {
 	registryClient        *registry.Client
 	timeout               time.Duration
 	transport             *http.Transport
+	artifactType          string
 }
 
 // Option allows specifying various settings configurable by the user for overriding the defaults
@@ -144,6 +145,13 @@ func WithTransport(transport *http.Transport) Option {
 	}
 }
 
+// WithArtifactType sets the type of OCI artifact ("chart" or "plugin")
+func WithArtifactType(artifactType string) Option {
+	return func(opts *getterOptions) {
+		opts.artifactType = artifactType
+	}
+}
+
 // Getter is an interface to support GET to the specified URL.
 type Getter interface {
 	// Get file content by url string
diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go
index 45e7263fe..121e000c8 100644
--- a/pkg/getter/ocigetter.go
+++ b/pkg/getter/ocigetter.go
@@ -63,6 +63,10 @@ func (g *OCIGetter) get(href string) (*bytes.Buffer, error) {
 	if version := g.opts.version; version != "" && !strings.Contains(path.Base(ref), ":") {
 		ref = fmt.Sprintf("%s:%s", ref, version)
 	}
+	// Check if this is a plugin request
+	if g.opts.artifactType == "plugin" {
+		return g.getPlugin(client, ref)
+	}
 
 	// Default to chart behavior for backward compatibility
 	var pullOpts []registry.PullOption
@@ -168,3 +172,28 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
 
 	return client, nil
 }
+
+// getPlugin handles plugin-specific OCI pulls
+func (g *OCIGetter) getPlugin(client *registry.Client, ref string) (*bytes.Buffer, error) {
+	// Extract plugin name from the reference
+	// e.g., "ghcr.io/user/plugin-name:v1.0.0" -> "plugin-name"
+	parts := strings.Split(ref, "/")
+	if len(parts) < 2 {
+		return nil, fmt.Errorf("invalid OCI reference: %s", ref)
+	}
+	lastPart := parts[len(parts)-1]
+	pluginName := lastPart
+	if idx := strings.LastIndex(lastPart, ":"); idx > 0 {
+		pluginName = lastPart[:idx]
+	}
+	if idx := strings.LastIndex(lastPart, "@"); idx > 0 {
+		pluginName = lastPart[:idx]
+	}
+
+	result, err := client.PullPlugin(ref, pluginName)
+	if err != nil {
+		return nil, err
+	}
+
+	return bytes.NewBuffer(result.PluginData), nil
+}
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index 85c847752..1c0f5593f 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -110,8 +110,7 @@ func (t *TestPlugin) Metadata() plugin.Metadata {
 		Type:       "cli/v1",
 		APIVersion: "v1",
 		Runtime:    "subprocess",
-		// TODO: either change Config to plugin.ConfigCLI, or change APIVersion to getter/v1?
-		Config: &plugin.ConfigGetter{},
+		Config:     &plugin.ConfigCLI{},
 		RuntimeConfig: &plugin.RuntimeConfigSubprocess{
 			PlatformCommands: []plugin.PlatformCommand{
 				{
diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 169900750..7ba26ac5c 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -29,13 +29,11 @@ import (
 	"os"
 	"sort"
 	"strings"
-	"sync"
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2"
-	"oras.land/oras-go/v2/content"
 	"oras.land/oras-go/v2/content/memory"
 	"oras.land/oras-go/v2/registry"
 	"oras.land/oras-go/v2/registry/remote"
@@ -147,6 +145,11 @@ func NewClient(options ...ClientOption) (*Client, error) {
 	return client, nil
 }
 
+// Generic returns a GenericClient for low-level OCI operations
+func (c *Client) Generic() *GenericClient {
+	return NewGenericClient(c)
+}
+
 // ClientOptDebug returns a function that sets the debug setting on client options set
 func ClientOptDebug(debug bool) ClientOption {
 	return func(client *Client) {
@@ -418,84 +421,31 @@ type (
 	}
 )
 
-// Pull downloads a chart from a registry
-func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
-	parsedRef, err := newReference(ref)
-	if err != nil {
-		return nil, err
-	}
+// processChartPull handles chart-specific processing of a generic pull result
+func (c *Client) processChartPull(genericResult *GenericPullResult, operation *pullOperation) (*PullResult, error) {
+	var err error
 
-	operation := &pullOperation{
-		withChart: true, // By default, always download the chart layer
-	}
-	for _, option := range options {
-		option(operation)
-	}
-	if !operation.withChart && !operation.withProv {
-		return nil, errors.New(
-			"must specify at least one layer to pull (chart/prov)")
-	}
-	memoryStore := memory.New()
-	allowedMediaTypes := []string{
-		ocispec.MediaTypeImageManifest,
-		ConfigMediaType,
-	}
+	// Chart-specific validation
 	minNumDescriptors := 1 // 1 for the config
 	if operation.withChart {
 		minNumDescriptors++
-		allowedMediaTypes = append(allowedMediaTypes, ChartLayerMediaType, LegacyChartLayerMediaType)
 	}
-	if operation.withProv {
-		if !operation.ignoreMissingProv {
-			minNumDescriptors++
-		}
-		allowedMediaTypes = append(allowedMediaTypes, ProvLayerMediaType)
-	}
-
-	var descriptors, layers []ocispec.Descriptor
-
-	repository, err := remote.NewRepository(parsedRef.String())
-	if err != nil {
-		return nil, err
-	}
-	repository.PlainHTTP = c.plainHTTP
-	repository.Client = c.authorizer
-
-	ctx := context.Background()
-
-	sort.Strings(allowedMediaTypes)
-
-	var mu sync.Mutex
-	manifest, err := oras.Copy(ctx, repository, parsedRef.String(), memoryStore, "", oras.CopyOptions{
-		CopyGraphOptions: oras.CopyGraphOptions{
-			PreCopy: func(_ context.Context, desc ocispec.Descriptor) error {
-				mediaType := desc.MediaType
-				if i := sort.SearchStrings(allowedMediaTypes, mediaType); i >= len(allowedMediaTypes) || allowedMediaTypes[i] != mediaType {
-					return oras.SkipNode
-				}
-
-				mu.Lock()
-				layers = append(layers, desc)
-				mu.Unlock()
-				return nil
-			},
-		},
-	})
-	if err != nil {
-		return nil, err
+	if operation.withProv && !operation.ignoreMissingProv {
+		minNumDescriptors++
 	}
 
-	descriptors = append(descriptors, layers...)
-
-	numDescriptors := len(descriptors)
+	numDescriptors := len(genericResult.Descriptors)
 	if numDescriptors < minNumDescriptors {
 		return nil, fmt.Errorf("manifest does not contain minimum number of descriptors (%d), descriptors found: %d",
 			minNumDescriptors, numDescriptors)
 	}
+
+	// Find chart-specific descriptors
 	var configDescriptor *ocispec.Descriptor
 	var chartDescriptor *ocispec.Descriptor
 	var provDescriptor *ocispec.Descriptor
-	for _, descriptor := range descriptors {
+
+	for _, descriptor := range genericResult.Descriptors {
 		d := descriptor
 		switch d.MediaType {
 		case ConfigMediaType:
@@ -509,6 +459,8 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 			fmt.Fprintf(c.out, "Warning: chart media type %s is deprecated\n", LegacyChartLayerMediaType)
 		}
 	}
+
+	// Chart-specific validation
 	if configDescriptor == nil {
 		return nil, fmt.Errorf("could not load config with mediatype %s", ConfigMediaType)
 	}
@@ -516,6 +468,7 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 		return nil, fmt.Errorf("manifest does not contain a layer with mediatype %s",
 			ChartLayerMediaType)
 	}
+
 	var provMissing bool
 	if operation.withProv && provDescriptor == nil {
 		if operation.ignoreMissingProv {
@@ -525,10 +478,12 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 				ProvLayerMediaType)
 		}
 	}
+
+	// Build chart-specific result
 	result := &PullResult{
 		Manifest: &DescriptorPullSummary{
-			Digest: manifest.Digest.String(),
-			Size:   manifest.Size,
+			Digest: genericResult.Manifest.Digest.String(),
+			Size:   genericResult.Manifest.Size,
 		},
 		Config: &DescriptorPullSummary{
 			Digest: configDescriptor.Digest.String(),
@@ -536,15 +491,18 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 		},
 		Chart: &DescriptorPullSummaryWithMeta{},
 		Prov:  &DescriptorPullSummary{},
-		Ref:   parsedRef.String(),
+		Ref:   genericResult.Ref,
 	}
 
-	result.Manifest.Data, err = content.FetchAll(ctx, memoryStore, manifest)
+	// Fetch data using generic client
+	genericClient := c.Generic()
+
+	result.Manifest.Data, err = genericClient.GetDescriptorData(genericResult.MemoryStore, genericResult.Manifest)
 	if err != nil {
-		return nil, fmt.Errorf("unable to retrieve blob with digest %s: %w", manifest.Digest, err)
+		return nil, fmt.Errorf("unable to retrieve blob with digest %s: %w", genericResult.Manifest.Digest, err)
 	}
 
-	result.Config.Data, err = content.FetchAll(ctx, memoryStore, *configDescriptor)
+	result.Config.Data, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *configDescriptor)
 	if err != nil {
 		return nil, fmt.Errorf("unable to retrieve blob with digest %s: %w", configDescriptor.Digest, err)
 	}
@@ -554,7 +512,7 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 	}
 
 	if operation.withChart {
-		result.Chart.Data, err = content.FetchAll(ctx, memoryStore, *chartDescriptor)
+		result.Chart.Data, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *chartDescriptor)
 		if err != nil {
 			return nil, fmt.Errorf("unable to retrieve blob with digest %s: %w", chartDescriptor.Digest, err)
 		}
@@ -563,7 +521,7 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 	}
 
 	if operation.withProv && !provMissing {
-		result.Prov.Data, err = content.FetchAll(ctx, memoryStore, *provDescriptor)
+		result.Prov.Data, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *provDescriptor)
 		if err != nil {
 			return nil, fmt.Errorf("unable to retrieve blob with digest %s: %w", provDescriptor.Digest, err)
 		}
@@ -582,6 +540,44 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
 	return result, nil
 }
 
+// Pull downloads a chart from a registry
+func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
+	operation := &pullOperation{
+		withChart: true, // By default, always download the chart layer
+	}
+	for _, option := range options {
+		option(operation)
+	}
+	if !operation.withChart && !operation.withProv {
+		return nil, errors.New(
+			"must specify at least one layer to pull (chart/prov)")
+	}
+
+	// Build allowed media types for chart pull
+	allowedMediaTypes := []string{
+		ocispec.MediaTypeImageManifest,
+		ConfigMediaType,
+	}
+	if operation.withChart {
+		allowedMediaTypes = append(allowedMediaTypes, ChartLayerMediaType, LegacyChartLayerMediaType)
+	}
+	if operation.withProv {
+		allowedMediaTypes = append(allowedMediaTypes, ProvLayerMediaType)
+	}
+
+	// Use generic client for the pull operation
+	genericClient := c.Generic()
+	genericResult, err := genericClient.PullGeneric(ref, GenericPullOptions{
+		AllowedMediaTypes: allowedMediaTypes,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// Process the result with chart-specific logic
+	return c.processChartPull(genericResult, operation)
+}
+
 // PullOptWithChart returns a function that sets the withChart setting on pull
 func PullOptWithChart(withChart bool) PullOption {
 	return func(operation *pullOperation) {
diff --git a/pkg/registry/generic.go b/pkg/registry/generic.go
new file mode 100644
index 000000000..b82132338
--- /dev/null
+++ b/pkg/registry/generic.go
@@ -0,0 +1,162 @@
+/*
+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 registry
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"sort"
+	"sync"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"oras.land/oras-go/v2"
+	"oras.land/oras-go/v2/content"
+	"oras.land/oras-go/v2/content/memory"
+	"oras.land/oras-go/v2/registry/remote"
+	"oras.land/oras-go/v2/registry/remote/auth"
+	"oras.land/oras-go/v2/registry/remote/credentials"
+)
+
+// GenericClient provides low-level OCI operations without artifact-specific assumptions
+type GenericClient struct {
+	debug              bool
+	enableCache        bool
+	credentialsFile    string
+	username           string
+	password           string
+	out                io.Writer
+	authorizer         *auth.Client
+	registryAuthorizer RemoteClient
+	credentialsStore   credentials.Store
+	httpClient         *http.Client
+	plainHTTP          bool
+}
+
+// GenericPullOptions configures a generic pull operation
+type GenericPullOptions struct {
+	// MediaTypes to include in the pull (empty means all)
+	AllowedMediaTypes []string
+	// Skip descriptors with these media types
+	SkipMediaTypes []string
+	// Custom PreCopy function for filtering
+	PreCopy func(context.Context, ocispec.Descriptor) error
+}
+
+// GenericPullResult contains the result of a generic pull operation
+type GenericPullResult struct {
+	Manifest    ocispec.Descriptor
+	Descriptors []ocispec.Descriptor
+	MemoryStore *memory.Store
+	Ref         string
+}
+
+// NewGenericClient creates a new generic OCI client from an existing Client
+func NewGenericClient(client *Client) *GenericClient {
+	return &GenericClient{
+		debug:              client.debug,
+		enableCache:        client.enableCache,
+		credentialsFile:    client.credentialsFile,
+		username:           client.username,
+		password:           client.password,
+		out:                client.out,
+		authorizer:         client.authorizer,
+		registryAuthorizer: client.registryAuthorizer,
+		credentialsStore:   client.credentialsStore,
+		httpClient:         client.httpClient,
+		plainHTTP:          client.plainHTTP,
+	}
+}
+
+// PullGeneric performs a generic OCI pull without artifact-specific assumptions
+func (c *GenericClient) PullGeneric(ref string, options GenericPullOptions) (*GenericPullResult, error) {
+	parsedRef, err := newReference(ref)
+	if err != nil {
+		return nil, err
+	}
+
+	memoryStore := memory.New()
+	var descriptors []ocispec.Descriptor
+
+	// Set up repository with authentication and configuration
+	repository, err := remote.NewRepository(parsedRef.String())
+	if err != nil {
+		return nil, err
+	}
+	repository.PlainHTTP = c.plainHTTP
+	repository.Client = c.authorizer
+
+	ctx := context.Background()
+
+	// Prepare allowed media types for filtering
+	var allowedMediaTypes []string
+	if len(options.AllowedMediaTypes) > 0 {
+		allowedMediaTypes = make([]string, len(options.AllowedMediaTypes))
+		copy(allowedMediaTypes, options.AllowedMediaTypes)
+		sort.Strings(allowedMediaTypes)
+	}
+
+	var mu sync.Mutex
+	manifest, err := oras.Copy(ctx, repository, parsedRef.String(), memoryStore, "", oras.CopyOptions{
+		CopyGraphOptions: oras.CopyGraphOptions{
+			PreCopy: func(ctx context.Context, desc ocispec.Descriptor) error {
+				// Apply custom PreCopy function if provided
+				if options.PreCopy != nil {
+					if err := options.PreCopy(ctx, desc); err != nil {
+						return err
+					}
+				}
+
+				mediaType := desc.MediaType
+
+				// Skip media types if specified
+				for _, skipType := range options.SkipMediaTypes {
+					if mediaType == skipType {
+						return oras.SkipNode
+					}
+				}
+
+				// Filter by allowed media types if specified
+				if len(allowedMediaTypes) > 0 {
+					if i := sort.SearchStrings(allowedMediaTypes, mediaType); i >= len(allowedMediaTypes) || allowedMediaTypes[i] != mediaType {
+						return oras.SkipNode
+					}
+				}
+
+				mu.Lock()
+				descriptors = append(descriptors, desc)
+				mu.Unlock()
+				return nil
+			},
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &GenericPullResult{
+		Manifest:    manifest,
+		Descriptors: descriptors,
+		MemoryStore: memoryStore,
+		Ref:         parsedRef.String(),
+	}, nil
+}
+
+// GetDescriptorData retrieves the data for a specific descriptor
+func (c *GenericClient) GetDescriptorData(store *memory.Store, desc ocispec.Descriptor) ([]byte, error) {
+	return content.FetchAll(context.Background(), store, desc)
+}
diff --git a/pkg/registry/plugin.go b/pkg/registry/plugin.go
new file mode 100644
index 000000000..a92aaf452
--- /dev/null
+++ b/pkg/registry/plugin.go
@@ -0,0 +1,176 @@
+/*
+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 registry
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+)
+
+// Plugin-specific constants
+const (
+	// PluginArtifactType is the artifact type for Helm plugins
+	PluginArtifactType = "application/vnd.helm.plugin.v1+json"
+)
+
+// PluginPullOptions configures a plugin pull operation
+type PluginPullOptions struct {
+	// PluginName specifies the expected plugin name for layer validation
+	PluginName string
+}
+
+// PluginPullResult contains the result of a plugin pull operation
+type PluginPullResult struct {
+	Manifest       ocispec.Descriptor
+	PluginData     []byte
+	ProvenanceData []byte // Optional provenance data
+	Ref            string
+	PluginName     string
+}
+
+// PullPlugin downloads a plugin from an OCI registry using artifact type
+func (c *Client) PullPlugin(ref string, pluginName string, options ...PluginPullOption) (*PluginPullResult, error) {
+	operation := &pluginPullOperation{
+		pluginName: pluginName,
+	}
+	for _, option := range options {
+		option(operation)
+	}
+
+	// Use generic client for the pull operation with artifact type filtering
+	genericClient := c.Generic()
+	genericResult, err := genericClient.PullGeneric(ref, GenericPullOptions{
+		// Allow manifests and all layer types - we'll validate artifact type after download
+		AllowedMediaTypes: []string{
+			ocispec.MediaTypeImageManifest,
+			"application/vnd.oci.image.layer.v1.tar",
+			"application/vnd.oci.image.layer.v1.tar+gzip",
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// Process the result with plugin-specific logic
+	return c.processPluginPull(genericResult, operation.pluginName)
+}
+
+// processPluginPull handles plugin-specific processing of a generic pull result using artifact type
+func (c *Client) processPluginPull(genericResult *GenericPullResult, pluginName string) (*PluginPullResult, error) {
+	// First validate that this is actually a plugin artifact
+	manifestData, err := c.Generic().GetDescriptorData(genericResult.MemoryStore, genericResult.Manifest)
+	if err != nil {
+		return nil, fmt.Errorf("unable to retrieve manifest: %w", err)
+	}
+
+	// Parse the manifest to check artifact type
+	var manifest ocispec.Manifest
+	if err := json.Unmarshal(manifestData, &manifest); err != nil {
+		return nil, fmt.Errorf("unable to parse manifest: %w", err)
+	}
+
+	// Validate artifact type (for OCI v1.1+ manifests)
+	if manifest.ArtifactType != "" && manifest.ArtifactType != PluginArtifactType {
+		return nil, fmt.Errorf("expected artifact type %s, got %s", PluginArtifactType, manifest.ArtifactType)
+	}
+
+	// For backwards compatibility, also check config media type if no artifact type
+	if manifest.ArtifactType == "" && manifest.Config.MediaType != PluginArtifactType {
+		return nil, fmt.Errorf("expected config media type %s for legacy compatibility, got %s", PluginArtifactType, manifest.Config.MediaType)
+	}
+
+	// Find the required plugin tarball and optional provenance
+	expectedTarball := pluginName + ".tgz"
+	expectedProvenance := pluginName + ".tgz.prov"
+
+	var pluginDescriptor *ocispec.Descriptor
+	var provenanceDescriptor *ocispec.Descriptor
+
+	// Look for layers with the expected titles/annotations
+	for _, layer := range manifest.Layers {
+		d := layer
+		// Check for title annotation (preferred method)
+		if title, exists := d.Annotations[ocispec.AnnotationTitle]; exists {
+			switch title {
+			case expectedTarball:
+				pluginDescriptor = &d
+			case expectedProvenance:
+				provenanceDescriptor = &d
+			}
+		}
+	}
+
+	// Plugin tarball is required
+	if pluginDescriptor == nil {
+		return nil, fmt.Errorf("required layer %s not found in manifest", expectedTarball)
+	}
+
+	// Build plugin-specific result
+	result := &PluginPullResult{
+		Manifest:   genericResult.Manifest,
+		Ref:        genericResult.Ref,
+		PluginName: pluginName,
+	}
+
+	// Fetch plugin data using generic client
+	genericClient := c.Generic()
+	result.PluginData, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *pluginDescriptor)
+	if err != nil {
+		return nil, fmt.Errorf("unable to retrieve plugin data with digest %s: %w", pluginDescriptor.Digest, err)
+	}
+
+	// Fetch provenance data if available
+	if provenanceDescriptor != nil {
+		result.ProvenanceData, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *provenanceDescriptor)
+		if err != nil {
+			return nil, fmt.Errorf("unable to retrieve provenance data with digest %s: %w", provenanceDescriptor.Digest, err)
+		}
+	}
+
+	fmt.Fprintf(c.out, "Pulled plugin: %s\n", result.Ref)
+	fmt.Fprintf(c.out, "Digest: %s\n", result.Manifest.Digest)
+	if result.ProvenanceData != nil {
+		fmt.Fprintf(c.out, "Provenance: %s\n", expectedProvenance)
+	}
+
+	if strings.Contains(result.Ref, "_") {
+		fmt.Fprintf(c.out, "%s contains an underscore.\n", result.Ref)
+		fmt.Fprint(c.out, registryUnderscoreMessage+"\n")
+	}
+
+	return result, nil
+}
+
+// Plugin pull operation types and options
+type (
+	pluginPullOperation struct {
+		pluginName string
+	}
+
+	// PluginPullOption allows customizing plugin pull operations
+	PluginPullOption func(*pluginPullOperation)
+)
+
+// PluginPullOptWithPluginName sets the plugin name for validation
+func PluginPullOptWithPluginName(name string) PluginPullOption {
+	return func(operation *pluginPullOperation) {
+		operation.pluginName = name
+	}
+}

From fd41fdd9c9e741edaf93155f0ff300c206ee4957 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Mon, 25 Aug 2025 11:19:02 -0400
Subject: [PATCH 155/211] New registry plugin func GetPluginName. Re-use
 regsitry.reference

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/oci_installer.go | 20 +----
 pkg/registry/plugin.go                     | 25 ++++++
 pkg/registry/plugin_test.go                | 93 ++++++++++++++++++++++
 3 files changed, 122 insertions(+), 16 deletions(-)
 create mode 100644 pkg/registry/plugin_test.go

diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go
index acb28ccf9..89dd44056 100644
--- a/internal/plugin/installer/oci_installer.go
+++ b/internal/plugin/installer/oci_installer.go
@@ -24,7 +24,6 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
@@ -45,21 +44,10 @@ type OCIInstaller struct {
 
 // NewOCIInstaller creates a new OCIInstaller with optional getter options
 func NewOCIInstaller(source string, options ...getter.Option) (*OCIInstaller, error) {
-	ref := strings.TrimPrefix(source, fmt.Sprintf("%s://", registry.OCIScheme))
-
-	// Extract plugin name from OCI reference
-	// e.g., "ghcr.io/user/plugin-name:v1.0.0" -> "plugin-name"
-	parts := strings.Split(ref, "/")
-	if len(parts) < 2 {
-		return nil, fmt.Errorf("invalid OCI reference: %s", source)
-	}
-	lastPart := parts[len(parts)-1]
-	pluginName := lastPart
-	if idx := strings.LastIndex(lastPart, ":"); idx > 0 {
-		pluginName = lastPart[:idx]
-	}
-	if idx := strings.LastIndex(lastPart, "@"); idx > 0 {
-		pluginName = lastPart[:idx]
+	// Extract plugin name from OCI reference using robust registry parsing
+	pluginName, err := registry.GetPluginName(source)
+	if err != nil {
+		return nil, err
 	}
 
 	key, err := cache.Key(source)
diff --git a/pkg/registry/plugin.go b/pkg/registry/plugin.go
index a92aaf452..5d22a99ee 100644
--- a/pkg/registry/plugin.go
+++ b/pkg/registry/plugin.go
@@ -174,3 +174,28 @@ func PluginPullOptWithPluginName(name string) PluginPullOption {
 		operation.pluginName = name
 	}
 }
+
+// GetPluginName extracts the plugin name from an OCI reference using proper reference parsing
+func GetPluginName(source string) (string, error) {
+	ref, err := newReference(source)
+	if err != nil {
+		return "", fmt.Errorf("invalid OCI reference: %w", err)
+	}
+
+	// Extract plugin name from the repository path
+	// e.g., "ghcr.io/user/plugin-name:v1.0.0" -> Repository: "user/plugin-name"
+	repository := ref.Repository
+	if repository == "" {
+		return "", fmt.Errorf("invalid OCI reference: missing repository")
+	}
+
+	// Get the last part of the repository path as the plugin name
+	parts := strings.Split(repository, "/")
+	pluginName := parts[len(parts)-1]
+
+	if pluginName == "" {
+		return "", fmt.Errorf("invalid OCI reference: cannot determine plugin name from repository %s", repository)
+	}
+
+	return pluginName, nil
+}
diff --git a/pkg/registry/plugin_test.go b/pkg/registry/plugin_test.go
new file mode 100644
index 000000000..f8525829c
--- /dev/null
+++ b/pkg/registry/plugin_test.go
@@ -0,0 +1,93 @@
+/*
+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 registry
+
+import (
+	"testing"
+)
+
+func TestGetPluginName(t *testing.T) {
+	tests := []struct {
+		name      string
+		source    string
+		expected  string
+		expectErr bool
+	}{
+		{
+			name:     "valid OCI reference with tag",
+			source:   "oci://ghcr.io/user/plugin-name:v1.0.0",
+			expected: "plugin-name",
+		},
+		{
+			name:     "valid OCI reference with digest",
+			source:   "oci://ghcr.io/user/plugin-name@sha256:1234567890abcdef",
+			expected: "plugin-name",
+		},
+		{
+			name:     "valid OCI reference without tag",
+			source:   "oci://ghcr.io/user/plugin-name",
+			expected: "plugin-name",
+		},
+		{
+			name:     "valid OCI reference with multiple path segments",
+			source:   "oci://registry.example.com/org/team/plugin-name:latest",
+			expected: "plugin-name",
+		},
+		{
+			name:     "valid OCI reference with plus signs in tag",
+			source:   "oci://registry.example.com/user/plugin-name:v1.0.0+build.1",
+			expected: "plugin-name",
+		},
+		{
+			name:     "valid OCI reference - single path segment",
+			source:   "oci://registry.example.com/plugin",
+			expected: "plugin",
+		},
+		{
+			name:      "invalid OCI reference - no repository",
+			source:    "oci://registry.example.com",
+			expectErr: true,
+		},
+		{
+			name:      "invalid OCI reference - malformed",
+			source:    "not-an-oci-reference",
+			expectErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			pluginName, err := GetPluginName(tt.source)
+
+			if tt.expectErr {
+				if err == nil {
+					t.Errorf("expected error but got none")
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("unexpected error: %v", err)
+				return
+			}
+
+			if pluginName != tt.expected {
+				t.Errorf("expected plugin name %q, got %q", tt.expected, pluginName)
+			}
+		})
+	}
+}

From d19130f69ea4036bff9615f120dbb509fe31897b Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Mon, 25 Aug 2025 22:23:20 -0400
Subject: [PATCH 156/211] Fix file handle management in tar extractors

Use defer outFile.Close() to avoid multiple close calls and ensure proper resource cleanup

Co-authored-by: Andrew Block <andy.block@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/http_installer.go | 3 +--
 internal/plugin/installer/oci_installer.go  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/internal/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go
index b168f8646..e598bce02 100644
--- a/internal/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@@ -256,11 +256,10 @@ func (g *TarGzExtractor) Extract(buffer *bytes.Buffer, targetDir string) error {
 			if err != nil {
 				return err
 			}
+			defer outFile.Close()
 			if _, err := io.Copy(outFile, tarReader); err != nil {
-				outFile.Close()
 				return err
 			}
-			outFile.Close()
 		// We don't want to process these extension header files.
 		case tar.TypeXGlobalHeader, tar.TypeXHeader:
 			continue
diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go
index 89dd44056..a96a94ee1 100644
--- a/internal/plugin/installer/oci_installer.go
+++ b/internal/plugin/installer/oci_installer.go
@@ -200,11 +200,10 @@ func extractTar(r io.Reader, targetDir string) error {
 			if err != nil {
 				return err
 			}
+			defer outFile.Close()
 			if _, err := io.Copy(outFile, tarReader); err != nil {
-				outFile.Close()
 				return err
 			}
-			outFile.Close()
 		case tar.TypeXGlobalHeader, tar.TypeXHeader:
 			// Skip these
 			continue

From 5c663db853af87e0951f9af8a71a9412051af370 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Thu, 21 Aug 2025 04:40:16 -0400
Subject: [PATCH 157/211] Plugin tarball installer support for HTTP (fix) and
 local (feat)

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/http_installer.go   |  22 +-
 .../plugin/installer/http_installer_test.go   | 252 ++++++++++++++++++
 internal/plugin/installer/installer.go        |   9 +
 internal/plugin/installer/installer_test.go   |  11 +-
 internal/plugin/installer/local_installer.go  |  67 +++++
 .../plugin/installer/local_installer_test.go  | 160 +++++++++++
 internal/plugin/installer/plugin_structure.go |  80 ++++++
 .../plugin/installer/plugin_structure_test.go | 165 ++++++++++++
 8 files changed, 760 insertions(+), 6 deletions(-)
 create mode 100644 internal/plugin/installer/plugin_structure.go
 create mode 100644 internal/plugin/installer/plugin_structure_test.go

diff --git a/internal/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go
index e598bce02..b68fc059a 100644
--- a/internal/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@@ -69,6 +69,9 @@ func mediaTypeToExtension(mt string) (string, bool) {
 	switch strings.ToLower(mt) {
 	case "application/gzip", "application/x-gzip", "application/x-tgz", "application/x-gtar":
 		return ".tgz", true
+	case "application/octet-stream":
+		// Generic binary type - we'll need to check the URL suffix
+		return "", false
 	default:
 		return "", false
 	}
@@ -138,11 +141,18 @@ func (i *HTTPInstaller) Install() error {
 		return fmt.Errorf("extracting files from archive: %w", err)
 	}
 
-	if !isPlugin(i.CacheDir) {
-		return ErrMissingMetadata
+	// Detect where the plugin.yaml actually is
+	pluginRoot, err := detectPluginRoot(i.CacheDir)
+	if err != nil {
+		return err
+	}
+
+	// Validate plugin structure if needed
+	if err := validatePluginName(pluginRoot, i.PluginName); err != nil {
+		return err
 	}
 
-	src, err := filepath.Abs(i.CacheDir)
+	src, err := filepath.Abs(pluginRoot)
 	if err != nil {
 		return err
 	}
@@ -248,10 +258,14 @@ func (g *TarGzExtractor) Extract(buffer *bytes.Buffer, targetDir string) error {
 
 		switch header.Typeflag {
 		case tar.TypeDir:
-			if err := os.Mkdir(path, 0755); err != nil {
+			if err := os.MkdirAll(path, 0755); err != nil {
 				return err
 			}
 		case tar.TypeReg:
+			// Ensure parent directory exists
+			if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+				return err
+			}
 			outFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
 			if err != nil {
 				return err
diff --git a/internal/plugin/installer/http_installer_test.go b/internal/plugin/installer/http_installer_test.go
index 92521474e..ac74b8cf6 100644
--- a/internal/plugin/installer/http_installer_test.go
+++ b/internal/plugin/installer/http_installer_test.go
@@ -348,3 +348,255 @@ func TestMediaTypeToExtension(t *testing.T) {
 		}
 	}
 }
+
+func TestExtractWithNestedDirectories(t *testing.T) {
+	source := "https://repo.localdomain/plugins/nested-plugin-0.0.1.tar.gz"
+	tempDir := t.TempDir()
+
+	// Set the umask to default open permissions so we can actually test
+	oldmask := syscall.Umask(0000)
+	defer func() {
+		syscall.Umask(oldmask)
+	}()
+
+	// Write a tarball with nested directory structure
+	var tarbuf bytes.Buffer
+	tw := tar.NewWriter(&tarbuf)
+	var files = []struct {
+		Name     string
+		Body     string
+		Mode     int64
+		TypeFlag byte
+	}{
+		{"plugin.yaml", "plugin metadata", 0600, tar.TypeReg},
+		{"bin/", "", 0755, tar.TypeDir},
+		{"bin/plugin", "#!/bin/bash\necho plugin", 0755, tar.TypeReg},
+		{"docs/", "", 0755, tar.TypeDir},
+		{"docs/README.md", "readme content", 0644, tar.TypeReg},
+		{"docs/examples/", "", 0755, tar.TypeDir},
+		{"docs/examples/example1.yaml", "example content", 0644, tar.TypeReg},
+	}
+
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name:     file.Name,
+			Typeflag: file.TypeFlag,
+			Mode:     file.Mode,
+			Size:     int64(len(file.Body)),
+		}
+		if err := tw.WriteHeader(hdr); err != nil {
+			t.Fatal(err)
+		}
+		if file.TypeFlag == tar.TypeReg {
+			if _, err := tw.Write([]byte(file.Body)); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	var buf bytes.Buffer
+	gz := gzip.NewWriter(&buf)
+	if _, err := gz.Write(tarbuf.Bytes()); err != nil {
+		t.Fatal(err)
+	}
+	gz.Close()
+
+	extractor, err := NewExtractor(source)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// First extraction
+	if err = extractor.Extract(&buf, tempDir); err != nil {
+		t.Fatalf("First extraction failed: %v", err)
+	}
+
+	// Verify nested structure was created
+	nestedFile := filepath.Join(tempDir, "docs", "examples", "example1.yaml")
+	if _, err := os.Stat(nestedFile); err != nil {
+		t.Fatalf("Expected nested file %s to exist but got error: %v", nestedFile, err)
+	}
+
+	// Reset buffer for second extraction
+	buf.Reset()
+	gz = gzip.NewWriter(&buf)
+	if _, err := gz.Write(tarbuf.Bytes()); err != nil {
+		t.Fatal(err)
+	}
+	gz.Close()
+
+	// Second extraction to same directory (should not fail)
+	if err = extractor.Extract(&buf, tempDir); err != nil {
+		t.Fatalf("Second extraction to existing directory failed: %v", err)
+	}
+}
+
+func TestExtractWithExistingDirectory(t *testing.T) {
+	source := "https://repo.localdomain/plugins/test-plugin-0.0.1.tar.gz"
+	tempDir := t.TempDir()
+
+	// Pre-create the cache directory structure
+	cacheDir := filepath.Join(tempDir, "cache")
+	if err := os.MkdirAll(filepath.Join(cacheDir, "existing", "dir"), 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a file in the existing directory
+	existingFile := filepath.Join(cacheDir, "existing", "file.txt")
+	if err := os.WriteFile(existingFile, []byte("existing content"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Write a tarball
+	var tarbuf bytes.Buffer
+	tw := tar.NewWriter(&tarbuf)
+	files := []struct {
+		Name     string
+		Body     string
+		Mode     int64
+		TypeFlag byte
+	}{
+		{"plugin.yaml", "plugin metadata", 0600, tar.TypeReg},
+		{"existing/", "", 0755, tar.TypeDir},
+		{"existing/dir/", "", 0755, tar.TypeDir},
+		{"existing/dir/newfile.txt", "new content", 0644, tar.TypeReg},
+	}
+
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name:     file.Name,
+			Typeflag: file.TypeFlag,
+			Mode:     file.Mode,
+			Size:     int64(len(file.Body)),
+		}
+		if err := tw.WriteHeader(hdr); err != nil {
+			t.Fatal(err)
+		}
+		if file.TypeFlag == tar.TypeReg {
+			if _, err := tw.Write([]byte(file.Body)); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	var buf bytes.Buffer
+	gz := gzip.NewWriter(&buf)
+	if _, err := gz.Write(tarbuf.Bytes()); err != nil {
+		t.Fatal(err)
+	}
+	gz.Close()
+
+	extractor, err := NewExtractor(source)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Extract to directory with existing content
+	if err = extractor.Extract(&buf, cacheDir); err != nil {
+		t.Fatalf("Extraction to directory with existing content failed: %v", err)
+	}
+
+	// Verify new file was created
+	newFile := filepath.Join(cacheDir, "existing", "dir", "newfile.txt")
+	if _, err := os.Stat(newFile); err != nil {
+		t.Fatalf("Expected new file %s to exist but got error: %v", newFile, err)
+	}
+
+	// Verify existing file is still there
+	if _, err := os.Stat(existingFile); err != nil {
+		t.Fatalf("Expected existing file %s to still exist but got error: %v", existingFile, err)
+	}
+}
+
+func TestExtractPluginInSubdirectory(t *testing.T) {
+	source := "https://repo.localdomain/plugins/subdir-plugin-1.0.0.tar.gz"
+	tempDir := t.TempDir()
+
+	// Create a tarball where plugin files are in a subdirectory
+	var tarbuf bytes.Buffer
+	tw := tar.NewWriter(&tarbuf)
+	files := []struct {
+		Name     string
+		Body     string
+		Mode     int64
+		TypeFlag byte
+	}{
+		{"my-plugin/", "", 0755, tar.TypeDir},
+		{"my-plugin/plugin.yaml", "name: my-plugin\nversion: 1.0.0\nusage: test\ndescription: test plugin\ncommand: $HELM_PLUGIN_DIR/bin/my-plugin", 0644, tar.TypeReg},
+		{"my-plugin/bin/", "", 0755, tar.TypeDir},
+		{"my-plugin/bin/my-plugin", "#!/bin/bash\necho test", 0755, tar.TypeReg},
+	}
+
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name:     file.Name,
+			Typeflag: file.TypeFlag,
+			Mode:     file.Mode,
+			Size:     int64(len(file.Body)),
+		}
+		if err := tw.WriteHeader(hdr); err != nil {
+			t.Fatal(err)
+		}
+		if file.TypeFlag == tar.TypeReg {
+			if _, err := tw.Write([]byte(file.Body)); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	var buf bytes.Buffer
+	gz := gzip.NewWriter(&buf)
+	if _, err := gz.Write(tarbuf.Bytes()); err != nil {
+		t.Fatal(err)
+	}
+	gz.Close()
+
+	// Test the installer
+	installer := &HTTPInstaller{
+		CacheDir:   tempDir,
+		PluginName: "subdir-plugin",
+		base:       newBase(source),
+		extractor:  &TarGzExtractor{},
+	}
+
+	// Create a mock getter
+	installer.getter = &TestHTTPGetter{
+		MockResponse: &buf,
+	}
+
+	// Ensure the destination directory doesn't exist
+	// (In a real scenario, this is handled by installer.Install() wrapper)
+	destPath := installer.Path()
+	if err := os.RemoveAll(destPath); err != nil {
+		t.Fatalf("Failed to clean destination path: %v", err)
+	}
+
+	// Install should handle the subdirectory correctly
+	if err := installer.Install(); err != nil {
+		t.Fatalf("Failed to install plugin with subdirectory: %v", err)
+	}
+
+	// The plugin should be installed from the subdirectory
+	// Check that detectPluginRoot found the correct location
+	pluginRoot, err := detectPluginRoot(tempDir)
+	if err != nil {
+		t.Fatalf("Failed to detect plugin root: %v", err)
+	}
+
+	expectedRoot := filepath.Join(tempDir, "my-plugin")
+	if pluginRoot != expectedRoot {
+		t.Errorf("Expected plugin root to be %s but got %s", expectedRoot, pluginRoot)
+	}
+}
diff --git a/internal/plugin/installer/installer.go b/internal/plugin/installer/installer.go
index e14f16018..7900f6745 100644
--- a/internal/plugin/installer/installer.go
+++ b/internal/plugin/installer/installer.go
@@ -92,6 +92,15 @@ func isLocalReference(source string) bool {
 // HEAD operation to see if the remote resource is a file that we understand.
 func isRemoteHTTPArchive(source string) bool {
 	if strings.HasPrefix(source, "http://") || strings.HasPrefix(source, "https://") {
+		// First, check if the URL ends with a known archive suffix
+		// This is more reliable than content-type detection
+		for suffix := range Extractors {
+			if strings.HasSuffix(source, suffix) {
+				return true
+			}
+		}
+
+		// If no suffix match, try HEAD request to check content type
 		res, err := http.Head(source)
 		if err != nil {
 			// If we get an error at the network layer, we can't install it. So
diff --git a/internal/plugin/installer/installer_test.go b/internal/plugin/installer/installer_test.go
index a11464924..dcd76fe9c 100644
--- a/internal/plugin/installer/installer_test.go
+++ b/internal/plugin/installer/installer_test.go
@@ -26,8 +26,15 @@ func TestIsRemoteHTTPArchive(t *testing.T) {
 		t.Errorf("Expected non-URL to return false")
 	}
 
-	if isRemoteHTTPArchive("https://127.0.0.1:123/fake/plugin-1.2.3.tgz") {
-		t.Errorf("Bad URL should not have succeeded.")
+	// URLs with valid archive extensions are considered valid archives
+	// even if the server is unreachable (optimization to avoid unnecessary HTTP requests)
+	if !isRemoteHTTPArchive("https://127.0.0.1:123/fake/plugin-1.2.3.tgz") {
+		t.Errorf("URL with .tgz extension should be considered a valid archive")
+	}
+
+	// Test with invalid extension and unreachable server
+	if isRemoteHTTPArchive("https://127.0.0.1:123/fake/plugin-1.2.3.notanarchive") {
+		t.Errorf("Bad URL without valid extension should not succeed")
 	}
 
 	if !isRemoteHTTPArchive(source) {
diff --git a/internal/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go
index 211904108..59e8aebfb 100644
--- a/internal/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@@ -16,11 +16,15 @@ limitations under the License.
 package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"log/slog"
 	"os"
 	"path/filepath"
+	"strings"
+
+	"helm.sh/helm/v4/internal/third_party/dep/fs"
 )
 
 // ErrPluginNotAFolder indicates that the plugin path is not a folder.
@@ -29,6 +33,8 @@ var ErrPluginNotAFolder = errors.New("expected plugin to be a folder")
 // LocalInstaller installs plugins from the filesystem.
 type LocalInstaller struct {
 	base
+	isArchive bool
+	extractor Extractor
 }
 
 // NewLocalInstaller creates a new LocalInstaller.
@@ -40,13 +46,42 @@ func NewLocalInstaller(source string) (*LocalInstaller, error) {
 	i := &LocalInstaller{
 		base: newBase(src),
 	}
+
+	// Check if source is an archive
+	if isLocalArchive(src) {
+		i.isArchive = true
+		extractor, err := NewExtractor(src)
+		if err != nil {
+			return nil, fmt.Errorf("unsupported archive format: %w", err)
+		}
+		i.extractor = extractor
+	}
+
 	return i, nil
 }
 
+// isLocalArchive checks if the file is a supported archive format
+func isLocalArchive(path string) bool {
+	for suffix := range Extractors {
+		if strings.HasSuffix(path, suffix) {
+			return true
+		}
+	}
+	return false
+}
+
 // Install creates a symlink to the plugin directory.
 //
 // Implements Installer.
 func (i *LocalInstaller) Install() error {
+	if i.isArchive {
+		return i.installFromArchive()
+	}
+	return i.installFromDirectory()
+}
+
+// installFromDirectory creates a symlink to the plugin directory
+func (i *LocalInstaller) installFromDirectory() error {
 	stat, err := os.Stat(i.Source)
 	if err != nil {
 		return err
@@ -62,6 +97,38 @@ func (i *LocalInstaller) Install() error {
 	return os.Symlink(i.Source, i.Path())
 }
 
+// installFromArchive extracts and installs a plugin from a tarball
+func (i *LocalInstaller) installFromArchive() error {
+	// Read the archive file
+	data, err := os.ReadFile(i.Source)
+	if err != nil {
+		return fmt.Errorf("failed to read archive: %w", err)
+	}
+
+	// Create a temporary directory for extraction
+	tempDir, err := os.MkdirTemp("", "helm-plugin-extract-")
+	if err != nil {
+		return fmt.Errorf("failed to create temp directory: %w", err)
+	}
+	defer os.RemoveAll(tempDir)
+
+	// Extract the archive
+	buffer := bytes.NewBuffer(data)
+	if err := i.extractor.Extract(buffer, tempDir); err != nil {
+		return fmt.Errorf("failed to extract archive: %w", err)
+	}
+
+	// Detect where the plugin.yaml actually is
+	pluginRoot, err := detectPluginRoot(tempDir)
+	if err != nil {
+		return err
+	}
+
+	// Copy to the final destination
+	slog.Debug("copying", "source", pluginRoot, "path", i.Path())
+	return fs.CopyDir(pluginRoot, i.Path())
+}
+
 // Update updates a local repository
 func (i *LocalInstaller) Update() error {
 	slog.Debug("local repository is auto-updated")
diff --git a/internal/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
index fdb669314..05118e183 100644
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -16,6 +16,9 @@ limitations under the License.
 package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
 	"os"
 	"path/filepath"
 	"testing"
@@ -65,3 +68,160 @@ func TestLocalInstallerNotAFolder(t *testing.T) {
 		t.Fatalf("expected error to equal: %q", err)
 	}
 }
+
+func TestLocalInstallerTarball(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a test tarball
+	tempDir := t.TempDir()
+	tarballPath := filepath.Join(tempDir, "test-plugin-1.0.0.tar.gz")
+
+	// Create tarball content
+	var buf bytes.Buffer
+	gw := gzip.NewWriter(&buf)
+	tw := tar.NewWriter(gw)
+
+	files := []struct {
+		Name string
+		Body string
+		Mode int64
+	}{
+		{"plugin.yaml", "name: test-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644},
+		{"bin/test-plugin", "#!/bin/bash\necho test", 0755},
+	}
+
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name: file.Name,
+			Mode: file.Mode,
+			Size: int64(len(file.Body)),
+		}
+		if err := tw.WriteHeader(hdr); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := tw.Write([]byte(file.Body)); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+	if err := gw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Write tarball to file
+	if err := os.WriteFile(tarballPath, buf.Bytes(), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Test installation
+	i, err := NewForSource(tarballPath, "")
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	// Verify it's detected as LocalInstaller
+	localInstaller, ok := i.(*LocalInstaller)
+	if !ok {
+		t.Fatal("expected LocalInstaller")
+	}
+
+	if !localInstaller.isArchive {
+		t.Fatal("expected isArchive to be true")
+	}
+
+	if err := Install(i); err != nil {
+		t.Fatal(err)
+	}
+
+	expectedPath := helmpath.DataPath("plugins", "test-plugin")
+	if i.Path() != expectedPath {
+		t.Fatalf("expected path %q, got %q", expectedPath, i.Path())
+	}
+
+	// Verify plugin was installed
+	if _, err := os.Stat(i.Path()); err != nil {
+		t.Fatalf("plugin not found at %s: %v", i.Path(), err)
+	}
+}
+
+func TestLocalInstallerTarballWithSubdirectory(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a test tarball with subdirectory
+	tempDir := t.TempDir()
+	tarballPath := filepath.Join(tempDir, "subdir-plugin-1.0.0.tar.gz")
+
+	// Create tarball content
+	var buf bytes.Buffer
+	gw := gzip.NewWriter(&buf)
+	tw := tar.NewWriter(gw)
+
+	files := []struct {
+		Name  string
+		Body  string
+		Mode  int64
+		IsDir bool
+	}{
+		{"my-plugin/", "", 0755, true},
+		{"my-plugin/plugin.yaml", "name: my-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644, false},
+		{"my-plugin/bin/", "", 0755, true},
+		{"my-plugin/bin/my-plugin", "#!/bin/bash\necho test", 0755, false},
+	}
+
+	for _, file := range files {
+		hdr := &tar.Header{
+			Name: file.Name,
+			Mode: file.Mode,
+		}
+		if file.IsDir {
+			hdr.Typeflag = tar.TypeDir
+		} else {
+			hdr.Size = int64(len(file.Body))
+		}
+
+		if err := tw.WriteHeader(hdr); err != nil {
+			t.Fatal(err)
+		}
+		if !file.IsDir {
+			if _, err := tw.Write([]byte(file.Body)); err != nil {
+				t.Fatal(err)
+			}
+		}
+	}
+
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+	if err := gw.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	// Write tarball to file
+	if err := os.WriteFile(tarballPath, buf.Bytes(), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Test installation
+	i, err := NewForSource(tarballPath, "")
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	if err := Install(i); err != nil {
+		t.Fatal(err)
+	}
+
+	expectedPath := helmpath.DataPath("plugins", "subdir-plugin")
+	if i.Path() != expectedPath {
+		t.Fatalf("expected path %q, got %q", expectedPath, i.Path())
+	}
+
+	// Verify plugin was installed from subdirectory
+	pluginYaml := filepath.Join(i.Path(), "plugin.yaml")
+	if _, err := os.Stat(pluginYaml); err != nil {
+		t.Fatalf("plugin.yaml not found at %s: %v", pluginYaml, err)
+	}
+}
diff --git a/internal/plugin/installer/plugin_structure.go b/internal/plugin/installer/plugin_structure.go
new file mode 100644
index 000000000..10647141e
--- /dev/null
+++ b/internal/plugin/installer/plugin_structure.go
@@ -0,0 +1,80 @@
+/*
+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 installer
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"helm.sh/helm/v4/internal/plugin"
+)
+
+// detectPluginRoot searches for plugin.yaml in the extracted directory
+// and returns the path to the directory containing it.
+// This handles cases where the tarball contains the plugin in a subdirectory.
+func detectPluginRoot(extractDir string) (string, error) {
+	// First check if plugin.yaml is at the root
+	if _, err := os.Stat(filepath.Join(extractDir, plugin.PluginFileName)); err == nil {
+		return extractDir, nil
+	}
+
+	// Otherwise, look for plugin.yaml in subdirectories (only one level deep)
+	entries, err := os.ReadDir(extractDir)
+	if err != nil {
+		return "", err
+	}
+
+	for _, entry := range entries {
+		if entry.IsDir() {
+			subdir := filepath.Join(extractDir, entry.Name())
+			if _, err := os.Stat(filepath.Join(subdir, plugin.PluginFileName)); err == nil {
+				return subdir, nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf("plugin.yaml not found in %s or its immediate subdirectories", extractDir)
+}
+
+// validatePluginName checks if the plugin directory name matches the plugin name
+// from plugin.yaml when the plugin is in a subdirectory.
+func validatePluginName(pluginRoot string, expectedName string) error {
+	// Only validate if plugin is in a subdirectory
+	dirName := filepath.Base(pluginRoot)
+	if dirName == expectedName {
+		return nil
+	}
+
+	// Load plugin.yaml to get the actual name
+	p, err := plugin.LoadDir(pluginRoot)
+	if err != nil {
+		return fmt.Errorf("failed to load plugin from %s: %w", pluginRoot, err)
+	}
+
+	m := p.Metadata()
+	actualName := m.Name
+
+	// For now, just log a warning if names don't match
+	// In the future, we might want to enforce this more strictly
+	if actualName != dirName && actualName != strings.TrimSuffix(expectedName, filepath.Ext(expectedName)) {
+		// This is just informational - not an error
+		return nil
+	}
+
+	return nil
+}
diff --git a/internal/plugin/installer/plugin_structure_test.go b/internal/plugin/installer/plugin_structure_test.go
new file mode 100644
index 000000000..c8766ce59
--- /dev/null
+++ b/internal/plugin/installer/plugin_structure_test.go
@@ -0,0 +1,165 @@
+/*
+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 installer
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestDetectPluginRoot(t *testing.T) {
+	tests := []struct {
+		name        string
+		setup       func(dir string) error
+		expectRoot  string
+		expectError bool
+	}{
+		{
+			name: "plugin.yaml at root",
+			setup: func(dir string) error {
+				return os.WriteFile(filepath.Join(dir, "plugin.yaml"), []byte("name: test"), 0644)
+			},
+			expectRoot:  ".",
+			expectError: false,
+		},
+		{
+			name: "plugin.yaml in subdirectory",
+			setup: func(dir string) error {
+				subdir := filepath.Join(dir, "my-plugin")
+				if err := os.MkdirAll(subdir, 0755); err != nil {
+					return err
+				}
+				return os.WriteFile(filepath.Join(subdir, "plugin.yaml"), []byte("name: test"), 0644)
+			},
+			expectRoot:  "my-plugin",
+			expectError: false,
+		},
+		{
+			name: "no plugin.yaml",
+			setup: func(dir string) error {
+				return os.WriteFile(filepath.Join(dir, "README.md"), []byte("test"), 0644)
+			},
+			expectRoot:  "",
+			expectError: true,
+		},
+		{
+			name: "plugin.yaml in nested subdirectory (should not find)",
+			setup: func(dir string) error {
+				subdir := filepath.Join(dir, "outer", "inner")
+				if err := os.MkdirAll(subdir, 0755); err != nil {
+					return err
+				}
+				return os.WriteFile(filepath.Join(subdir, "plugin.yaml"), []byte("name: test"), 0644)
+			},
+			expectRoot:  "",
+			expectError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := t.TempDir()
+			if err := tt.setup(dir); err != nil {
+				t.Fatalf("Setup failed: %v", err)
+			}
+
+			root, err := detectPluginRoot(dir)
+			if tt.expectError {
+				if err == nil {
+					t.Error("Expected error but got none")
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Unexpected error: %v", err)
+				}
+				expectedPath := dir
+				if tt.expectRoot != "." {
+					expectedPath = filepath.Join(dir, tt.expectRoot)
+				}
+				if root != expectedPath {
+					t.Errorf("Expected root %s but got %s", expectedPath, root)
+				}
+			}
+		})
+	}
+}
+
+func TestValidatePluginName(t *testing.T) {
+	tests := []struct {
+		name         string
+		setup        func(dir string) error
+		pluginRoot   string
+		expectedName string
+		expectError  bool
+	}{
+		{
+			name: "matching directory and plugin name",
+			setup: func(dir string) error {
+				subdir := filepath.Join(dir, "my-plugin")
+				if err := os.MkdirAll(subdir, 0755); err != nil {
+					return err
+				}
+				yaml := `name: my-plugin
+version: 1.0.0
+usage: test
+description: test`
+				return os.WriteFile(filepath.Join(subdir, "plugin.yaml"), []byte(yaml), 0644)
+			},
+			pluginRoot:   "my-plugin",
+			expectedName: "my-plugin",
+			expectError:  false,
+		},
+		{
+			name: "different directory and plugin name",
+			setup: func(dir string) error {
+				subdir := filepath.Join(dir, "wrong-name")
+				if err := os.MkdirAll(subdir, 0755); err != nil {
+					return err
+				}
+				yaml := `name: my-plugin
+version: 1.0.0
+usage: test
+description: test`
+				return os.WriteFile(filepath.Join(subdir, "plugin.yaml"), []byte(yaml), 0644)
+			},
+			pluginRoot:   "wrong-name",
+			expectedName: "wrong-name",
+			expectError:  false, // Currently we don't error on mismatch
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := t.TempDir()
+			if err := tt.setup(dir); err != nil {
+				t.Fatalf("Setup failed: %v", err)
+			}
+
+			pluginRoot := filepath.Join(dir, tt.pluginRoot)
+			err := validatePluginName(pluginRoot, tt.expectedName)
+			if tt.expectError {
+				if err == nil {
+					t.Error("Expected error but got none")
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Unexpected error: %v", err)
+				}
+			}
+		})
+	}
+}

From 16924a51db7d44698d999c8b9c3bf2fdc74bc60f Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Mon, 25 Aug 2025 10:16:03 -0400
Subject: [PATCH 158/211] Fix: Removed unsafe umask manipulation in tests

Problem: Tests used syscall.Umask(0000) which could leave your shell creating
files with 777 permissions if interrupted.

Solution: Instead of changing umask, tests now detect the current umask and
calculate expected permissions after it's applied.

Result: Same test coverage, but safe from system-wide side effects.

Co-authored-by: Jesse Simpson <jesse.simpson36@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>
---
 .../plugin/installer/http_installer_test.go   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/internal/plugin/installer/http_installer_test.go b/internal/plugin/installer/http_installer_test.go
index ac74b8cf6..453021b76 100644
--- a/internal/plugin/installer/http_installer_test.go
+++ b/internal/plugin/installer/http_installer_test.go
@@ -210,11 +210,9 @@ func TestExtract(t *testing.T) {
 
 	tempDir := t.TempDir()
 
-	// Set the umask to default open permissions so we can actually test
-	oldmask := syscall.Umask(0000)
-	defer func() {
-		syscall.Umask(oldmask)
-	}()
+	// Get current umask to predict expected permissions
+	currentUmask := syscall.Umask(0)
+	syscall.Umask(currentUmask)
 
 	// Write a tarball to a buffer for us to extract
 	var tarbuf bytes.Buffer
@@ -274,14 +272,19 @@ func TestExtract(t *testing.T) {
 		t.Fatalf("Did not expect error but got error: %v", err)
 	}
 
+	// Calculate expected permissions after umask is applied
+	expectedPluginYAMLPerm := os.FileMode(0600 &^ currentUmask)
+	expectedReadmePerm := os.FileMode(0777 &^ currentUmask)
+
 	pluginYAMLFullPath := filepath.Join(tempDir, "plugin.yaml")
 	if info, err := os.Stat(pluginYAMLFullPath); err != nil {
 		if errors.Is(err, fs.ErrNotExist) {
 			t.Fatalf("Expected %s to exist but doesn't", pluginYAMLFullPath)
 		}
 		t.Fatal(err)
-	} else if info.Mode().Perm() != 0600 {
-		t.Fatalf("Expected %s to have 0600 mode it but has %o", pluginYAMLFullPath, info.Mode().Perm())
+	} else if info.Mode().Perm() != expectedPluginYAMLPerm {
+		t.Fatalf("Expected %s to have %o mode but has %o (umask: %o)",
+			pluginYAMLFullPath, expectedPluginYAMLPerm, info.Mode().Perm(), currentUmask)
 	}
 
 	readmeFullPath := filepath.Join(tempDir, "README.md")
@@ -290,8 +293,9 @@ func TestExtract(t *testing.T) {
 			t.Fatalf("Expected %s to exist but doesn't", readmeFullPath)
 		}
 		t.Fatal(err)
-	} else if info.Mode().Perm() != 0777 {
-		t.Fatalf("Expected %s to have 0777 mode it but has %o", readmeFullPath, info.Mode().Perm())
+	} else if info.Mode().Perm() != expectedReadmePerm {
+		t.Fatalf("Expected %s to have %o mode but has %o (umask: %o)",
+			readmeFullPath, expectedReadmePerm, info.Mode().Perm(), currentUmask)
 	}
 
 }
@@ -353,12 +357,6 @@ func TestExtractWithNestedDirectories(t *testing.T) {
 	source := "https://repo.localdomain/plugins/nested-plugin-0.0.1.tar.gz"
 	tempDir := t.TempDir()
 
-	// Set the umask to default open permissions so we can actually test
-	oldmask := syscall.Umask(0000)
-	defer func() {
-		syscall.Umask(oldmask)
-	}()
-
 	// Write a tarball with nested directory structure
 	var tarbuf bytes.Buffer
 	tw := tar.NewWriter(&tarbuf)

From 3d30112468fb4171a015210cfabbb0e41a6c6587 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Mon, 25 Aug 2025 22:57:42 -0400
Subject: [PATCH 159/211] Fix LocalInstaller Path() to strip version from
 tarball filenames

Override Path() method to use existing stripPluginName function for archives

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/local_installer.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/internal/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go
index 59e8aebfb..87b9eaf97 100644
--- a/internal/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@@ -129,6 +129,18 @@ func (i *LocalInstaller) installFromArchive() error {
 	return fs.CopyDir(pluginRoot, i.Path())
 }
 
+// Path returns the path where the plugin will be installed.
+// For archive sources, strips the version from the filename.
+func (i *LocalInstaller) Path() string {
+	if i.Source == "" {
+		return ""
+	}
+	if i.isArchive {
+		return filepath.Join(i.PluginsDirectory, stripPluginName(filepath.Base(i.Source)))
+	}
+	return filepath.Join(i.PluginsDirectory, filepath.Base(i.Source))
+}
+
 // Update updates a local repository
 func (i *LocalInstaller) Update() error {
 	slog.Debug("local repository is auto-updated")

From 389646ffd1e0b150ea96d70c84a5da7f206865c5 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Tue, 26 Aug 2025 08:13:13 -0600
Subject: [PATCH 160/211] fix: send logging to stderr

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 internal/logging/logging.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/logging/logging.go b/internal/logging/logging.go
index 946a211ef..2e8208d08 100644
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -64,7 +64,7 @@ func (h *DebugCheckHandler) WithGroup(name string) slog.Handler {
 // NewLogger creates a new logger with dynamic debug checking
 func NewLogger(debugEnabled DebugEnabledFunc) *slog.Logger {
 	// Create base handler that removes timestamps
-	baseHandler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+	baseHandler := slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
 		// Always use LevelDebug here to allow all messages through
 		// Our custom handler will do the filtering
 		Level: slog.LevelDebug,

From 417e6a2cbb2daf3bc66655a75fdcab048e8383d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:45:37 +0000
Subject: [PATCH 161/211] chore(deps): bump github.com/stretchr/testify from
 1.10.0 to 1.11.0

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.10.0...v1.11.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-version: 1.11.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 6557d7663..c28405240 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.41.0
 	golang.org/x/term v0.34.0
diff --git a/go.sum b/go.sum
index b76d921d3..f4f54ecdc 100644
--- a/go.sum
+++ b/go.sum
@@ -309,8 +309,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
+github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=

From c8e51b40c23e388646ba6987f32e68af19c1850e Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 25 Aug 2025 13:25:38 -0700
Subject: [PATCH 162/211] Plugin extism/v1 runtime

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 go.mod                                        |   7 +-
 go.sum                                        |  10 +
 internal/plugin/config.go                     |   1 -
 internal/plugin/loader.go                     |  23 +-
 internal/plugin/metadata.go                   |   6 +
 internal/plugin/plugin_type_registry.go       | 100 ++++++
 internal/plugin/plugin_type_registry_test.go  |  38 +++
 internal/plugin/runtime.go                    |  28 +-
 internal/plugin/runtime_extismv1.go           | 297 ++++++++++++++++++
 internal/plugin/runtime_extismv1_test.go      | 124 ++++++++
 internal/plugin/runtime_test.go               |  63 ++++
 internal/plugin/schema/test.go                |  28 ++
 .../testdata/src/extismv1-test/.gitignore     |   1 +
 .../testdata/src/extismv1-test/Makefile       |  12 +
 .../plugin/testdata/src/extismv1-test/go.mod  |   5 +
 .../plugin/testdata/src/extismv1-test/go.sum  |   2 +
 .../plugin/testdata/src/extismv1-test/main.go |  61 ++++
 .../testdata/src/extismv1-test/plugin.yaml    |   6 +
 18 files changed, 806 insertions(+), 6 deletions(-)
 create mode 100644 internal/plugin/plugin_type_registry.go
 create mode 100644 internal/plugin/plugin_type_registry_test.go
 create mode 100644 internal/plugin/runtime_extismv1.go
 create mode 100644 internal/plugin/runtime_extismv1_test.go
 create mode 100644 internal/plugin/runtime_test.go
 create mode 100644 internal/plugin/schema/test.go
 create mode 100644 internal/plugin/testdata/src/extismv1-test/.gitignore
 create mode 100644 internal/plugin/testdata/src/extismv1-test/Makefile
 create mode 100644 internal/plugin/testdata/src/extismv1-test/go.mod
 create mode 100644 internal/plugin/testdata/src/extismv1-test/go.sum
 create mode 100644 internal/plugin/testdata/src/extismv1-test/main.go
 create mode 100644 internal/plugin/testdata/src/extismv1-test/plugin.yaml

diff --git a/go.mod b/go.mod
index c28405240..8cff102c9 100644
--- a/go.mod
+++ b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/evanphx/json-patch/v5 v5.9.11
+	github.com/extism/go-sdk v1.7.1
 	github.com/fatih/color v1.18.0
 	github.com/fluxcd/cli-utils v0.36.0-flux.14
 	github.com/foxcpp/go-mockdns v1.1.0
@@ -25,13 +26,14 @@ require (
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/moby/term v0.5.2
-	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
 	github.com/stretchr/testify v1.11.0
+	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.41.0
 	golang.org/x/term v0.34.0
@@ -71,6 +73,7 @@ require (
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -95,6 +98,7 @@ require (
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
+	github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -130,6 +134,7 @@ require (
 	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cast v1.7.0 // indirect
+	github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
diff --git a/go.sum b/go.sum
index f4f54ecdc..9b41a7c39 100644
--- a/go.sum
+++ b/go.sum
@@ -77,12 +77,16 @@ github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
+github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a h1:UwSIFv5g5lIvbGgtf3tVwC7Ky9rmMFBp0RMs+6f6YqE=
+github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q=
 github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
 github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
 github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
+github.com/extism/go-sdk v1.7.1 h1:lWJos6uY+tRFdlIHR+SJjwFDApY7OypS/2nMhiVQ9Sw=
+github.com/extism/go-sdk v1.7.1/go.mod h1:IT+Xdg5AZM9hVtpFUA+uZCJMge/hbvshl8bwzLtFyKA=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -164,6 +168,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvH
 github.com/hashicorp/golang-lru/v2 v2.0.5/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca h1:T54Ema1DU8ngI+aef9ZhAhNGQhcRTrWxVeG07F+c/Rw=
+github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
@@ -311,6 +317,10 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
 github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q=
+github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834/go.mod h1:m9ymHTgNSEjuxvw8E7WWe4Pl4hZQHXONY8wE6dMLaRk=
+github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
+github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
diff --git a/internal/plugin/config.go b/internal/plugin/config.go
index 812dba7f6..83a2e0b25 100644
--- a/internal/plugin/config.go
+++ b/internal/plugin/config.go
@@ -23,7 +23,6 @@ import (
 
 // Config interface defines the methods that all plugin type configurations must implement
 type Config interface {
-	GetType() string
 	Validate() error
 }
 
diff --git a/internal/plugin/loader.go b/internal/plugin/loader.go
index eb05cb722..a58a84126 100644
--- a/internal/plugin/loader.go
+++ b/internal/plugin/loader.go
@@ -22,7 +22,11 @@ import (
 	"os"
 	"path/filepath"
 
+	extism "github.com/extism/go-sdk"
+	"github.com/tetratelabs/wazero"
 	"go.yaml.in/yaml/v3"
+
+	"helm.sh/helm/v4/pkg/helmpath"
 )
 
 func peekAPIVersion(r io.Reader) (string, error) {
@@ -101,12 +105,22 @@ type prototypePluginManager struct {
 	runtimes map[string]Runtime
 }
 
-func newPrototypePluginManager() *prototypePluginManager {
+func newPrototypePluginManager() (*prototypePluginManager, error) {
+
+	cc, err := wazero.NewCompilationCacheWithDir(helmpath.CachePath("wazero-build"))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create wazero compilation cache: %w", err)
+	}
+
 	return &prototypePluginManager{
 		runtimes: map[string]Runtime{
 			"subprocess": &RuntimeSubprocess{},
+			"extism/v1": &RuntimeExtismV1{
+				HostFunctions:    map[string]extism.HostFunction{},
+				CompilationCache: cc,
+			},
 		},
-	}
+	}, nil
 }
 
 func (pm *prototypePluginManager) RegisterRuntime(runtimeName string, runtime Runtime) {
@@ -135,7 +149,10 @@ func LoadDir(dirname string) (Plugin, error) {
 		return nil, fmt.Errorf("failed to load plugin %q: %w", dirname, err)
 	}
 
-	pm := newPrototypePluginManager()
+	pm, err := newPrototypePluginManager()
+	if err != nil {
+		return nil, fmt.Errorf("failed to create plugin manager: %w", err)
+	}
 	return pm.CreatePlugin(dirname, m)
 }
 
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
index 48741474e..bb7e9409f 100644
--- a/internal/plugin/metadata.go
+++ b/internal/plugin/metadata.go
@@ -18,6 +18,8 @@ package plugin
 import (
 	"errors"
 	"fmt"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 )
 
 // Metadata of a plugin, converted from the "on-disk" legacy or v1 plugin.yaml
@@ -183,6 +185,8 @@ func convertMetadataConfig(pluginType string, configRaw map[string]any) (Config,
 	var config Config
 
 	switch pluginType {
+	case "test/v1":
+		config, err = remarshalConfig[*schema.ConfigTestV1](configRaw)
 	case "cli/v1":
 		config, err = remarshalConfig[*ConfigCLI](configRaw)
 	case "getter/v1":
@@ -205,6 +209,8 @@ func convertMetdataRuntimeConfig(runtimeType string, runtimeConfigRaw map[string
 	switch runtimeType {
 	case "subprocess":
 		runtimeConfig, err = remarshalRuntimeConfig[*RuntimeConfigSubprocess](runtimeConfigRaw)
+	case "extism/v1":
+		runtimeConfig, err = remarshalRuntimeConfig[*RuntimeConfigExtismV1](runtimeConfigRaw)
 	default:
 		return nil, fmt.Errorf("unsupported plugin runtime type: %q", runtimeType)
 	}
diff --git a/internal/plugin/plugin_type_registry.go b/internal/plugin/plugin_type_registry.go
new file mode 100644
index 000000000..63450b823
--- /dev/null
+++ b/internal/plugin/plugin_type_registry.go
@@ -0,0 +1,100 @@
+/*
+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.
+*/
+
+/*
+This file contains a "registry" of supported plugin types.
+
+It enables "dyanmic" operations on the go type associated with a given plugin type (see: `helm.sh/helm/v4/internal/plugin/schema` package)
+
+Examples:
+
+```
+
+	// Create a new instance of the output message type for a given plugin type:
+
+	pluginType := "cli/v1" // for example
+	ptm, ok := pluginTypesIndex[pluginType]
+	if !ok {
+		return fmt.Errorf("unknown plugin type %q", pluginType)
+	}
+
+	outputMessageType := reflect.Zero(ptm.outputType).Interface()
+
+```
+
+```
+// Create a new instance of the config type for a given plugin type
+
+	pluginType := "cli/v1" // for example
+	ptm, ok := pluginTypesIndex[pluginType]
+	if !ok {
+		return nil
+	}
+
+	config := reflect.New(ptm.configType).Interface().(Config) // `config` is variable of type `Config`, with
+
+	// validate
+	err := config.Validate()
+	if err != nil { // handle error }
+
+	// assert to concrete type if needed
+	cliConfig := config.(*schema.ConfigCLIV1)
+
+```
+*/
+
+package plugin
+
+import (
+	"reflect"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+)
+
+type pluginTypeMeta struct {
+	pluginType string
+	inputType  reflect.Type
+	outputType reflect.Type
+	configType reflect.Type
+}
+
+var pluginTypes = []pluginTypeMeta{
+	{
+		pluginType: "test/v1",
+		inputType:  reflect.TypeOf(schema.InputMessageTestV1{}),
+		outputType: reflect.TypeOf(schema.OutputMessageTestV1{}),
+		configType: reflect.TypeOf(schema.ConfigTestV1{}),
+	},
+	{
+		pluginType: "cli/v1",
+		inputType:  reflect.TypeOf(schema.InputMessageCLIV1{}),
+		outputType: reflect.TypeOf(schema.OutputMessageCLIV1{}),
+		configType: reflect.TypeOf(ConfigCLI{}),
+	},
+	{
+		pluginType: "getter/v1",
+		inputType:  reflect.TypeOf(schema.InputMessageGetterV1{}),
+		outputType: reflect.TypeOf(schema.OutputMessageGetterV1{}),
+		configType: reflect.TypeOf(ConfigGetter{}),
+	},
+}
+
+var pluginTypesIndex = func() map[string]*pluginTypeMeta {
+	result := make(map[string]*pluginTypeMeta, len(pluginTypes))
+	for _, m := range pluginTypes {
+		result[m.pluginType] = &m
+	}
+	return result
+}()
diff --git a/internal/plugin/plugin_type_registry_test.go b/internal/plugin/plugin_type_registry_test.go
new file mode 100644
index 000000000..ee8a44bb6
--- /dev/null
+++ b/internal/plugin/plugin_type_registry_test.go
@@ -0,0 +1,38 @@
+/*
+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 plugin
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+)
+
+func TestMakeOutputMessage(t *testing.T) {
+	ptm := pluginTypesIndex["getter/v1"]
+	outputType := reflect.Zero(ptm.outputType).Interface()
+	assert.IsType(t, schema.OutputMessageGetterV1{}, outputType)
+
+}
+
+func TestMakeConfig(t *testing.T) {
+	ptm := pluginTypesIndex["getter/v1"]
+	config := reflect.New(ptm.configType).Interface().(Config)
+	assert.IsType(t, &ConfigGetter{}, config)
+}
diff --git a/internal/plugin/runtime.go b/internal/plugin/runtime.go
index 8add92dea..a9c01a380 100644
--- a/internal/plugin/runtime.go
+++ b/internal/plugin/runtime.go
@@ -15,7 +15,11 @@ limitations under the License.
 
 package plugin
 
-import "go.yaml.in/yaml/v3"
+import (
+	"strings"
+
+	"go.yaml.in/yaml/v3"
+)
 
 // Runtime represents a plugin runtime (subprocess, extism, etc) ie. how a plugin should be executed
 // Runtime is responsible for instantiating plugins that implement the runtime
@@ -47,3 +51,25 @@ func remarshalRuntimeConfig[T RuntimeConfig](runtimeData map[string]any) (Runtim
 
 	return config, nil
 }
+
+// parseEnv takes a list of "KEY=value" environment variable strings
+// and transforms the result into a map[KEY]=value
+//
+// - empty input strings are ignored
+// - input strings with no value are stored as empty strings
+// - duplicate keys overwrite earlier values
+func parseEnv(env []string) map[string]string {
+	result := make(map[string]string, len(env))
+	for _, envVar := range env {
+		parts := strings.SplitN(envVar, "=", 2)
+		if len(parts) > 0 && parts[0] != "" {
+			key := parts[0]
+			var value string
+			if len(parts) > 1 {
+				value = parts[1]
+			}
+			result[key] = value
+		}
+	}
+	return result
+}
diff --git a/internal/plugin/runtime_extismv1.go b/internal/plugin/runtime_extismv1.go
new file mode 100644
index 000000000..d3ecff182
--- /dev/null
+++ b/internal/plugin/runtime_extismv1.go
@@ -0,0 +1,297 @@
+/*
+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 plugin
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"reflect"
+
+	extism "github.com/extism/go-sdk"
+	"github.com/tetratelabs/wazero"
+)
+
+const ExtistmV1WasmBinaryFilename = "plugin.wasm"
+
+type RuntimeConfigExtismV1Memory struct {
+	// The max amount of pages the plugin can allocate
+	// One page is 64Kib. e.g. 16 pages would require 1MiB.
+	// Default is 4 pages (256KiB)
+	MaxPages uint32 `yaml:"maxPages,omitempty"`
+
+	// The max size of an Extism HTTP response in bytes
+	// Default is 4096 bytes (4KiB)
+	MaxHTTPResponseBytes int64 `yaml:"maxHttpResponseBytes,omitempty"`
+
+	// The max size of all Extism vars in bytes
+	// Default is 4096 bytes (4KiB)
+	MaxVarBytes int64 `yaml:"maxVarBytes,omitempty"`
+}
+
+type RuntimeConfigExtismV1FileSystem struct {
+	// If specified, a temporary directory will be created and mapped to /tmp in the plugin's filesystem.
+	// Data written to the directory will be visible on the host filesystem.
+	// The directory will be removed when the plugin invocation completes.
+	CreateTempDir bool `yaml:"createTempDir,omitempty"`
+
+	// // An optional set of mappings between the host's filesystem and the paths a plugin can access.
+	// TODO: shuld Helm expose this?
+	//AllowedPaths map[string]string `yaml:"allowedPaths,omitempty"`
+}
+
+// RuntimeConfigExtismV1 defines the user-configurable options the plugin's Extism runtime
+// The format loosely follows the Extism Manifest format: https://extism.org/docs/concepts/manifest/
+type RuntimeConfigExtismV1 struct {
+	// Describes the limits on the memory the plugin may be allocated.
+	Memory RuntimeConfigExtismV1Memory `yaml:"memory"`
+
+	// The "config" key is a free-form map that can be passed to the plugin.
+	// The plugin must interpret arbitrary data this map may contain
+	Config map[string]string `yaml:"config,omitempty"`
+
+	// An optional set of hosts this plugin can communicate with.
+	// This only has an effect if the plugin makes HTTP requests.
+	// If not specified, then no hosts are allowed.
+	AllowedHosts []string `yaml:"allowedHosts,omitempty"`
+
+	FileSystem RuntimeConfigExtismV1FileSystem `yaml:"fileSystem,omitempty"`
+
+	// The timeout in milliseconds for the plugin to execute
+	Timeout uint64 `yaml:"timeout,omitempty"`
+
+	// HostFunction names exposed in Helm the plugin may access
+	// see: https://extism.org/docs/concepts/host-functions/
+	HostFunctions []string `yaml:"hostFunctions,omitempty"`
+
+	// The name of entry function name to call in the plugin
+	// Defaults to "helm_plugin_main".
+	EntryFuncName string `yaml:"entryFuncName,omitempty"`
+}
+
+var _ RuntimeConfig = (*RuntimeConfigExtismV1)(nil)
+
+func (r *RuntimeConfigExtismV1) Validate() error {
+	// TODO
+	return nil
+}
+
+type RuntimeExtismV1 struct {
+	HostFunctions    map[string]extism.HostFunction
+	CompilationCache wazero.CompilationCache
+}
+
+var _ Runtime = (*RuntimeExtismV1)(nil)
+
+func (r *RuntimeExtismV1) CreatePlugin(pluginDir string, metadata *Metadata) (Plugin, error) {
+
+	rc, ok := metadata.RuntimeConfig.(*RuntimeConfigExtismV1)
+	if !ok {
+		return nil, fmt.Errorf("invalid extism/v1 plugin runtime config type: %T", metadata.RuntimeConfig)
+	}
+
+	fmt.Printf("Creating extism/v1 plugin %q with config: %+v\n", metadata.Name, rc)
+
+	wasmFile := filepath.Join(pluginDir, ExtistmV1WasmBinaryFilename)
+	if _, err := os.Stat(wasmFile); err != nil {
+		if os.IsNotExist(err) {
+			return nil, fmt.Errorf("wasm binary missing for extism/v1 plugin: %q", wasmFile)
+		}
+		return nil, fmt.Errorf("failed to stat extism/v1 plugin wasm binary %q: %w", wasmFile, err)
+	}
+
+	return &ExtismV1PluginRuntime{
+		metadata: *metadata,
+		dir:      pluginDir,
+		rc:       rc,
+		r:        r,
+	}, nil
+}
+
+type ExtismV1PluginRuntime struct {
+	metadata Metadata
+	dir      string
+	rc       *RuntimeConfigExtismV1
+	r        *RuntimeExtismV1
+}
+
+var _ Plugin = (*ExtismV1PluginRuntime)(nil)
+
+func (p *ExtismV1PluginRuntime) Metadata() Metadata {
+	return p.metadata
+}
+
+func (p *ExtismV1PluginRuntime) Dir() string {
+	return p.dir
+}
+
+func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Output, error) {
+
+	var tmpDir string
+	if p.rc.FileSystem.CreateTempDir {
+		tmpDir, err := os.MkdirTemp(os.TempDir(), "helm-plugin-*")
+		slog.Debug("created plugin temp dir", slog.String("dir", tmpDir), slog.String("plugin", p.metadata.Name))
+		if err != nil {
+			return nil, fmt.Errorf("failed to create temp dir for extism compilation cache: %w", err)
+		}
+		defer func() {
+			if err := os.RemoveAll(tmpDir); err != nil {
+				slog.Warn("failed to remove plugin temp dir", slog.String("dir", tmpDir), slog.String("plugin", p.metadata.Name), slog.String("error", err.Error()))
+			}
+		}()
+	}
+
+	manifest, err := buildManifest(p.dir, tmpDir, p.rc)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := buildPluginConfig(input, p.r)
+	if err != nil {
+		return nil, err
+	}
+
+	hostFunctions, err := buildHostFunctions(p.r.HostFunctions, p.rc)
+	if err != nil {
+		return nil, err
+	}
+
+	pe, err := extism.NewPlugin(ctx, manifest, config, hostFunctions)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create existing plugin: %w", err)
+	}
+
+	pe.SetLogger(func(logLevel extism.LogLevel, s string) {
+		slog.Debug(s, slog.String("level", logLevel.String()), slog.String("plugin", p.metadata.Name))
+	})
+
+	inputData, err := json.Marshal(input.Message)
+	if err != nil {
+		return nil, fmt.Errorf("failed to json marshel plugin input message: %T: %w", input.Message, err)
+	}
+
+	slog.Debug("plugin input", slog.String("plugin", p.metadata.Name), slog.String("inputData", string(inputData)))
+
+	entryFuncName := p.rc.EntryFuncName
+	if entryFuncName == "" {
+		entryFuncName = "helm_plugin_main"
+	}
+
+	exitCode, outputData, err := pe.Call(entryFuncName, inputData)
+	if err != nil {
+		return nil, fmt.Errorf("plugin error: %w", err)
+	}
+
+	if exitCode != 0 {
+		return nil, &InvokeExecError{
+			Code: int(exitCode),
+		}
+	}
+
+	slog.Debug("plugin output", slog.String("plugin", p.metadata.Name), slog.Int("exitCode", int(exitCode)), slog.String("outputData", string(outputData)))
+
+	outputMessage := reflect.New(pluginTypesIndex[p.metadata.Type].outputType)
+	if err := json.Unmarshal(outputData, outputMessage.Interface()); err != nil {
+		return nil, fmt.Errorf("failed to json marshel plugin output message: %T: %w", outputMessage, err)
+	}
+
+	output := &Output{
+		Message: outputMessage.Elem().Interface(),
+	}
+
+	return output, nil
+}
+
+func buildManifest(pluginDir string, tmpDir string, rc *RuntimeConfigExtismV1) (extism.Manifest, error) {
+	wasmFile := filepath.Join(pluginDir, ExtistmV1WasmBinaryFilename)
+
+	allowedHosts := rc.AllowedHosts
+	if allowedHosts == nil {
+		allowedHosts = []string{}
+	}
+
+	allowedPaths := map[string]string{}
+	if tmpDir != "" {
+		allowedPaths[tmpDir] = "/tmp"
+	}
+
+	return extism.Manifest{
+		Wasm: []extism.Wasm{
+			extism.WasmFile{
+				Path: wasmFile,
+				Name: wasmFile,
+			},
+		},
+		Memory: &extism.ManifestMemory{
+			MaxPages:             rc.Memory.MaxPages,
+			MaxHttpResponseBytes: rc.Memory.MaxHTTPResponseBytes,
+			MaxVarBytes:          rc.Memory.MaxVarBytes,
+		},
+		Config:       rc.Config,
+		AllowedHosts: allowedHosts,
+		AllowedPaths: allowedPaths,
+		Timeout:      rc.Timeout,
+	}, nil
+}
+
+func buildPluginConfig(input *Input, r *RuntimeExtismV1) (extism.PluginConfig, error) {
+
+	mc := wazero.NewModuleConfig().
+		WithSysWalltime()
+	if input.Stdin != nil {
+		mc = mc.WithStdin(input.Stdin)
+	}
+	if input.Stdout != nil {
+		mc = mc.WithStdout(input.Stdout)
+	}
+	if input.Stderr != nil {
+		mc = mc.WithStderr(input.Stderr)
+	}
+	if len(input.Env) > 0 {
+		env := parseEnv(input.Env)
+		for k, v := range env {
+			mc = mc.WithEnv(k, v)
+		}
+	}
+
+	config := extism.PluginConfig{
+		ModuleConfig: mc,
+		RuntimeConfig: wazero.NewRuntimeConfigCompiler().
+			WithCloseOnContextDone(true).
+			WithCompilationCache(r.CompilationCache),
+		EnableWasi:                true,
+		EnableHttpResponseHeaders: true,
+	}
+
+	return config, nil
+}
+
+func buildHostFunctions(hostFunctions map[string]extism.HostFunction, rc *RuntimeConfigExtismV1) ([]extism.HostFunction, error) {
+	result := make([]extism.HostFunction, len(rc.HostFunctions))
+	for _, fnName := range rc.HostFunctions {
+		fn, ok := hostFunctions[fnName]
+		if !ok {
+			return nil, fmt.Errorf("plugin requested host function %q not found", fnName)
+		}
+
+		result = append(result, fn)
+	}
+
+	return result, nil
+}
diff --git a/internal/plugin/runtime_extismv1_test.go b/internal/plugin/runtime_extismv1_test.go
new file mode 100644
index 000000000..8d9c55195
--- /dev/null
+++ b/internal/plugin/runtime_extismv1_test.go
@@ -0,0 +1,124 @@
+/*
+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 plugin
+
+import (
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+
+	extism "github.com/extism/go-sdk"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type pluginRaw struct {
+	Metadata Metadata
+	Dir      string
+}
+
+func buildLoadExtismPlugin(t *testing.T, dir string) pluginRaw {
+	t.Helper()
+
+	pluginFile := filepath.Join(dir, PluginFileName)
+
+	metadataData, err := os.ReadFile(pluginFile)
+	require.NoError(t, err)
+
+	m, err := loadMetadata(metadataData)
+	require.NoError(t, err)
+	require.Equal(t, "extism/v1", m.Runtime, "expected plugin runtime to be extism/v1")
+
+	cmd := exec.Command("make", "-C", dir)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	require.NoError(t, cmd.Run(), "failed to build plugin in %q", dir)
+
+	return pluginRaw{
+		Metadata: *m,
+		Dir:      dir,
+	}
+}
+
+func TestRuntimeConfigExtismV1Validate(t *testing.T) {
+	rc := RuntimeConfigExtismV1{}
+	err := rc.Validate()
+	assert.NoError(t, err, "expected no error for empty RuntimeConfigExtismV1")
+}
+
+func TestRuntimeExtismV1InvokePlugin(t *testing.T) {
+	r := RuntimeExtismV1{}
+
+	pr := buildLoadExtismPlugin(t, "testdata/src/extismv1-test")
+	require.Equal(t, "test/v1", pr.Metadata.Type)
+
+	p, err := r.CreatePlugin(pr.Dir, &pr.Metadata)
+
+	assert.NoError(t, err, "expected no error creating plugin")
+	assert.NotNil(t, p, "expected plugin to be created")
+
+	output, err := p.Invoke(t.Context(), &Input{
+		Message: schema.InputMessageTestV1{
+			Name: "Phippy",
+		},
+	})
+	require.Nil(t, err)
+
+	msg := output.Message.(schema.OutputMessageTestV1)
+	assert.Equal(t, "Hello, Phippy! (6)", msg.Greeting)
+}
+
+func TestBuildManifest(t *testing.T) {
+	rc := &RuntimeConfigExtismV1{
+		Memory: RuntimeConfigExtismV1Memory{
+			MaxPages:             8,
+			MaxHTTPResponseBytes: 81920,
+			MaxVarBytes:          8192,
+		},
+		FileSystem: RuntimeConfigExtismV1FileSystem{
+			CreateTempDir: true,
+		},
+		Config:       map[string]string{"CONFIG_KEY": "config_value"},
+		AllowedHosts: []string{"example.com", "api.example.com"},
+		Timeout:      5000,
+	}
+
+	expected := extism.Manifest{
+		Wasm: []extism.Wasm{
+			extism.WasmFile{
+				Path: "/path/to/plugin/plugin.wasm",
+				Name: "/path/to/plugin/plugin.wasm",
+			},
+		},
+		Memory: &extism.ManifestMemory{
+			MaxPages:             8,
+			MaxHttpResponseBytes: 81920,
+			MaxVarBytes:          8192,
+		},
+		Config:       map[string]string{"CONFIG_KEY": "config_value"},
+		AllowedHosts: []string{"example.com", "api.example.com"},
+		AllowedPaths: map[string]string{"/tmp/foo": "/tmp"},
+		Timeout:      5000,
+	}
+
+	manifest, err := buildManifest("/path/to/plugin", "/tmp/foo", rc)
+	require.NoError(t, err)
+	assert.Equal(t, expected, manifest)
+}
diff --git a/internal/plugin/runtime_test.go b/internal/plugin/runtime_test.go
new file mode 100644
index 000000000..8b72648b2
--- /dev/null
+++ b/internal/plugin/runtime_test.go
@@ -0,0 +1,63 @@
+/*
+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 plugin
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseEnv(t *testing.T) {
+	type testCase struct {
+		env      []string
+		expected map[string]string
+	}
+
+	testCases := map[string]testCase{
+		"empty": {
+			env:      []string{},
+			expected: map[string]string{},
+		},
+		"single": {
+			env:      []string{"KEY=value"},
+			expected: map[string]string{"KEY": "value"},
+		},
+		"multiple": {
+			env:      []string{"KEY1=value1", "KEY2=value2"},
+			expected: map[string]string{"KEY1": "value1", "KEY2": "value2"},
+		},
+		"no_value": {
+			env:      []string{"KEY1=value1", "KEY2="},
+			expected: map[string]string{"KEY1": "value1", "KEY2": ""},
+		},
+		"duplicate_keys": {
+			env:      []string{"KEY=value1", "KEY=value2"},
+			expected: map[string]string{"KEY": "value2"}, // last value should overwrite
+		},
+		"empty_strings": {
+			env:      []string{"", "KEY=value", ""},
+			expected: map[string]string{"KEY": "value"},
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			result := parseEnv(tc.env)
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}
diff --git a/internal/plugin/schema/test.go b/internal/plugin/schema/test.go
new file mode 100644
index 000000000..97efa0fde
--- /dev/null
+++ b/internal/plugin/schema/test.go
@@ -0,0 +1,28 @@
+/*
+ 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 schema
+
+type InputMessageTestV1 struct {
+	Name string
+}
+
+type OutputMessageTestV1 struct {
+	Greeting string
+}
+
+type ConfigTestV1 struct{}
+
+func (c *ConfigTestV1) Validate() error {
+	return nil
+}
diff --git a/internal/plugin/testdata/src/extismv1-test/.gitignore b/internal/plugin/testdata/src/extismv1-test/.gitignore
new file mode 100644
index 000000000..ef7d91fbb
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/.gitignore
@@ -0,0 +1 @@
+plugin.wasm
diff --git a/internal/plugin/testdata/src/extismv1-test/Makefile b/internal/plugin/testdata/src/extismv1-test/Makefile
new file mode 100644
index 000000000..24da1f371
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/Makefile
@@ -0,0 +1,12 @@
+
+.DEFAULT: build
+.PHONY: build test vet
+
+.PHONY: plugin.wasm
+plugin.wasm:
+	GOOS=wasip1 GOARCH=wasm go build -buildmode=c-shared -o plugin.wasm .
+
+build: plugin.wasm
+
+vet:
+	GOOS=wasip1 GOARCH=wasm go vet ./...
diff --git a/internal/plugin/testdata/src/extismv1-test/go.mod b/internal/plugin/testdata/src/extismv1-test/go.mod
new file mode 100644
index 000000000..baed75fab
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/go.mod
@@ -0,0 +1,5 @@
+module helm.sh/helm/v4/internal/plugin/src/extismv1-test
+
+go 1.25.0
+
+require github.com/extism/go-pdk v1.1.3
diff --git a/internal/plugin/testdata/src/extismv1-test/go.sum b/internal/plugin/testdata/src/extismv1-test/go.sum
new file mode 100644
index 000000000..c15d38292
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/go.sum
@@ -0,0 +1,2 @@
+github.com/extism/go-pdk v1.1.3 h1:hfViMPWrqjN6u67cIYRALZTZLk/enSPpNKa+rZ9X2SQ=
+github.com/extism/go-pdk v1.1.3/go.mod h1:Gz+LIU/YCKnKXhgge8yo5Yu1F/lbv7KtKFkiCSzW/P4=
diff --git a/internal/plugin/testdata/src/extismv1-test/main.go b/internal/plugin/testdata/src/extismv1-test/main.go
new file mode 100644
index 000000000..40311329d
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/main.go
@@ -0,0 +1,61 @@
+package main
+
+import (
+	_ "embed"
+	"fmt"
+
+	pdk "github.com/extism/go-pdk"
+)
+
+type InputMessageTestV1 struct {
+	Name string
+}
+
+type OutputMessageTestV1 struct {
+	Greeting string
+}
+
+type ConfigTestV1 struct{}
+
+func runGetterPluginImpl(input InputMessageTestV1) (*OutputMessageTestV1, error) {
+	name := input.Name
+	return &OutputMessageTestV1{
+		Greeting: fmt.Sprintf("Hello, %s! (%d)", name, len(name)),
+	}, nil
+}
+
+func RunGetterPlugin() error {
+	var input InputMessageTestV1
+	if err := pdk.InputJSON(&input); err != nil {
+		return fmt.Errorf("failed to parse input json: %w", err)
+	}
+
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Received input: %+v", input))
+	output, err := runGetterPluginImpl(input)
+	if err != nil {
+		pdk.Log(pdk.LogError, fmt.Sprintf("failed: %s", err.Error()))
+		return err
+	}
+
+	pdk.Log(pdk.LogDebug, fmt.Sprintf("Sending output: %+v", output))
+	if err := pdk.OutputJSON(output); err != nil {
+		return fmt.Errorf("failed to write output json: %w", err)
+	}
+
+	return nil
+}
+
+//go:wasmexport helm_plugin_main
+func HelmPlugin() uint32 {
+	pdk.Log(pdk.LogDebug, "running example-extism-getter plugin")
+
+	if err := RunGetterPlugin(); err != nil {
+		pdk.Log(pdk.LogError, err.Error())
+		pdk.SetError(err)
+		return 1
+	}
+
+	return 0
+}
+
+func main() {}
diff --git a/internal/plugin/testdata/src/extismv1-test/plugin.yaml b/internal/plugin/testdata/src/extismv1-test/plugin.yaml
new file mode 100644
index 000000000..2d3694fe6
--- /dev/null
+++ b/internal/plugin/testdata/src/extismv1-test/plugin.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+type: test/v1
+name: extismv1-test
+version: 0.1.0
+runtime: extism/v1
\ No newline at end of file

From b6545e903a1184423a09b4728d5e8a6215c651e1 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 27 Aug 2025 08:18:36 -0700
Subject: [PATCH 163/211] code review + bug fixes

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 internal/plugin/runtime_extismv1.go           | 33 ++++++++-----------
 .../plugin/testdata/src/extismv1-test/main.go |  9 ++++-
 .../testdata/src/extismv1-test/plugin.yaml    |  5 ++-
 pkg/getter/plugingetter.go                    |  2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/internal/plugin/runtime_extismv1.go b/internal/plugin/runtime_extismv1.go
index d3ecff182..a39fc2d48 100644
--- a/internal/plugin/runtime_extismv1.go
+++ b/internal/plugin/runtime_extismv1.go
@@ -28,8 +28,9 @@ import (
 	"github.com/tetratelabs/wazero"
 )
 
-const ExtistmV1WasmBinaryFilename = "plugin.wasm"
+const ExtismV1WasmBinaryFilename = "plugin.wasm"
 
+// RuntimeConfigExtismV1Memory exposes the Wasm/Extism memory options for the plugin
 type RuntimeConfigExtismV1Memory struct {
 	// The max amount of pages the plugin can allocate
 	// One page is 64Kib. e.g. 16 pages would require 1MiB.
@@ -45,15 +46,13 @@ type RuntimeConfigExtismV1Memory struct {
 	MaxVarBytes int64 `yaml:"maxVarBytes,omitempty"`
 }
 
+// RuntimeConfigExtismV1FileSystem exposes filesystem options for the configuration
+// TODO: should Helm expose AllowedPaths?
 type RuntimeConfigExtismV1FileSystem struct {
 	// If specified, a temporary directory will be created and mapped to /tmp in the plugin's filesystem.
 	// Data written to the directory will be visible on the host filesystem.
 	// The directory will be removed when the plugin invocation completes.
 	CreateTempDir bool `yaml:"createTempDir,omitempty"`
-
-	// // An optional set of mappings between the host's filesystem and the paths a plugin can access.
-	// TODO: shuld Helm expose this?
-	//AllowedPaths map[string]string `yaml:"allowedPaths,omitempty"`
 }
 
 // RuntimeConfigExtismV1 defines the user-configurable options the plugin's Extism runtime
@@ -106,9 +105,7 @@ func (r *RuntimeExtismV1) CreatePlugin(pluginDir string, metadata *Metadata) (Pl
 		return nil, fmt.Errorf("invalid extism/v1 plugin runtime config type: %T", metadata.RuntimeConfig)
 	}
 
-	fmt.Printf("Creating extism/v1 plugin %q with config: %+v\n", metadata.Name, rc)
-
-	wasmFile := filepath.Join(pluginDir, ExtistmV1WasmBinaryFilename)
+	wasmFile := filepath.Join(pluginDir, ExtismV1WasmBinaryFilename)
 	if _, err := os.Stat(wasmFile); err != nil {
 		if os.IsNotExist(err) {
 			return nil, fmt.Errorf("wasm binary missing for extism/v1 plugin: %q", wasmFile)
@@ -145,7 +142,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 
 	var tmpDir string
 	if p.rc.FileSystem.CreateTempDir {
-		tmpDir, err := os.MkdirTemp(os.TempDir(), "helm-plugin-*")
+		tmpDirInner, err := os.MkdirTemp(os.TempDir(), "helm-plugin-*")
 		slog.Debug("created plugin temp dir", slog.String("dir", tmpDir), slog.String("plugin", p.metadata.Name))
 		if err != nil {
 			return nil, fmt.Errorf("failed to create temp dir for extism compilation cache: %w", err)
@@ -155,6 +152,8 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 				slog.Warn("failed to remove plugin temp dir", slog.String("dir", tmpDir), slog.String("plugin", p.metadata.Name), slog.String("error", err.Error()))
 			}
 		}()
+
+		tmpDir = tmpDirInner
 	}
 
 	manifest, err := buildManifest(p.dir, tmpDir, p.rc)
@@ -162,10 +161,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 		return nil, err
 	}
 
-	config, err := buildPluginConfig(input, p.r)
-	if err != nil {
-		return nil, err
-	}
+	config := buildPluginConfig(input, p.r)
 
 	hostFunctions, err := buildHostFunctions(p.r.HostFunctions, p.rc)
 	if err != nil {
@@ -183,7 +179,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 
 	inputData, err := json.Marshal(input.Message)
 	if err != nil {
-		return nil, fmt.Errorf("failed to json marshel plugin input message: %T: %w", input.Message, err)
+		return nil, fmt.Errorf("failed to json marshal plugin input message: %T: %w", input.Message, err)
 	}
 
 	slog.Debug("plugin input", slog.String("plugin", p.metadata.Name), slog.String("inputData", string(inputData)))
@@ -208,7 +204,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 
 	outputMessage := reflect.New(pluginTypesIndex[p.metadata.Type].outputType)
 	if err := json.Unmarshal(outputData, outputMessage.Interface()); err != nil {
-		return nil, fmt.Errorf("failed to json marshel plugin output message: %T: %w", outputMessage, err)
+		return nil, fmt.Errorf("failed to json marshal plugin output message: %T: %w", outputMessage, err)
 	}
 
 	output := &Output{
@@ -219,7 +215,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 }
 
 func buildManifest(pluginDir string, tmpDir string, rc *RuntimeConfigExtismV1) (extism.Manifest, error) {
-	wasmFile := filepath.Join(pluginDir, ExtistmV1WasmBinaryFilename)
+	wasmFile := filepath.Join(pluginDir, ExtismV1WasmBinaryFilename)
 
 	allowedHosts := rc.AllowedHosts
 	if allowedHosts == nil {
@@ -250,8 +246,7 @@ func buildManifest(pluginDir string, tmpDir string, rc *RuntimeConfigExtismV1) (
 	}, nil
 }
 
-func buildPluginConfig(input *Input, r *RuntimeExtismV1) (extism.PluginConfig, error) {
-
+func buildPluginConfig(input *Input, r *RuntimeExtismV1) extism.PluginConfig {
 	mc := wazero.NewModuleConfig().
 		WithSysWalltime()
 	if input.Stdin != nil {
@@ -279,7 +274,7 @@ func buildPluginConfig(input *Input, r *RuntimeExtismV1) (extism.PluginConfig, e
 		EnableHttpResponseHeaders: true,
 	}
 
-	return config, nil
+	return config
 }
 
 func buildHostFunctions(hostFunctions map[string]extism.HostFunction, rc *RuntimeConfigExtismV1) ([]extism.HostFunction, error) {
diff --git a/internal/plugin/testdata/src/extismv1-test/main.go b/internal/plugin/testdata/src/extismv1-test/main.go
index 40311329d..31c739a5b 100644
--- a/internal/plugin/testdata/src/extismv1-test/main.go
+++ b/internal/plugin/testdata/src/extismv1-test/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	_ "embed"
 	"fmt"
+	"os"
 
 	pdk "github.com/extism/go-pdk"
 )
@@ -19,8 +20,14 @@ type ConfigTestV1 struct{}
 
 func runGetterPluginImpl(input InputMessageTestV1) (*OutputMessageTestV1, error) {
 	name := input.Name
+
+	greeting := fmt.Sprintf("Hello, %s! (%d)", name, len(name))
+	err := os.WriteFile("/tmp/greeting.txt", []byte(greeting), 0o600)
+	if err != nil {
+		return nil, fmt.Errorf("failed to write temp file: %w", err)
+	}
 	return &OutputMessageTestV1{
-		Greeting: fmt.Sprintf("Hello, %s! (%d)", name, len(name)),
+		Greeting: greeting,
 	}, nil
 }
 
diff --git a/internal/plugin/testdata/src/extismv1-test/plugin.yaml b/internal/plugin/testdata/src/extismv1-test/plugin.yaml
index 2d3694fe6..fea1e3f66 100644
--- a/internal/plugin/testdata/src/extismv1-test/plugin.yaml
+++ b/internal/plugin/testdata/src/extismv1-test/plugin.yaml
@@ -3,4 +3,7 @@ apiVersion: v1
 type: test/v1
 name: extismv1-test
 version: 0.1.0
-runtime: extism/v1
\ No newline at end of file
+runtime: extism/v1
+runtimeConfig:
+  fileSystem:
+    createTempDir: true
\ No newline at end of file
diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index 2b7669f23..b2dfb3e42 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -116,7 +116,7 @@ func (g *getterPlugin) Get(href string, options ...Option) (*bytes.Buffer, error
 		return nil, fmt.Errorf("plugin %q failed to invoke: %w", g.plg, err)
 	}
 
-	outputMessage, ok := output.Message.(*schema.OutputMessageGetterV1)
+	outputMessage, ok := output.Message.(schema.OutputMessageGetterV1)
 	if !ok {
 		return nil, fmt.Errorf("invalid output message type from plugin %q", g.plg.Metadata().Name)
 	}

From 284bd980b67f2be59b989abcc30ed2549936f2a6 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 27 Aug 2025 04:52:18 -0600
Subject: [PATCH 164/211] fix: replace pkg/engine regular expressions with
 parser

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/engine/engine.go | 131 ++++++++++++++++++++++++++++---------------
 1 file changed, 85 insertions(+), 46 deletions(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 6e47a0e39..b42fa3219 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -34,18 +34,6 @@ import (
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
-// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
-// > "template: %s: executing %q at <%s>: %s"
-var execErrFmt = regexp.MustCompile(`^template: (?P<templateName>(?U).+): executing (?P<functionName>(?U).+) at (?P<location>(?U).+): (?P<errMsg>(?U).+)(?P<nextErr>( template:.*)?)$`)
-
-// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
-// > "template: %s: %s"
-var execErrFmtWithoutTemplate = regexp.MustCompile(`^template: (?P<templateName>(?U).+): (?P<errMsg>.*)(?P<nextErr>( template:.*)?)$`)
-
-// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191
-// > "template: no template %q associated with template %q"
-var execErrNoTemplateAssociated = regexp.MustCompile(`^template: no template (?P<location>.*) associated with template (?P<functionName>(.*)?)$`)
-
 // Engine is an implementation of the Helm rendering implementation for templates.
 type Engine struct {
 	// If strict is enabled, template rendering will fail if a template references
@@ -338,7 +326,7 @@ func cleanupParseError(filename string, err error) error {
 	location := tokens[1]
 	// The remaining tokens make up a stacktrace-like chain, ending with the relevant error
 	errMsg := tokens[len(tokens)-1]
-	return fmt.Errorf("parse error at (%s): %s", string(location), errMsg)
+	return fmt.Errorf("parse error at (%s): %s", location, errMsg)
 }
 
 type TraceableError struct {
@@ -350,25 +338,97 @@ type TraceableError struct {
 func (t TraceableError) String() string {
 	var errorString strings.Builder
 	if t.location != "" {
-		fmt.Fprintf(&errorString, "%s\n  ", t.location)
+		_, _ = fmt.Fprintf(&errorString, "%s\n  ", t.location)
 	}
 	if t.executedFunction != "" {
-		fmt.Fprintf(&errorString, "%s\n    ", t.executedFunction)
+		_, _ = fmt.Fprintf(&errorString, "%s\n    ", t.executedFunction)
 	}
 	if t.message != "" {
-		fmt.Fprintf(&errorString, "%s\n", t.message)
+		_, _ = fmt.Fprintf(&errorString, "%s\n", t.message)
 	}
 	return errorString.String()
 }
 
+// parseTemplateExecErrorString parses a template execution error string from text/template
+// without using regular expressions. It returns a TraceableError and true if parsing succeeded.
+func parseTemplateExecErrorString(s string) (TraceableError, bool) {
+	const prefix = "template: "
+	if !strings.HasPrefix(s, prefix) {
+		return TraceableError{}, false
+	}
+	remainder := s[len(prefix):]
+
+	// Special case: "template: no template %q associated with template %q"
+	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191
+	if strings.HasPrefix(remainder, "no template ") {
+		return TraceableError{message: s}, true
+	}
+
+	// Executing form: "<templateName>: executing \"<funcName>\" at <<location>>: <errMsg>[ template:...]"
+	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
+	if idx := strings.Index(remainder, ": executing "); idx != -1 {
+		templateName := remainder[:idx]
+		after := remainder[idx+len(": executing "):]
+		if len(after) == 0 || after[0] != '"' {
+			return TraceableError{}, false
+		}
+		// find closing quote for function name
+		endQuote := strings.IndexByte(after[1:], '"')
+		if endQuote == -1 {
+			return TraceableError{}, false
+		}
+		endQuote++ // account for offset we started at 1
+		functionName := after[1:endQuote]
+		afterFunc := after[endQuote+1:]
+
+		// expect: " at <" then location then ">: " then message
+		const atPrefix = " at <"
+		if !strings.HasPrefix(afterFunc, atPrefix) {
+			return TraceableError{}, false
+		}
+		afterAt := afterFunc[len(atPrefix):]
+		endLoc := strings.Index(afterAt, ">: ")
+		if endLoc == -1 {
+			return TraceableError{}, false
+		}
+		locationName := afterAt[:endLoc]
+		errMsg := afterAt[endLoc+len(">: "):]
+
+		// trim chained next error starting with space + "template:" if present
+		if cut := strings.Index(errMsg, " template:"); cut != -1 {
+			errMsg = errMsg[:cut]
+		}
+		return TraceableError{
+			location:         templateName,
+			message:          errMsg,
+			executedFunction: "executing \"" + functionName + "\" at <" + locationName + ">:",
+		}, true
+	}
+
+	// Simple form: "<templateName>: <errMsg>"
+	// Use LastIndex to avoid splitting colons within line:col info.
+	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
+	if sep := strings.LastIndex(remainder, ": "); sep != -1 {
+		templateName := remainder[:sep]
+		errMsg := remainder[sep+2:]
+		if cut := strings.Index(errMsg, " template:"); cut != -1 {
+			errMsg = errMsg[:cut]
+		}
+		return TraceableError{location: templateName, message: errMsg}, true
+	}
+
+	return TraceableError{}, false
+}
+
 // reformatExecErrorMsg takes an error message for template rendering and formats it into a formatted
 // multi-line error string
 func reformatExecErrorMsg(filename string, err error) error {
-	// This function matches the error message against regex's for the text/template package.
-	// If the regex's can parse out details from that error message such as the line number, template it failed on,
+	// This function parses the error message produced by text/template package.
+	// If it can parse out details from that error message such as the line number, template it failed on,
 	// and error description, then it will construct a new error that displays these details in a structured way.
 	// If there are issues with parsing the error message, the err passed into the function should return instead.
-	if _, isExecError := err.(template.ExecError); !isExecError {
+	var execError template.ExecError
+	if !errors.As(err, &execError) {
 		return err
 	}
 
@@ -384,45 +444,24 @@ func reformatExecErrorMsg(filename string, err error) error {
 
 	parts := warnRegex.FindStringSubmatch(tokens[2])
 	if len(parts) >= 2 {
-		return fmt.Errorf("execution error at (%s): %s", string(location), parts[1])
+		return fmt.Errorf("execution error at (%s): %s", location, parts[1])
 	}
 	current := err
-	fileLocations := []TraceableError{}
+	var fileLocations []TraceableError
 	for current != nil {
-		var traceable TraceableError
-		if matches := execErrFmt.FindStringSubmatch(current.Error()); matches != nil {
-			templateName := matches[execErrFmt.SubexpIndex("templateName")]
-			functionName := matches[execErrFmt.SubexpIndex("functionName")]
-			locationName := matches[execErrFmt.SubexpIndex("location")]
-			errMsg := matches[execErrFmt.SubexpIndex("errMsg")]
-			traceable = TraceableError{
-				location:         templateName,
-				message:          errMsg,
-				executedFunction: "executing " + functionName + " at " + locationName + ":",
-			}
-		} else if matches := execErrFmtWithoutTemplate.FindStringSubmatch(current.Error()); matches != nil {
-			templateName := matches[execErrFmt.SubexpIndex("templateName")]
-			errMsg := matches[execErrFmt.SubexpIndex("errMsg")]
-			traceable = TraceableError{
-				location: templateName,
-				message:  errMsg,
-			}
-		} else if matches := execErrNoTemplateAssociated.FindStringSubmatch(current.Error()); matches != nil {
-			traceable = TraceableError{
-				message: current.Error(),
+		if tr, ok := parseTemplateExecErrorString(current.Error()); ok {
+			if len(fileLocations) == 0 || fileLocations[len(fileLocations)-1] != tr {
+				fileLocations = append(fileLocations, tr)
 			}
 		} else {
 			return err
 		}
-		if len(fileLocations) == 0 || fileLocations[len(fileLocations)-1] != traceable {
-			fileLocations = append(fileLocations, traceable)
-		}
 		current = errors.Unwrap(current)
 	}
 
 	var finalErrorString strings.Builder
 	for _, fileLocation := range fileLocations {
-		fmt.Fprintf(&finalErrorString, "%s", fileLocation.String())
+		_, _ = fmt.Fprintf(&finalErrorString, "%s", fileLocation.String())
 	}
 
 	return errors.New(strings.TrimSpace(finalErrorString.String()))

From 6273f9b38e22632b3b36b3cd142ad461f97c5e96 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 27 Aug 2025 08:18:26 -0600
Subject: [PATCH 165/211] fix: flaky registry data race on mockdns close

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/client_http_test.go         |  5 +----
 pkg/registry/client_insecure_tls_test.go |  5 +----
 pkg/registry/client_tls_test.go          |  5 +----
 pkg/registry/utils_test.go               | 20 ++++++++++----------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/pkg/registry/client_http_test.go b/pkg/registry/client_http_test.go
index 043fd4205..dddd29ee9 100644
--- a/pkg/registry/client_http_test.go
+++ b/pkg/registry/client_http_test.go
@@ -32,10 +32,7 @@ type HTTPRegistryClientTestSuite struct {
 
 func (suite *HTTPRegistryClientTestSuite) SetupSuite() {
 	// init test client
-	dockerRegistry := setup(&suite.TestSuite, false, false)
-
-	// Start Docker registry
-	go dockerRegistry.ListenAndServe()
+	setup(&suite.TestSuite, false, false)
 }
 
 func (suite *HTTPRegistryClientTestSuite) TearDownSuite() {
diff --git a/pkg/registry/client_insecure_tls_test.go b/pkg/registry/client_insecure_tls_test.go
index accbf1670..03354475a 100644
--- a/pkg/registry/client_insecure_tls_test.go
+++ b/pkg/registry/client_insecure_tls_test.go
@@ -29,10 +29,7 @@ type InsecureTLSRegistryClientTestSuite struct {
 
 func (suite *InsecureTLSRegistryClientTestSuite) SetupSuite() {
 	// init test client
-	dockerRegistry := setup(&suite.TestSuite, true, true)
-
-	// Start Docker registry
-	go dockerRegistry.ListenAndServe()
+	setup(&suite.TestSuite, true, true)
 }
 
 func (suite *InsecureTLSRegistryClientTestSuite) TearDownSuite() {
diff --git a/pkg/registry/client_tls_test.go b/pkg/registry/client_tls_test.go
index 0897858b5..2bf1750a9 100644
--- a/pkg/registry/client_tls_test.go
+++ b/pkg/registry/client_tls_test.go
@@ -31,10 +31,7 @@ type TLSRegistryClientTestSuite struct {
 
 func (suite *TLSRegistryClientTestSuite) SetupSuite() {
 	// init test client
-	dockerRegistry := setup(&suite.TestSuite, true, false)
-
-	// Start Docker registry
-	go dockerRegistry.ListenAndServe()
+	setup(&suite.TestSuite, true, false)
 }
 
 func (suite *TLSRegistryClientTestSuite) TearDownSuite() {
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index b46317fc6..781f3dd75 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -29,7 +29,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/distribution/distribution/v3/configuration"
@@ -65,12 +64,13 @@ type TestSuite struct {
 	CompromisedRegistryHost string
 	WorkspaceDir            string
 	RegistryClient          *Client
+	dockerRegistry          *registry.Registry
 
 	// A mock DNS server needed for TLS connection testing.
 	srv *mockdns.Server
 }
 
-func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
+func setup(suite *TestSuite, tlsEnabled, insecure bool) {
 	suite.WorkspaceDir = testWorkspaceDir
 	os.RemoveAll(suite.WorkspaceDir)
 	os.Mkdir(suite.WorkspaceDir, 0700)
@@ -166,20 +166,20 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry {
 			config.HTTP.TLS.ClientCAs = []string{tlsCA}
 		}
 	}
-	dockerRegistry, err := registry.NewRegistry(context.Background(), config)
+	suite.dockerRegistry, err = registry.NewRegistry(context.Background(), config)
 	suite.Nil(err, "no error creating test registry")
 
 	suite.CompromisedRegistryHost = initCompromisedRegistryTestServer()
-	return dockerRegistry
+	go func() {
+		_ = suite.dockerRegistry.ListenAndServe()
+		_ = suite.srv.Close()
+		mockdns.UnpatchNet(net.DefaultResolver)
+	}()
 }
 
 func teardown(suite *TestSuite) {
-	var lock sync.Mutex
-	lock.Lock()
-	defer lock.Unlock()
-	if suite.srv != nil {
-		mockdns.UnpatchNet(net.DefaultResolver)
-		suite.srv.Close()
+	if suite.dockerRegistry != nil {
+		_ = suite.dockerRegistry.Shutdown(context.Background())
 	}
 }
 

From ce97a2449e24bc7985e1ad614b0a8b1713d10894 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 27 Aug 2025 10:41:46 -0600
Subject: [PATCH 166/211] fix: move mockdns to packge level

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/registry/main_test.go  | 51 ++++++++++++++++++++++++++++++++++++++
 pkg/registry/utils_test.go | 13 ----------
 2 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 pkg/registry/main_test.go

diff --git a/pkg/registry/main_test.go b/pkg/registry/main_test.go
new file mode 100644
index 000000000..4f6e11e4f
--- /dev/null
+++ b/pkg/registry/main_test.go
@@ -0,0 +1,51 @@
+/*
+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 registry
+
+import (
+	"net"
+	"os"
+	"testing"
+
+	"github.com/foxcpp/go-mockdns"
+)
+
+func TestMain(m *testing.M) {
+	// A mock DNS server needed for TLS connection testing.
+	var srv *mockdns.Server
+	var err error
+
+	srv, err = mockdns.NewServer(map[string]mockdns.Zone{
+		"helm-test-registry.": {
+			A: []string{"127.0.0.1"},
+		},
+	}, false)
+	if err != nil {
+		panic(err)
+	}
+
+	saveDialFunction := net.DefaultResolver.Dial
+	srv.PatchNet(net.DefaultResolver)
+
+	// Run all tests in the package
+	code := m.Run()
+
+	net.DefaultResolver.Dial = saveDialFunction
+	_ = srv.Close()
+
+	os.Exit(code)
+}
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index 781f3dd75..1da90566f 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -35,7 +35,6 @@ import (
 	"github.com/distribution/distribution/v3/registry"
 	_ "github.com/distribution/distribution/v3/registry/auth/htpasswd"
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
-	"github.com/foxcpp/go-mockdns"
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/crypto/bcrypt"
 
@@ -65,9 +64,6 @@ type TestSuite struct {
 	WorkspaceDir            string
 	RegistryClient          *Client
 	dockerRegistry          *registry.Registry
-
-	// A mock DNS server needed for TLS connection testing.
-	srv *mockdns.Server
 }
 
 func setup(suite *TestSuite, tlsEnabled, insecure bool) {
@@ -135,13 +131,6 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) {
 	// host is localhost/127.0.0.1.
 	port := ln.Addr().(*net.TCPAddr).Port
 	suite.DockerRegistryHost = fmt.Sprintf("helm-test-registry:%d", port)
-	suite.srv, err = mockdns.NewServer(map[string]mockdns.Zone{
-		"helm-test-registry.": {
-			A: []string{"127.0.0.1"},
-		},
-	}, false)
-	suite.Nil(err, "no error creating mock DNS server")
-	suite.srv.PatchNet(net.DefaultResolver)
 
 	config.HTTP.Addr = ln.Addr().String()
 	config.HTTP.DrainTimeout = time.Duration(10) * time.Second
@@ -172,8 +161,6 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) {
 	suite.CompromisedRegistryHost = initCompromisedRegistryTestServer()
 	go func() {
 		_ = suite.dockerRegistry.ListenAndServe()
-		_ = suite.srv.Close()
-		mockdns.UnpatchNet(net.DefaultResolver)
 	}()
 }
 

From e5b612626e21a7b90caa4df546a7628da06b7c51 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 27 Aug 2025 10:13:27 -0700
Subject: [PATCH 167/211] fixup slog tmpDirInner

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 internal/plugin/runtime_extismv1.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/plugin/runtime_extismv1.go b/internal/plugin/runtime_extismv1.go
index a39fc2d48..c0122d08f 100644
--- a/internal/plugin/runtime_extismv1.go
+++ b/internal/plugin/runtime_extismv1.go
@@ -143,7 +143,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 	var tmpDir string
 	if p.rc.FileSystem.CreateTempDir {
 		tmpDirInner, err := os.MkdirTemp(os.TempDir(), "helm-plugin-*")
-		slog.Debug("created plugin temp dir", slog.String("dir", tmpDir), slog.String("plugin", p.metadata.Name))
+		slog.Debug("created plugin temp dir", slog.String("dir", tmpDirInner), slog.String("plugin", p.metadata.Name))
 		if err != nil {
 			return nil, fmt.Errorf("failed to create temp dir for extism compilation cache: %w", err)
 		}

From 2658a00863a9dd13cb023b68707d1a82cbd1e9ed Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Wed, 27 Aug 2025 10:21:16 -0700
Subject: [PATCH 168/211] fix output message value

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 internal/plugin/runtime_subprocess.go        |  2 +-
 internal/plugin/runtime_subprocess_getter.go |  2 +-
 pkg/getter/plugingetter_test.go              | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
index 286c1abeb..163f0621f 100644
--- a/internal/plugin/runtime_subprocess.go
+++ b/internal/plugin/runtime_subprocess.go
@@ -212,7 +212,7 @@ func (r *SubprocessPluginRuntime) runCLI(input *Input) (*Output, error) {
 	}
 
 	return &Output{
-		Message: &schema.OutputMessageCLIV1{},
+		Message: schema.OutputMessageCLIV1{},
 	}, nil
 }
 
diff --git a/internal/plugin/runtime_subprocess_getter.go b/internal/plugin/runtime_subprocess_getter.go
index 6f9bfea91..af2d0c572 100644
--- a/internal/plugin/runtime_subprocess_getter.go
+++ b/internal/plugin/runtime_subprocess_getter.go
@@ -85,7 +85,7 @@ func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
 	}
 
 	return &Output{
-		Message: &schema.OutputMessageGetterV1{
+		Message: schema.OutputMessageGetterV1{
 			Data: buf.Bytes(),
 		},
 	}, nil
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index 1c0f5593f..8e0619635 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -95,16 +95,16 @@ func TestConvertOptions(t *testing.T) {
 	assert.Equal(t, expected, opts)
 }
 
-type TestPlugin struct {
+type testPlugin struct {
 	t   *testing.T
 	dir string
 }
 
-func (t *TestPlugin) Dir() string {
+func (t *testPlugin) Dir() string {
 	return t.dir
 }
 
-func (t *TestPlugin) Metadata() plugin.Metadata {
+func (t *testPlugin) Metadata() plugin.Metadata {
 	return plugin.Metadata{
 		Name:       "fake-plugin",
 		Type:       "cli/v1",
@@ -121,22 +121,22 @@ func (t *TestPlugin) Metadata() plugin.Metadata {
 	}
 }
 
-func (t *TestPlugin) Invoke(_ context.Context, _ *plugin.Input) (*plugin.Output, error) {
+func (t *testPlugin) Invoke(_ context.Context, _ *plugin.Input) (*plugin.Output, error) {
 	// Simulate a plugin invocation
 	output := &plugin.Output{
-		Message: &schema.OutputMessageGetterV1{
+		Message: schema.OutputMessageGetterV1{
 			Data: []byte("fake-plugin output"),
 		},
 	}
 	return output, nil
 }
 
-var _ plugin.Plugin = (*TestPlugin)(nil)
+var _ plugin.Plugin = (*testPlugin)(nil)
 
 func TestGetterPlugin(t *testing.T) {
 	gp := getterPlugin{
 		options: []Option{},
-		plg:     &TestPlugin{t: t, dir: "fake/dir"},
+		plg:     &testPlugin{t: t, dir: "fake/dir"},
 	}
 
 	buf, err := gp.Get("test://example.com", WithTimeout(5*time.Second))

From d985122a2686dc88d92558583c1de950d5890887 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 16:40:28 +0000
Subject: [PATCH 169/211] chore(deps): bump github.com/stretchr/testify from
 1.11.0 to 1.11.1

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-version: 1.11.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 8cff102c9..7099e9d46 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.7
-	github.com/stretchr/testify v1.11.0
+	github.com/stretchr/testify v1.11.1
 	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.41.0
diff --git a/go.sum b/go.sum
index 9b41a7c39..1a1601366 100644
--- a/go.sum
+++ b/go.sum
@@ -315,8 +315,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
-github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q=
 github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834/go.mod h1:m9ymHTgNSEjuxvw8E7WWe4Pl4hZQHXONY8wE6dMLaRk=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=

From 15bbb4406c72ed5a9981a7eb67fbbfa334b9948a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 21:13:46 +0000
Subject: [PATCH 170/211] chore(deps): bump the k8s-io group with 7 updates

Bumps the k8s-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.33.4` | `0.34.0` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.4` | `0.34.0` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.4` | `0.34.0` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.33.4` | `0.34.0` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.4` | `0.34.0` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.4` | `0.34.0` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.33.4` | `0.34.0` |


Updates `k8s.io/api` from 0.33.4 to 0.34.0
- [Commits](https://github.com/kubernetes/api/compare/v0.33.4...v0.34.0)

Updates `k8s.io/apiextensions-apiserver` from 0.33.4 to 0.34.0
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.33.4...v0.34.0)

Updates `k8s.io/apimachinery` from 0.33.4 to 0.34.0
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.33.4...v0.34.0)

Updates `k8s.io/apiserver` from 0.33.4 to 0.34.0
- [Commits](https://github.com/kubernetes/apiserver/compare/v0.33.4...v0.34.0)

Updates `k8s.io/cli-runtime` from 0.33.4 to 0.34.0
- [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.33.4...v0.34.0)

Updates `k8s.io/client-go` from 0.33.4 to 0.34.0
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.33.4...v0.34.0)

Updates `k8s.io/kubectl` from 0.33.4 to 0.34.0
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.33.4...v0.34.0)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/apiserver
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 45 ++++++++++++++--------------
 go.sum | 92 ++++++++++++++++++++++++++++------------------------------
 2 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/go.mod b/go.mod
index 7099e9d46..3c9992dce 100644
--- a/go.mod
+++ b/go.mod
@@ -39,14 +39,14 @@ require (
 	golang.org/x/term v0.34.0
 	golang.org/x/text v0.28.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.33.4
-	k8s.io/apiextensions-apiserver v0.33.4
-	k8s.io/apimachinery v0.33.4
-	k8s.io/apiserver v0.33.4
-	k8s.io/cli-runtime v0.33.4
-	k8s.io/client-go v0.33.4
+	k8s.io/api v0.34.0
+	k8s.io/apiextensions-apiserver v0.34.0
+	k8s.io/apimachinery v0.34.0
+	k8s.io/apiserver v0.34.0
+	k8s.io/cli-runtime v0.34.0
+	k8s.io/client-go v0.34.0
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubectl v0.33.4
+	k8s.io/kubectl v0.34.0
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.21.0
 	sigs.k8s.io/kustomize/kyaml v0.20.1
@@ -61,7 +61,6 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
-	github.com/carapace-sh/carapace-shlex v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
@@ -77,7 +76,7 @@ require (
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
@@ -94,7 +93,7 @@ require (
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
@@ -115,7 +114,7 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -146,8 +145,8 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.8.0 // indirect
@@ -155,11 +154,11 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
 	go.opentelemetry.io/otel/log v0.8.0 // indirect
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.8.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	golang.org/x/mod v0.26.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
@@ -168,18 +167,18 @@ require (
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.35.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/grpc v1.68.1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
+	google.golang.org/grpc v1.72.1 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	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
-	k8s.io/component-base v0.33.4 // indirect
-	k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
+	k8s.io/component-base v0.34.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
-	sigs.k8s.io/kustomize/api v0.20.0 // indirect
+	sigs.k8s.io/kustomize/api v0.20.1 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 1a1601366..d9e7c3d3d 100644
--- a/go.sum
+++ b/go.sum
@@ -42,8 +42,6 @@ github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdb
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
-github.com/carapace-sh/carapace-shlex v1.0.1/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -97,8 +95,8 @@ github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7Dlme
 github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
@@ -142,7 +140,6 @@ github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
 github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
 github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -160,8 +157,8 @@ github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
 github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/hashicorp/golang-lru/arc/v2 v2.0.5 h1:l2zaLDubNhW4XO3LnliVj0GXO3+/CGNJAg1dcN2Fpfw=
 github.com/hashicorp/golang-lru/arc/v2 v2.0.5/go.mod h1:ny6zBSQZi2JxIeYcv7kt2sH2PXJtirBN7RDhRpxPkxU=
 github.com/hashicorp/golang-lru/v2 v2.0.5 h1:wW7h1TG88eUIJ2i69gaE3uNVtEPIagzhGvHgwfx2Vm4=
@@ -233,8 +230,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0=
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
@@ -346,10 +344,10 @@ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 h1:j7Z
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0/go.mod h1:WXbYJTUaZXAbYd8lbgGuvih0yuCfOFC5RJoYnoLcGz8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 h1:t/Qur3vKSkUCcDVaSumWF2PKHt85pc7fRvFuoVT8qFU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0/go.mod h1:Rl61tySSdcOJWoEgYZVtmnKdA0GeKrSqkHC1t+91CH8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI=
 go.opentelemetry.io/otel/exporters/prometheus v0.54.0 h1:rFwzp68QMgtzu9PgP3jm9XaMICI6TsofWWPcBDKwlsU=
@@ -364,16 +362,16 @@ go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWer
 go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8=
 go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
 go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
-go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM=
-go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
 go.opentelemetry.io/otel/sdk/log v0.8.0 h1:zg7GUYXqxk1jnGF/dTdLPrK06xJdrXgqgFLnI4Crxvs=
 go.opentelemetry.io/otel/sdk/log v0.8.0/go.mod h1:50iXr0UVwQrYS45KbruFrEt4LvAdCaWWgIrsN3ZQggo=
-go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
-go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
 go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
 go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
-go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg=
-go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -488,12 +486,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
-google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
-google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
+google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -510,26 +508,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
-k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
-k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU=
-k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs=
-k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
-k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
-k8s.io/apiserver v0.33.4 h1:6N0TEVA6kASUS3owYDIFJjUH6lgN8ogQmzZvaFFj1/Y=
-k8s.io/apiserver v0.33.4/go.mod h1:8ODgXMnOoSPLMUg1aAzMFx+7wTJM+URil+INjbTZCok=
-k8s.io/cli-runtime v0.33.4 h1:V8NSxGfh24XzZVhXmIGzsApdBpGq0RQS2u/Fz1GvJwk=
-k8s.io/cli-runtime v0.33.4/go.mod h1:V+ilyokfqjT5OI+XE+O515K7jihtr0/uncwoyVqXaIU=
-k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
-k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
-k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY=
-k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc=
+k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
+k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
+k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
+k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
+k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
+k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
+k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
+k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
+k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw=
+k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8=
+k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
+k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
+k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8=
+k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 h1:gAXU86Fmbr/ktY17lkHwSjw5aoThQvhnstGGIYKlKYc=
-k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
-k8s.io/kubectl v0.33.4 h1:nXEI6Vi+oB9hXxoAHyHisXolm/l1qutK3oZQMak4N98=
-k8s.io/kubectl v0.33.4/go.mod h1:Xe7P9X4DfILvKmlBsVqUtzktkI56lEj22SJW7cFy6nE=
+k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
+k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
+k8s.io/kubectl v0.34.0 h1:NcXz4TPTaUwhiX4LU+6r6udrlm0NsVnSkP3R9t0dmxs=
+k8s.io/kubectl v0.34.0/go.mod h1:bmd0W5i+HuG7/p5sqicr0Li0rR2iIhXL0oUyLF3OjR4=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
@@ -538,15 +536,13 @@ sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytI
 sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/kustomize/api v0.20.0 h1:xPLqcobHI0bThyRUteO+nCV8G4d1Rlo5HafO57VRcas=
-sigs.k8s.io/kustomize/api v0.20.0/go.mod h1:F6CfaV27oevRCMJgehLqyX81dlUnRX/Fc13Uo7+OSo4=
+sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=
+sigs.k8s.io/kustomize/api v0.20.1/go.mod h1:t6hUFxO+Ph0VxIk1sKp1WS0dOjbPCtLJ4p8aADLwqjM=
 sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=
 sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
-sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
-sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
+sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

From b12cd28503ffdc8fc28d14cd635690e38def629f Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Wed, 27 Aug 2025 04:02:28 -0600
Subject: [PATCH 171/211] fix: installer action goroutine count

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/action/install.go      | 11 ++++++++++-
 pkg/action/install_test.go | 29 +++++++++++++----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkg/action/install.go b/pkg/action/install.go
index 276009b5c..b5b45bd42 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -30,6 +30,7 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"text/template"
 	"time"
 
@@ -126,7 +127,8 @@ type Install struct {
 	TakeOwnership bool
 	PostRenderer  postrender.PostRenderer
 	// Lock to control raceconditions when the process receives a SIGTERM
-	Lock sync.Mutex
+	Lock           sync.Mutex
+	goroutineCount atomic.Int32
 }
 
 // ChartPathOptions captures common options used for controlling chart paths
@@ -446,8 +448,10 @@ func (i *Install) performInstallCtx(ctx context.Context, rel *release.Release, t
 	resultChan := make(chan Msg, 1)
 
 	go func() {
+		i.goroutineCount.Add(1)
 		rel, err := i.performInstall(rel, toBeAdopted, resources)
 		resultChan <- Msg{rel, err}
+		i.goroutineCount.Add(-1)
 	}()
 	select {
 	case <-ctx.Done():
@@ -458,6 +462,11 @@ func (i *Install) performInstallCtx(ctx context.Context, rel *release.Release, t
 	}
 }
 
+// getGoroutineCount return the number of running routines
+func (i *Install) getGoroutineCount() int32 {
+	return i.goroutineCount.Load()
+}
+
 // isDryRun returns true if Upgrade is set to run as a DryRun
 func (i *Install) isDryRun() bool {
 	if i.DryRun || i.DryRunOption == "client" || i.DryRunOption == "server" || i.DryRunOption == "true" {
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index f567b3df4..fa9cfb222 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -28,7 +28,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -330,8 +329,8 @@ func TestInstallRelease_WithChartAndDependencyParentNotes(t *testing.T) {
 	}
 
 	rel, err := instAction.cfg.Releases.Get(res.Name, res.Version)
-	is.Equal("with-notes", rel.Name)
 	is.NoError(err)
+	is.Equal("with-notes", rel.Name)
 	is.Equal("parent", rel.Info.Notes)
 	is.Equal(rel.Info.Description, "Install complete")
 }
@@ -349,8 +348,8 @@ func TestInstallRelease_WithChartAndDependencyAllNotes(t *testing.T) {
 	}
 
 	rel, err := instAction.cfg.Releases.Get(res.Name, res.Version)
-	is.Equal("with-notes", rel.Name)
 	is.NoError(err)
+	is.Equal("with-notes", rel.Name)
 	// test run can return as either 'parent\nchild' or 'child\nparent'
 	if !strings.Contains(rel.Info.Notes, "parent") && !strings.Contains(rel.Info.Notes, "child") {
 		t.Fatalf("Expected 'parent\nchild' or 'child\nparent', got '%s'", rel.Info.Notes)
@@ -454,9 +453,7 @@ func TestInstallReleaseIncorrectTemplate_DryRun(t *testing.T) {
 	if err == nil {
 		t.Fatalf("Install should fail containing error: %s", expectedErr)
 	}
-	if err != nil {
-		is.Contains(err.Error(), expectedErr)
-	}
+	is.Contains(err.Error(), expectedErr)
 }
 
 func TestInstallRelease_NoHooks(t *testing.T) {
@@ -541,14 +538,14 @@ func TestInstallRelease_Wait(t *testing.T) {
 	instAction.WaitStrategy = kube.StatusWatcherStrategy
 	vals := map[string]interface{}{}
 
-	goroutines := runtime.NumGoroutine()
+	goroutines := instAction.getGoroutineCount()
 
 	res, err := instAction.Run(buildChart(), vals)
 	is.Error(err)
 	is.Contains(res.Info.Description, "I timed out")
 	is.Equal(res.Info.Status, release.StatusFailed)
 
-	is.Equal(goroutines, runtime.NumGoroutine())
+	is.Equal(goroutines, instAction.getGoroutineCount())
 }
 func TestInstallRelease_Wait_Interrupted(t *testing.T) {
 	is := assert.New(t)
@@ -563,15 +560,15 @@ func TestInstallRelease_Wait_Interrupted(t *testing.T) {
 	ctx, cancel := context.WithCancel(t.Context())
 	time.AfterFunc(time.Second, cancel)
 
-	goroutines := runtime.NumGoroutine()
+	goroutines := instAction.getGoroutineCount()
 
 	_, err := instAction.RunWithContext(ctx, buildChart(), vals)
 	is.Error(err)
 	is.Contains(err.Error(), "context canceled")
 
-	is.Equal(goroutines+1, runtime.NumGoroutine()) // installation goroutine still is in background
-	time.Sleep(10 * time.Second)                   // wait for goroutine to finish
-	is.Equal(goroutines, runtime.NumGoroutine())
+	is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background
+	time.Sleep(10 * time.Second)                           // wait for goroutine to finish
+	is.Equal(goroutines, instAction.getGoroutineCount())
 }
 func TestInstallRelease_WaitForJobs(t *testing.T) {
 	is := assert.New(t)
@@ -647,7 +644,7 @@ func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) {
 	ctx, cancel := context.WithCancel(t.Context())
 	time.AfterFunc(time.Second, cancel)
 
-	goroutines := runtime.NumGoroutine()
+	goroutines := instAction.getGoroutineCount()
 
 	res, err := instAction.RunWithContext(ctx, buildChart(), vals)
 	is.Error(err)
@@ -659,9 +656,9 @@ func TestInstallRelease_RollbackOnFailure_Interrupted(t *testing.T) {
 	_, err = instAction.cfg.Releases.Get(res.Name, res.Version)
 	is.Error(err)
 	is.Equal(err, driver.ErrReleaseNotFound)
-	is.Equal(goroutines+1, runtime.NumGoroutine()) // installation goroutine still is in background
-	time.Sleep(10 * time.Second)                   // wait for goroutine to finish
-	is.Equal(goroutines, runtime.NumGoroutine())
+	is.Equal(goroutines+1, instAction.getGoroutineCount()) // installation goroutine still is in background
+	time.Sleep(10 * time.Second)                           // wait for goroutine to finish
+	is.Equal(goroutines, instAction.getGoroutineCount())
 
 }
 func TestNameTemplate(t *testing.T) {

From 9eafbc53dfb4b6b9ecaaaaa3c73bcffa58af397a Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Mon, 18 Aug 2025 10:54:03 -0600
Subject: [PATCH 172/211] fix: make file whitespace

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 Makefile | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 0a20259bd..8dfa3344c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ GOX           = $(GOBIN)/gox
 GOIMPORTS     = $(GOBIN)/goimports
 ARCH          = $(shell go env GOARCH)
 
-ACCEPTANCE_DIR:=../acceptance-testing
+ACCEPTANCE_DIR := ../acceptance-testing
 # To specify the subset of acceptance tests to run. '.' means all tests
-ACCEPTANCE_RUN_TESTS=.
+ACCEPTANCE_RUN_TESTS = .
 
 # go option
 PKG         := ./...
@@ -227,22 +227,19 @@ clean:
 
 .PHONY: release-notes
 release-notes:
-		@if [ ! -d "./_dist" ]; then \
-			echo "please run 'make fetch-dist' first" && \
-			exit 1; \
-		fi
-		@if [ -z "${PREVIOUS_RELEASE}" ]; then \
-			echo "please set PREVIOUS_RELEASE environment variable" \
-			&& exit 1; \
-		fi
-
-		@./scripts/release-notes.sh ${PREVIOUS_RELEASE} ${VERSION}
-
-
+	@if [ ! -d "./_dist" ]; then \
+		echo "please run 'make fetch-dist' first" && \
+		exit 1; \
+	fi
+	@if [ -z "${PREVIOUS_RELEASE}" ]; then \
+		echo "please set PREVIOUS_RELEASE environment variable" && \
+		exit 1; \
+	fi
+	@./scripts/release-notes.sh ${PREVIOUS_RELEASE} ${VERSION}
 
 .PHONY: info
 info:
-	 @echo "Version:           ${VERSION}"
-	 @echo "Git Tag:           ${GIT_TAG}"
-	 @echo "Git Commit:        ${GIT_COMMIT}"
-	 @echo "Git Tree State:    ${GIT_DIRTY}"
+	@echo "Version:           ${VERSION}"
+	@echo "Git Tag:           ${GIT_TAG}"
+	@echo "Git Commit:        ${GIT_COMMIT}"
+	@echo "Git Tree State:    ${GIT_DIRTY}"

From 9ea35da0d0309b59b15c1a00cf619f3869512b61 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Sat, 30 Aug 2025 13:25:28 -0400
Subject: [PATCH 173/211] [HIP-0026] Plugin packaging, signing, and
 verification (#31176)

* Plugin packaging, signing and verification

Signed-off-by: Scott Rigby <scott@r6by.com>

* wrap keyring read error with more explicit message

Co-authored-by: Jesse Simpson <jesse.simpson36@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>

* skip unnecessary check

Co-authored-by: Evans Mungai <mbuevans@gmail.com>
Signed-off-by: Scott Rigby <scott@r6by.com>

* Change behavior for installing plugin with missing .prov file (now warns and continues instead of failing)

Signed-off-by: Scott Rigby <scott@r6by.com>

* Add comprehensive plugin verification tests

- Test missing .prov files (warns but continues)
- Test invalid .prov file formats (fails verification)
- Test hash mismatches in .prov files (fails verification)
- Test .prov file access errors (fails appropriately)
- Test directory plugins don't support verification
- Test installation without verification enabled (succeeds)
- Test with valid .prov files (fails on empty keyring as expected)

---------

Signed-off-by: Scott Rigby <scott@r6by.com>
Co-authored-by: Jesse Simpson <jesse.simpson36@gmail.com>
Co-authored-by: Evans Mungai <mbuevans@gmail.com>
---
 internal/plugin/installer/extractor.go        | 195 ++++++++
 internal/plugin/installer/http_installer.go   | 215 +++------
 .../plugin/installer/http_installer_test.go   |   3 +-
 internal/plugin/installer/installer.go        |  94 +++-
 internal/plugin/installer/local_installer.go  |  84 +++-
 .../plugin/installer/local_installer_test.go  |  83 +---
 internal/plugin/installer/oci_installer.go    |  97 +++-
 .../plugin/installer/oci_installer_test.go    |  24 +-
 .../plugin/installer/vcs_installer_test.go    |   5 +-
 .../plugin/installer/verification_test.go     | 421 ++++++++++++++++++
 internal/plugin/sign.go                       | 166 +++++++
 internal/plugin/sign_test.go                  |  92 ++++
 internal/plugin/signing_info.go               | 178 ++++++++
 internal/plugin/verify.go                     |  72 +++
 internal/plugin/verify_test.go                | 201 +++++++++
 pkg/action/package.go                         |  16 +-
 pkg/cmd/plugin.go                             |   2 +
 pkg/cmd/plugin_install.go                     |  55 ++-
 pkg/cmd/plugin_list.go                        |  12 +-
 pkg/cmd/plugin_package.go                     | 209 +++++++++
 pkg/cmd/plugin_package_test.go                | 170 +++++++
 pkg/cmd/plugin_verify.go                      |  88 ++++
 pkg/cmd/plugin_verify_test.go                 | 264 +++++++++++
 pkg/getter/ocigetter.go                       |  16 +-
 pkg/provenance/doc.go                         |  10 +-
 pkg/provenance/sign.go                        |  96 ++--
 pkg/provenance/sign_test.go                   |  42 +-
 pkg/registry/plugin.go                        |  45 +-
 28 files changed, 2599 insertions(+), 356 deletions(-)
 create mode 100644 internal/plugin/installer/extractor.go
 create mode 100644 internal/plugin/installer/verification_test.go
 create mode 100644 internal/plugin/sign.go
 create mode 100644 internal/plugin/sign_test.go
 create mode 100644 internal/plugin/signing_info.go
 create mode 100644 internal/plugin/verify.go
 create mode 100644 internal/plugin/verify_test.go
 create mode 100644 pkg/cmd/plugin_package.go
 create mode 100644 pkg/cmd/plugin_package_test.go
 create mode 100644 pkg/cmd/plugin_verify.go
 create mode 100644 pkg/cmd/plugin_verify_test.go

diff --git a/internal/plugin/installer/extractor.go b/internal/plugin/installer/extractor.go
new file mode 100644
index 000000000..9417a0535
--- /dev/null
+++ b/internal/plugin/installer/extractor.go
@@ -0,0 +1,195 @@
+/*
+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 installer // import "helm.sh/helm/v4/internal/plugin/installer"
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strings"
+
+	securejoin "github.com/cyphar/filepath-securejoin"
+)
+
+// TarGzExtractor extracts gzip compressed tar archives
+type TarGzExtractor struct{}
+
+// Extractor provides an interface for extracting archives
+type Extractor interface {
+	Extract(buffer *bytes.Buffer, targetDir string) error
+}
+
+// Extractors contains a map of suffixes and matching implementations of extractor to return
+var Extractors = map[string]Extractor{
+	".tar.gz": &TarGzExtractor{},
+	".tgz":    &TarGzExtractor{},
+}
+
+// Convert a media type to an extractor extension.
+//
+// This should be refactored in Helm 4, combined with the extension-based mechanism.
+func mediaTypeToExtension(mt string) (string, bool) {
+	switch strings.ToLower(mt) {
+	case "application/gzip", "application/x-gzip", "application/x-tgz", "application/x-gtar":
+		return ".tgz", true
+	case "application/octet-stream":
+		// Generic binary type - we'll need to check the URL suffix
+		return "", false
+	default:
+		return "", false
+	}
+}
+
+// NewExtractor creates a new extractor matching the source file name
+func NewExtractor(source string) (Extractor, error) {
+	for suffix, extractor := range Extractors {
+		if strings.HasSuffix(source, suffix) {
+			return extractor, nil
+		}
+	}
+	return nil, fmt.Errorf("no extractor implemented yet for %s", source)
+}
+
+// cleanJoin resolves dest as a subpath of root.
+//
+// This function runs several security checks on the path, generating an error if
+// the supplied `dest` looks suspicious or would result in dubious behavior on the
+// filesystem.
+//
+// cleanJoin assumes that any attempt by `dest` to break out of the CWD is an attempt
+// to be malicious. (If you don't care about this, use the securejoin-filepath library.)
+// It will emit an error if it detects paths that _look_ malicious, operating on the
+// assumption that we don't actually want to do anything with files that already
+// appear to be nefarious.
+//
+//   - The character `:` is considered illegal because it is a separator on UNIX and a
+//     drive designator on Windows.
+//   - The path component `..` is considered suspicions, and therefore illegal
+//   - The character \ (backslash) is treated as a path separator and is converted to /.
+//   - Beginning a path with a path separator is illegal
+//   - Rudimentary symlink protects are offered by SecureJoin.
+func cleanJoin(root, dest string) (string, error) {
+
+	// On Windows, this is a drive separator. On UNIX-like, this is the path list separator.
+	// In neither case do we want to trust a TAR that contains these.
+	if strings.Contains(dest, ":") {
+		return "", errors.New("path contains ':', which is illegal")
+	}
+
+	// The Go tar library does not convert separators for us.
+	// We assume here, as we do elsewhere, that `\\` means a Windows path.
+	dest = strings.ReplaceAll(dest, "\\", "/")
+
+	// We want to alert the user that something bad was attempted. Cleaning it
+	// is not a good practice.
+	if slices.Contains(strings.Split(dest, "/"), "..") {
+		return "", errors.New("path contains '..', which is illegal")
+	}
+
+	// If a path is absolute, the creator of the TAR is doing something shady.
+	if path.IsAbs(dest) {
+		return "", errors.New("path is absolute, which is illegal")
+	}
+
+	// SecureJoin will do some cleaning, as well as some rudimentary checking of symlinks.
+	// The directory needs to be cleaned prior to passing to SecureJoin or the location may end up
+	// being wrong or returning an error. This was introduced in v0.4.0.
+	root = filepath.Clean(root)
+	newpath, err := securejoin.SecureJoin(root, dest)
+	if err != nil {
+		return "", err
+	}
+
+	return filepath.ToSlash(newpath), nil
+}
+
+// Extract extracts compressed archives
+//
+// Implements Extractor.
+func (g *TarGzExtractor) Extract(buffer *bytes.Buffer, targetDir string) error {
+	uncompressedStream, err := gzip.NewReader(buffer)
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(targetDir, 0755); err != nil {
+		return err
+	}
+
+	tarReader := tar.NewReader(uncompressedStream)
+	for {
+		header, err := tarReader.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+
+		path, err := cleanJoin(targetDir, header.Name)
+		if err != nil {
+			return err
+		}
+
+		switch header.Typeflag {
+		case tar.TypeDir:
+			if err := os.MkdirAll(path, 0755); err != nil {
+				return err
+			}
+		case tar.TypeReg:
+			// Ensure parent directory exists
+			if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+				return err
+			}
+			outFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
+			if err != nil {
+				return err
+			}
+			if _, err := io.Copy(outFile, tarReader); err != nil {
+				outFile.Close()
+				return err
+			}
+			outFile.Close()
+		// We don't want to process these extension header files.
+		case tar.TypeXGlobalHeader, tar.TypeXHeader:
+			continue
+		default:
+			return fmt.Errorf("unknown type: %b in %s", header.Typeflag, header.Name)
+		}
+	}
+	return nil
+}
+
+// stripPluginName is a helper that relies on some sort of convention for plugin name (plugin-name-<version>)
+func stripPluginName(name string) string {
+	var strippedName string
+	for suffix := range Extractors {
+		if strings.HasSuffix(name, suffix) {
+			strippedName = strings.TrimSuffix(name, suffix)
+			break
+		}
+	}
+	re := regexp.MustCompile(`(.*)-[0-9]+\..*`)
+	return re.ReplaceAllString(strippedName, `$1`)
+}
diff --git a/internal/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go
index b68fc059a..a4687d8c9 100644
--- a/internal/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@@ -16,22 +16,14 @@ limitations under the License.
 package installer // import "helm.sh/helm/v4/internal/plugin/installer"
 
 import (
-	"archive/tar"
 	"bytes"
-	"compress/gzip"
-	"errors"
 	"fmt"
-	"io"
 	"log/slog"
 	"os"
-	"path"
 	"path/filepath"
-	"regexp"
-	"slices"
 	"strings"
 
-	securejoin "github.com/cyphar/filepath-securejoin"
-
+	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/cli"
@@ -46,45 +38,8 @@ type HTTPInstaller struct {
 	base
 	extractor Extractor
 	getter    getter.Getter
-}
-
-// TarGzExtractor extracts gzip compressed tar archives
-type TarGzExtractor struct{}
-
-// Extractor provides an interface for extracting archives
-type Extractor interface {
-	Extract(buffer *bytes.Buffer, targetDir string) error
-}
-
-// Extractors contains a map of suffixes and matching implementations of extractor to return
-var Extractors = map[string]Extractor{
-	".tar.gz": &TarGzExtractor{},
-	".tgz":    &TarGzExtractor{},
-}
-
-// Convert a media type to an extractor extension.
-//
-// This should be refactored in Helm 4, combined with the extension-based mechanism.
-func mediaTypeToExtension(mt string) (string, bool) {
-	switch strings.ToLower(mt) {
-	case "application/gzip", "application/x-gzip", "application/x-tgz", "application/x-gtar":
-		return ".tgz", true
-	case "application/octet-stream":
-		// Generic binary type - we'll need to check the URL suffix
-		return "", false
-	default:
-		return "", false
-	}
-}
-
-// NewExtractor creates a new extractor matching the source file name
-func NewExtractor(source string) (Extractor, error) {
-	for suffix, extractor := range Extractors {
-		if strings.HasSuffix(source, suffix) {
-			return extractor, nil
-		}
-	}
-	return nil, fmt.Errorf("no extractor implemented yet for %s", source)
+	// Provenance data to save after installation
+	provData []byte
 }
 
 // NewHTTPInstaller creates a new HttpInstaller.
@@ -114,19 +69,6 @@ func NewHTTPInstaller(source string) (*HTTPInstaller, error) {
 	return i, nil
 }
 
-// helper that relies on some sort of convention for plugin name (plugin-name-<version>)
-func stripPluginName(name string) string {
-	var strippedName string
-	for suffix := range Extractors {
-		if strings.HasSuffix(name, suffix) {
-			strippedName = strings.TrimSuffix(name, suffix)
-			break
-		}
-	}
-	re := regexp.MustCompile(`(.*)-[0-9]+\..*`)
-	return re.ReplaceAllString(strippedName, `$1`)
-}
-
 // Install downloads and extracts the tarball into the cache directory
 // and installs into the plugin directory.
 //
@@ -137,6 +79,31 @@ func (i *HTTPInstaller) Install() error {
 		return err
 	}
 
+	// Save the original tarball to plugins directory for verification
+	// Extract metadata to get the actual plugin name and version
+	pluginBytes := pluginData.Bytes()
+	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	if err != nil {
+		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
+	}
+	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
+	tarballPath := helmpath.DataPath("plugins", filename)
+	if err := os.MkdirAll(filepath.Dir(tarballPath), 0755); err != nil {
+		return fmt.Errorf("failed to create plugins directory: %w", err)
+	}
+	if err := os.WriteFile(tarballPath, pluginBytes, 0644); err != nil {
+		return fmt.Errorf("failed to save tarball: %w", err)
+	}
+
+	// Try to download .prov file if it exists
+	provURL := i.Source + ".prov"
+	if provData, err := i.getter.Get(provURL); err == nil {
+		provPath := tarballPath + ".prov"
+		if err := os.WriteFile(provPath, provData.Bytes(), 0644); err != nil {
+			slog.Debug("failed to save provenance file", "error", err)
+		}
+	}
+
 	if err := i.extractor.Extract(pluginData, i.CacheDir); err != nil {
 		return fmt.Errorf("extracting files from archive: %w", err)
 	}
@@ -175,111 +142,57 @@ func (i HTTPInstaller) Path() string {
 	return helmpath.DataPath("plugins", i.PluginName)
 }
 
-// cleanJoin resolves dest as a subpath of root.
-//
-// This function runs several security checks on the path, generating an error if
-// the supplied `dest` looks suspicious or would result in dubious behavior on the
-// filesystem.
-//
-// cleanJoin assumes that any attempt by `dest` to break out of the CWD is an attempt
-// to be malicious. (If you don't care about this, use the securejoin-filepath library.)
-// It will emit an error if it detects paths that _look_ malicious, operating on the
-// assumption that we don't actually want to do anything with files that already
-// appear to be nefarious.
-//
-//   - The character `:` is considered illegal because it is a separator on UNIX and a
-//     drive designator on Windows.
-//   - The path component `..` is considered suspicions, and therefore illegal
-//   - The character \ (backslash) is treated as a path separator and is converted to /.
-//   - Beginning a path with a path separator is illegal
-//   - Rudimentary symlink protects are offered by SecureJoin.
-func cleanJoin(root, dest string) (string, error) {
+// SupportsVerification returns true if the HTTP installer can verify plugins
+func (i *HTTPInstaller) SupportsVerification() bool {
+	// Only support verification for tarball URLs
+	return strings.HasSuffix(i.Source, ".tgz") || strings.HasSuffix(i.Source, ".tar.gz")
+}
 
-	// On Windows, this is a drive separator. On UNIX-like, this is the path list separator.
-	// In neither case do we want to trust a TAR that contains these.
-	if strings.Contains(dest, ":") {
-		return "", errors.New("path contains ':', which is illegal")
+// PrepareForVerification downloads the plugin and signature files for verification
+func (i *HTTPInstaller) PrepareForVerification() (string, func(), error) {
+	if !i.SupportsVerification() {
+		return "", nil, fmt.Errorf("verification not supported for this source")
 	}
 
-	// The Go tar library does not convert separators for us.
-	// We assume here, as we do elsewhere, that `\\` means a Windows path.
-	dest = strings.ReplaceAll(dest, "\\", "/")
-
-	// We want to alert the user that something bad was attempted. Cleaning it
-	// is not a good practice.
-	if slices.Contains(strings.Split(dest, "/"), "..") {
-		return "", errors.New("path contains '..', which is illegal")
+	// Create temporary directory for downloads
+	tempDir, err := os.MkdirTemp("", "helm-plugin-verify-*")
+	if err != nil {
+		return "", nil, fmt.Errorf("failed to create temp directory: %w", err)
 	}
 
-	// If a path is absolute, the creator of the TAR is doing something shady.
-	if path.IsAbs(dest) {
-		return "", errors.New("path is absolute, which is illegal")
+	cleanup := func() {
+		os.RemoveAll(tempDir)
 	}
 
-	// SecureJoin will do some cleaning, as well as some rudimentary checking of symlinks.
-	// The directory needs to be cleaned prior to passing to SecureJoin or the location may end up
-	// being wrong or returning an error. This was introduced in v0.4.0.
-	root = filepath.Clean(root)
-	newpath, err := securejoin.SecureJoin(root, dest)
+	// Download plugin tarball
+	pluginFile := filepath.Join(tempDir, filepath.Base(i.Source))
+
+	g, err := getter.All(new(cli.EnvSettings)).ByScheme("http")
 	if err != nil {
-		return "", err
+		cleanup()
+		return "", nil, err
 	}
 
-	return filepath.ToSlash(newpath), nil
-}
-
-// Extract extracts compressed archives
-//
-// Implements Extractor.
-func (g *TarGzExtractor) Extract(buffer *bytes.Buffer, targetDir string) error {
-	uncompressedStream, err := gzip.NewReader(buffer)
+	data, err := g.Get(i.Source, getter.WithURL(i.Source))
 	if err != nil {
-		return err
+		cleanup()
+		return "", nil, fmt.Errorf("failed to download plugin: %w", err)
 	}
 
-	if err := os.MkdirAll(targetDir, 0755); err != nil {
-		return err
+	if err := os.WriteFile(pluginFile, data.Bytes(), 0644); err != nil {
+		cleanup()
+		return "", nil, fmt.Errorf("failed to write plugin file: %w", err)
 	}
 
-	tarReader := tar.NewReader(uncompressedStream)
-	for {
-		header, err := tarReader.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		path, err := cleanJoin(targetDir, header.Name)
-		if err != nil {
-			return err
-		}
-
-		switch header.Typeflag {
-		case tar.TypeDir:
-			if err := os.MkdirAll(path, 0755); err != nil {
-				return err
-			}
-		case tar.TypeReg:
-			// Ensure parent directory exists
-			if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-				return err
-			}
-			outFile, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
-			if err != nil {
-				return err
-			}
-			defer outFile.Close()
-			if _, err := io.Copy(outFile, tarReader); err != nil {
-				return err
-			}
-		// We don't want to process these extension header files.
-		case tar.TypeXGlobalHeader, tar.TypeXHeader:
-			continue
-		default:
-			return fmt.Errorf("unknown type: %b in %s", header.Typeflag, header.Name)
+	// Try to download signature file - don't fail if it doesn't exist
+	if provData, err := g.Get(i.Source+".prov", getter.WithURL(i.Source+".prov")); err == nil {
+		if err := os.WriteFile(pluginFile+".prov", provData.Bytes(), 0644); err == nil {
+			// Store the provenance data so we can save it after installation
+			i.provData = provData.Bytes()
 		}
 	}
-	return nil
+	// Note: We don't fail if .prov file can't be downloaded - the verification logic
+	// in InstallWithOptions will handle missing .prov files appropriately
+
+	return pluginFile, cleanup, nil
 }
diff --git a/internal/plugin/installer/http_installer_test.go b/internal/plugin/installer/http_installer_test.go
index 453021b76..be40b1b90 100644
--- a/internal/plugin/installer/http_installer_test.go
+++ b/internal/plugin/installer/http_installer_test.go
@@ -49,7 +49,7 @@ func (t *TestHTTPGetter) Get(_ string, _ ...getter.Option) (*bytes.Buffer, error
 }
 
 // Fake plugin tarball data
-var fakePluginB64 = "H4sIAKRj51kAA+3UX0vCUBgGcC9jn+Iwuk3Peza3GeyiUlJQkcogCOzgli7dJm4TvYk+a5+k479UqquUCJ/fLs549sLO2TnvWnJa9aXnjwujYdYLovxMhsPcfnHOLdNkOXthM/IVQQYjg2yyLLJ4kXGhLp5j0z3P41tZksqxmspL3B/O+j/XtZu1y8rdYzkOZRCxduKPk53ny6Wwz/GfIIf1As8lxzGJSmoHNLJZphKHG4YpTCE0wVk3DULfpSJ3DMMqkj3P5JfMYLdX1Vr9Ie/5E5cstcdC8K04iGLX5HaJuKpWL17F0TCIBi5pf/0pjtLhun5j3f9v6r7wfnI/H0eNp9d1/5P6Gez0vzo7wsoxfrAZbTny/o9k6J8z/VkO/LPlWdC1iVpbEEcq5nmeJ13LEtmbV0k2r2PrOs9PuuNglC5rL1Y5S/syXRQmutaNw1BGnnp8Wq3UG51WvX1da3bKtZtCN/R09DwAAAAAAAAAAAAAAAAAAADAb30AoMczDwAoAAA="
+var fakePluginB64 = "H4sIAAAAAAAAA+3SQUvDMBgG4Jz7K0LwapdvSxrwJig6mCKC5xHabBaXdDSt4L+3cQ56mV42ZPg+lw+SF5LwZmXf3OV206/rMGEnIgdG6zTJaDmee4y01FOlZpqGHJGZSsb1qS401sfOtpyz0FTup9xv+2dqNep/N/IP6zdHPSMVXCh1sH8yhtGMDBUFFTL1r4iIcXnUWxzwz/sP1rsrLkbfQGTvro11E4ZlmcucRNZHu04py1OO73OVi2Vbb7td9vp7nXevtvsKRpGVjfc2VMP2xf3t4mH5tHi5mz8ub+bPk9JXIvvr5wMAAAAAAAAAAAAAAAAAAAAAnLVPqwHcXQAoAAA="
 
 func TestStripName(t *testing.T) {
 	if stripPluginName("fake-plugin-0.0.1.tar.gz") != "fake-plugin" {
@@ -515,6 +515,7 @@ func TestExtractWithExistingDirectory(t *testing.T) {
 }
 
 func TestExtractPluginInSubdirectory(t *testing.T) {
+	ensure.HelmHome(t)
 	source := "https://repo.localdomain/plugins/subdir-plugin-1.0.0.tar.gz"
 	tempDir := t.TempDir()
 
diff --git a/internal/plugin/installer/installer.go b/internal/plugin/installer/installer.go
index 7900f6745..dd169397e 100644
--- a/internal/plugin/installer/installer.go
+++ b/internal/plugin/installer/installer.go
@@ -17,12 +17,14 @@ package installer
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/pkg/registry"
 )
 
 // ErrMissingMetadata indicates that plugin.yaml is missing.
@@ -31,6 +33,14 @@ var ErrMissingMetadata = errors.New("plugin metadata (plugin.yaml) missing")
 // Debug enables verbose output.
 var Debug bool
 
+// Options contains options for plugin installation.
+type Options struct {
+	// Verify enables signature verification before installation
+	Verify bool
+	// Keyring is the path to the keyring for verification
+	Keyring string
+}
+
 // Installer provides an interface for installing helm client plugins.
 type Installer interface {
 	// Install adds a plugin.
@@ -41,15 +51,89 @@ type Installer interface {
 	Update() error
 }
 
+// Verifier provides an interface for installers that support verification.
+type Verifier interface {
+	// SupportsVerification returns true if this installer can verify plugins
+	SupportsVerification() bool
+	// PrepareForVerification downloads necessary files for verification
+	PrepareForVerification() (pluginPath string, cleanup func(), err error)
+}
+
 // Install installs a plugin.
 func Install(i Installer) error {
+	_, err := InstallWithOptions(i, Options{})
+	return err
+}
+
+// VerificationResult contains the result of plugin verification
+type VerificationResult struct {
+	SignedBy    []string
+	Fingerprint string
+	FileHash    string
+}
+
+// InstallWithOptions installs a plugin with options.
+func InstallWithOptions(i Installer, opts Options) (*VerificationResult, error) {
+
 	if err := os.MkdirAll(filepath.Dir(i.Path()), 0755); err != nil {
-		return err
+		return nil, err
 	}
 	if _, pathErr := os.Stat(i.Path()); !os.IsNotExist(pathErr) {
-		return errors.New("plugin already exists")
+		return nil, errors.New("plugin already exists")
+	}
+
+	var result *VerificationResult
+
+	// If verification is requested, check if installer supports it
+	if opts.Verify {
+		verifier, ok := i.(Verifier)
+		if !ok || !verifier.SupportsVerification() {
+			return nil, fmt.Errorf("--verify is only supported for plugin tarballs (.tgz files)")
+		}
+
+		// Prepare for verification (download files if needed)
+		pluginPath, cleanup, err := verifier.PrepareForVerification()
+		if err != nil {
+			return nil, fmt.Errorf("failed to prepare for verification: %w", err)
+		}
+		if cleanup != nil {
+			defer cleanup()
+		}
+
+		// Check if provenance file exists
+		provFile := pluginPath + ".prov"
+		if _, err := os.Stat(provFile); err != nil {
+			if os.IsNotExist(err) {
+				// No .prov file found - emit warning but continue installation
+				fmt.Fprintf(os.Stderr, "WARNING: No provenance file found for plugin. Plugin is not signed and cannot be verified.\n")
+			} else {
+				// Other error accessing .prov file
+				return nil, fmt.Errorf("failed to access provenance file: %w", err)
+			}
+		} else {
+			// Provenance file exists - verify the plugin
+			verification, err := plugin.VerifyPlugin(pluginPath, opts.Keyring)
+			if err != nil {
+				return nil, fmt.Errorf("plugin verification failed: %w", err)
+			}
+
+			// Collect verification info
+			result = &VerificationResult{
+				SignedBy:    make([]string, 0),
+				Fingerprint: fmt.Sprintf("%X", verification.SignedBy.PrimaryKey.Fingerprint),
+				FileHash:    verification.FileHash,
+			}
+			for name := range verification.SignedBy.Identities {
+				result.SignedBy = append(result.SignedBy, name)
+			}
+		}
 	}
-	return i.Install()
+
+	if err := i.Install(); err != nil {
+		return nil, err
+	}
+
+	return result, nil
 }
 
 // Update updates a plugin.
@@ -62,6 +146,10 @@ func Update(i Installer) error {
 
 // NewForSource determines the correct Installer for the given source.
 func NewForSource(source, version string) (Installer, error) {
+	// Check if source is an OCI registry reference
+	if strings.HasPrefix(source, fmt.Sprintf("%s://", registry.OCIScheme)) {
+		return NewOCIInstaller(source)
+	}
 	// Check if source is a local directory
 	if isLocalReference(source) {
 		return NewLocalInstaller(source)
diff --git a/internal/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go
index 87b9eaf97..0e00c93d0 100644
--- a/internal/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@@ -24,7 +24,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
+	"helm.sh/helm/v4/pkg/helmpath"
 )
 
 // ErrPluginNotAFolder indicates that the plugin path is not a folder.
@@ -35,6 +37,7 @@ type LocalInstaller struct {
 	base
 	isArchive bool
 	extractor Extractor
+	provData  []byte // Provenance data to save after installation
 }
 
 // NewLocalInstaller creates a new LocalInstaller.
@@ -105,6 +108,30 @@ func (i *LocalInstaller) installFromArchive() error {
 		return fmt.Errorf("failed to read archive: %w", err)
 	}
 
+	// Copy the original tarball to plugins directory for verification
+	// Extract metadata to get the actual plugin name and version
+	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(data))
+	if err != nil {
+		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
+	}
+	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
+	tarballPath := helmpath.DataPath("plugins", filename)
+	if err := os.MkdirAll(filepath.Dir(tarballPath), 0755); err != nil {
+		return fmt.Errorf("failed to create plugins directory: %w", err)
+	}
+	if err := os.WriteFile(tarballPath, data, 0644); err != nil {
+		return fmt.Errorf("failed to save tarball: %w", err)
+	}
+
+	// Check for and copy .prov file if it exists
+	provSource := i.Source + ".prov"
+	if provData, err := os.ReadFile(provSource); err == nil {
+		provPath := tarballPath + ".prov"
+		if err := os.WriteFile(provPath, provData, 0644); err != nil {
+			slog.Debug("failed to save provenance file", "error", err)
+		}
+	}
+
 	// Create a temporary directory for extraction
 	tempDir, err := os.MkdirTemp("", "helm-plugin-extract-")
 	if err != nil {
@@ -118,31 +145,60 @@ func (i *LocalInstaller) installFromArchive() error {
 		return fmt.Errorf("failed to extract archive: %w", err)
 	}
 
-	// Detect where the plugin.yaml actually is
-	pluginRoot, err := detectPluginRoot(tempDir)
-	if err != nil {
-		return err
+	// Plugin directory should be named after the plugin at the archive root
+	pluginName := stripPluginName(filepath.Base(i.Source))
+	pluginDir := filepath.Join(tempDir, pluginName)
+	if _, err = os.Stat(filepath.Join(pluginDir, "plugin.yaml")); err != nil {
+		return fmt.Errorf("plugin.yaml not found in expected directory %s: %w", pluginDir, err)
 	}
 
 	// Copy to the final destination
-	slog.Debug("copying", "source", pluginRoot, "path", i.Path())
-	return fs.CopyDir(pluginRoot, i.Path())
+	slog.Debug("copying", "source", pluginDir, "path", i.Path())
+	return fs.CopyDir(pluginDir, i.Path())
+}
+
+// Update updates a local repository
+func (i *LocalInstaller) Update() error {
+	slog.Debug("local repository is auto-updated")
+	return nil
 }
 
-// Path returns the path where the plugin will be installed.
-// For archive sources, strips the version from the filename.
+// Path is overridden to handle archive plugin names properly
 func (i *LocalInstaller) Path() string {
 	if i.Source == "" {
 		return ""
 	}
+
+	pluginName := filepath.Base(i.Source)
 	if i.isArchive {
-		return filepath.Join(i.PluginsDirectory, stripPluginName(filepath.Base(i.Source)))
+		// Strip archive extension to get plugin name
+		pluginName = stripPluginName(pluginName)
 	}
-	return filepath.Join(i.PluginsDirectory, filepath.Base(i.Source))
+
+	return helmpath.DataPath("plugins", pluginName)
 }
 
-// Update updates a local repository
-func (i *LocalInstaller) Update() error {
-	slog.Debug("local repository is auto-updated")
-	return nil
+// SupportsVerification returns true if the local installer can verify plugins
+func (i *LocalInstaller) SupportsVerification() bool {
+	// Only support verification for local tarball files
+	return i.isArchive
+}
+
+// PrepareForVerification returns the local path for verification
+func (i *LocalInstaller) PrepareForVerification() (string, func(), error) {
+	if !i.SupportsVerification() {
+		return "", nil, fmt.Errorf("verification not supported for directories")
+	}
+
+	// For local files, try to read the .prov file if it exists
+	provFile := i.Source + ".prov"
+	if provData, err := os.ReadFile(provFile); err == nil {
+		// Store the provenance data so we can save it after installation
+		i.provData = provData
+	}
+	// Note: We don't fail if .prov file doesn't exist - the verification logic
+	// in InstallWithOptions will handle missing .prov files appropriately
+
+	// Return the source path directly, no cleanup needed
+	return i.Source, nil, nil
 }
diff --git a/internal/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
index 05118e183..339028ef3 100644
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -86,8 +86,8 @@ func TestLocalInstallerTarball(t *testing.T) {
 		Body string
 		Mode int64
 	}{
-		{"plugin.yaml", "name: test-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644},
-		{"bin/test-plugin", "#!/bin/bash\necho test", 0755},
+		{"test-plugin/plugin.yaml", "name: test-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644},
+		{"test-plugin/bin/test-plugin", "#!/bin/bash\necho test", 0755},
 	}
 
 	for _, file := range files {
@@ -146,82 +146,3 @@ func TestLocalInstallerTarball(t *testing.T) {
 		t.Fatalf("plugin not found at %s: %v", i.Path(), err)
 	}
 }
-
-func TestLocalInstallerTarballWithSubdirectory(t *testing.T) {
-	ensure.HelmHome(t)
-
-	// Create a test tarball with subdirectory
-	tempDir := t.TempDir()
-	tarballPath := filepath.Join(tempDir, "subdir-plugin-1.0.0.tar.gz")
-
-	// Create tarball content
-	var buf bytes.Buffer
-	gw := gzip.NewWriter(&buf)
-	tw := tar.NewWriter(gw)
-
-	files := []struct {
-		Name  string
-		Body  string
-		Mode  int64
-		IsDir bool
-	}{
-		{"my-plugin/", "", 0755, true},
-		{"my-plugin/plugin.yaml", "name: my-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644, false},
-		{"my-plugin/bin/", "", 0755, true},
-		{"my-plugin/bin/my-plugin", "#!/bin/bash\necho test", 0755, false},
-	}
-
-	for _, file := range files {
-		hdr := &tar.Header{
-			Name: file.Name,
-			Mode: file.Mode,
-		}
-		if file.IsDir {
-			hdr.Typeflag = tar.TypeDir
-		} else {
-			hdr.Size = int64(len(file.Body))
-		}
-
-		if err := tw.WriteHeader(hdr); err != nil {
-			t.Fatal(err)
-		}
-		if !file.IsDir {
-			if _, err := tw.Write([]byte(file.Body)); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	if err := tw.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if err := gw.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Write tarball to file
-	if err := os.WriteFile(tarballPath, buf.Bytes(), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Test installation
-	i, err := NewForSource(tarballPath, "")
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-
-	if err := Install(i); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedPath := helmpath.DataPath("plugins", "subdir-plugin")
-	if i.Path() != expectedPath {
-		t.Fatalf("expected path %q, got %q", expectedPath, i.Path())
-	}
-
-	// Verify plugin was installed from subdirectory
-	pluginYaml := filepath.Join(i.Path(), "plugin.yaml")
-	if _, err := os.Stat(pluginYaml); err != nil {
-		t.Fatalf("plugin.yaml not found at %s: %v", pluginYaml, err)
-	}
-}
diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go
index a96a94ee1..c33ef13d5 100644
--- a/internal/plugin/installer/oci_installer.go
+++ b/internal/plugin/installer/oci_installer.go
@@ -25,6 +25,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/cli"
@@ -33,6 +34,9 @@ import (
 	"helm.sh/helm/v4/pkg/registry"
 )
 
+// Ensure OCIInstaller implements Verifier
+var _ Verifier = (*OCIInstaller)(nil)
+
 // OCIInstaller installs plugins from OCI registries
 type OCIInstaller struct {
 	CacheDir   string
@@ -85,17 +89,44 @@ func (i *OCIInstaller) Install() error {
 		return fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
 	}
 
-	// Create cache directory
-	if err := os.MkdirAll(i.CacheDir, 0755); err != nil {
-		return fmt.Errorf("failed to create cache directory: %w", err)
+	// Save the original tarball to plugins directory for verification
+	// For OCI plugins, extract version from plugin.yaml inside the tarball
+	pluginBytes := pluginData.Bytes()
+
+	// Extract metadata to get the actual plugin name and version
+	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	if err != nil {
+		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
+	}
+	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
+
+	tarballPath := helmpath.DataPath("plugins", filename)
+	if err := os.MkdirAll(filepath.Dir(tarballPath), 0755); err != nil {
+		return fmt.Errorf("failed to create plugins directory: %w", err)
+	}
+	if err := os.WriteFile(tarballPath, pluginBytes, 0644); err != nil {
+		return fmt.Errorf("failed to save tarball: %w", err)
+	}
+
+	// Try to download and save .prov file alongside the tarball
+	provSource := i.Source + ".prov"
+	if provData, err := i.getter.Get(provSource); err == nil {
+		provPath := tarballPath + ".prov"
+		if err := os.WriteFile(provPath, provData.Bytes(), 0644); err != nil {
+			slog.Debug("failed to save provenance file", "error", err)
+		}
 	}
 
 	// Check if this is a gzip compressed file
-	pluginBytes := pluginData.Bytes()
 	if len(pluginBytes) < 2 || pluginBytes[0] != 0x1f || pluginBytes[1] != 0x8b {
 		return fmt.Errorf("plugin data is not a gzip compressed archive")
 	}
 
+	// Create cache directory
+	if err := os.MkdirAll(i.CacheDir, 0755); err != nil {
+		return fmt.Errorf("failed to create cache directory: %w", err)
+	}
+
 	// Extract as gzipped tar
 	if err := extractTarGz(bytes.NewReader(pluginBytes), i.CacheDir); err != nil {
 		return fmt.Errorf("failed to extract plugin: %w", err)
@@ -214,3 +245,61 @@ func extractTar(r io.Reader, targetDir string) error {
 
 	return nil
 }
+
+// SupportsVerification returns true since OCI plugins can be verified
+func (i *OCIInstaller) SupportsVerification() bool {
+	return true
+}
+
+// PrepareForVerification downloads the plugin tarball and provenance to a temporary directory
+func (i *OCIInstaller) PrepareForVerification() (pluginPath string, cleanup func(), err error) {
+	slog.Debug("preparing OCI plugin for verification", "source", i.Source)
+
+	// Create temporary directory for verification
+	tempDir, err := os.MkdirTemp("", "helm-oci-verify-")
+	if err != nil {
+		return "", nil, fmt.Errorf("failed to create temp directory: %w", err)
+	}
+
+	cleanup = func() {
+		os.RemoveAll(tempDir)
+	}
+
+	// Download the plugin tarball
+	pluginData, err := i.getter.Get(i.Source)
+	if err != nil {
+		cleanup()
+		return "", nil, fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+	}
+
+	// Extract metadata to get the actual plugin name and version
+	pluginBytes := pluginData.Bytes()
+	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	if err != nil {
+		cleanup()
+		return "", nil, fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
+	}
+	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
+
+	// Save plugin tarball to temp directory
+	pluginTarball := filepath.Join(tempDir, filename)
+	if err := os.WriteFile(pluginTarball, pluginBytes, 0644); err != nil {
+		cleanup()
+		return "", nil, fmt.Errorf("failed to save plugin tarball: %w", err)
+	}
+
+	// Try to download the provenance file - don't fail if it doesn't exist
+	provSource := i.Source + ".prov"
+	if provData, err := i.getter.Get(provSource); err == nil {
+		// Save provenance to temp directory
+		provFile := filepath.Join(tempDir, filename+".prov")
+		if err := os.WriteFile(provFile, provData.Bytes(), 0644); err == nil {
+			slog.Debug("prepared plugin for verification", "plugin", pluginTarball, "provenance", provFile)
+		}
+	}
+	// Note: We don't fail if .prov file can't be downloaded - the verification logic
+	// in InstallWithOptions will handle missing .prov files appropriately
+
+	slog.Debug("prepared plugin for verification", "plugin", pluginTarball)
+	return pluginTarball, cleanup, nil
+}
diff --git a/internal/plugin/installer/oci_installer_test.go b/internal/plugin/installer/oci_installer_test.go
index 1ed10ff8e..1280cf97d 100644
--- a/internal/plugin/installer/oci_installer_test.go
+++ b/internal/plugin/installer/oci_installer_test.go
@@ -34,6 +34,7 @@ import (
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
+	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
@@ -125,7 +126,7 @@ func mockOCIRegistryWithArtifactType(t *testing.T, pluginName string) (*httptest
 				Digest:    digest.Digest(layerDigest),
 				Size:      int64(len(pluginData)),
 				Annotations: map[string]string{
-					ocispec.AnnotationTitle: pluginName + ".tgz", // Layer named properly
+					ocispec.AnnotationTitle: pluginName + "-1.0.0.tgz", // Layer named with version
 				},
 			},
 		},
@@ -316,9 +317,8 @@ func TestOCIInstaller_Path(t *testing.T) {
 }
 
 func TestOCIInstaller_Install(t *testing.T) {
-	// Set up isolated test environment FIRST
-	testPluginsDir := t.TempDir()
-	t.Setenv("HELM_PLUGINS", testPluginsDir)
+	// Set up isolated test environment
+	ensure.HelmHome(t)
 
 	pluginName := "test-plugin-basic"
 	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
@@ -333,15 +333,10 @@ func TestOCIInstaller_Install(t *testing.T) {
 		t.Fatalf("Expected no error, got %v", err)
 	}
 
-	// The OCI installer uses helmpath.DataPath, which now points to our test directory
+	// The OCI installer uses helmpath.DataPath, which is isolated by ensure.HelmHome(t)
 	actualPath := installer.Path()
 	t.Logf("Installer will use path: %s", actualPath)
 
-	// Verify the path is actually in our test directory
-	if !strings.HasPrefix(actualPath, testPluginsDir) {
-		t.Fatalf("Expected path %s to be under test directory %s", actualPath, testPluginsDir)
-	}
-
 	// Install the plugin
 	if err := Install(installer); err != nil {
 		t.Fatalf("Expected installation to succeed, got error: %v", err)
@@ -399,8 +394,7 @@ func TestOCIInstaller_Install_WithGetterOptions(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			// Set up isolated test environment for each subtest
-			testPluginsDir := t.TempDir()
-			t.Setenv("HELM_PLUGINS", testPluginsDir)
+			ensure.HelmHome(t)
 
 			server, registryHost := mockOCIRegistryWithArtifactType(t, tc.pluginName)
 			defer server.Close()
@@ -440,8 +434,7 @@ func TestOCIInstaller_Install_WithGetterOptions(t *testing.T) {
 
 func TestOCIInstaller_Install_AlreadyExists(t *testing.T) {
 	// Set up isolated test environment
-	testPluginsDir := t.TempDir()
-	t.Setenv("HELM_PLUGINS", testPluginsDir)
+	ensure.HelmHome(t)
 
 	pluginName := "test-plugin-exists"
 	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
@@ -474,8 +467,7 @@ func TestOCIInstaller_Install_AlreadyExists(t *testing.T) {
 
 func TestOCIInstaller_Update(t *testing.T) {
 	// Set up isolated test environment
-	testPluginsDir := t.TempDir()
-	t.Setenv("HELM_PLUGINS", testPluginsDir)
+	ensure.HelmHome(t)
 
 	pluginName := "test-plugin-update"
 	server, registryHost := mockOCIRegistryWithArtifactType(t, pluginName)
diff --git a/internal/plugin/installer/vcs_installer_test.go b/internal/plugin/installer/vcs_installer_test.go
index f024b4b40..d542a0f75 100644
--- a/internal/plugin/installer/vcs_installer_test.go
+++ b/internal/plugin/installer/vcs_installer_test.go
@@ -83,8 +83,9 @@ func TestVCSInstaller(t *testing.T) {
 	if repo.current != "0.1.1" {
 		t.Fatalf("expected version '0.1.1', got %q", repo.current)
 	}
-	if i.Path() != helmpath.DataPath("plugins", "helm-env") {
-		t.Fatalf("expected path '$XDG_CONFIG_HOME/helm/plugins/helm-env', got %q", i.Path())
+	expectedPath := helmpath.DataPath("plugins", "helm-env")
+	if i.Path() != expectedPath {
+		t.Fatalf("expected path %q, got %q", expectedPath, i.Path())
 	}
 
 	// Install again to test plugin exists error
diff --git a/internal/plugin/installer/verification_test.go b/internal/plugin/installer/verification_test.go
new file mode 100644
index 000000000..22f0a8308
--- /dev/null
+++ b/internal/plugin/installer/verification_test.go
@@ -0,0 +1,421 @@
+/*
+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 installer
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/test/ensure"
+)
+
+func TestInstallWithOptions_VerifyMissingProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a temporary plugin tarball without .prov file
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+	defer os.Remove(pluginTgz)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Capture stderr to check warning message
+	oldStderr := os.Stderr
+	r, w, _ := os.Pipe()
+	os.Stderr = w
+
+	// Install with verification enabled (should warn but succeed)
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: "dummy"})
+
+	// Restore stderr and read captured output
+	w.Close()
+	os.Stderr = oldStderr
+	var buf bytes.Buffer
+	io.Copy(&buf, r)
+	output := buf.String()
+
+	// Should succeed with nil result (no verification performed)
+	if err != nil {
+		t.Fatalf("Expected installation to succeed despite missing .prov file, got error: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when .prov file is missing, got: %+v", result)
+	}
+
+	// Should contain warning message
+	expectedWarning := "WARNING: No provenance file found for plugin"
+	if !strings.Contains(output, expectedWarning) {
+		t.Errorf("Expected warning message '%s' in output, got: %s", expectedWarning, output)
+	}
+
+	// Plugin should be installed
+	if _, err := os.Stat(installer.Path()); os.IsNotExist(err) {
+		t.Errorf("Plugin should be installed at %s", installer.Path())
+	}
+}
+
+func TestInstallWithOptions_VerifyWithValidProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a temporary plugin tarball with valid .prov file
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+
+	provFile := pluginTgz + ".prov"
+	createProvFile(t, provFile, pluginTgz, "")
+	defer os.Remove(provFile)
+
+	// Create keyring with test key (empty for testing)
+	keyring := createTestKeyring(t)
+	defer os.Remove(keyring)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install with verification enabled
+	// This will fail signature verification but pass hash validation
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: keyring})
+
+	// Should fail due to invalid signature (empty keyring) but we test that it gets past the hash check
+	if err == nil {
+		t.Fatalf("Expected installation to fail with empty keyring")
+	}
+	if !strings.Contains(err.Error(), "plugin verification failed") {
+		t.Errorf("Expected plugin verification failed error, got: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification fails, got: %+v", result)
+	}
+
+	// Plugin should not be installed due to verification failure
+	if _, err := os.Stat(installer.Path()); !os.IsNotExist(err) {
+		t.Errorf("Plugin should not be installed when verification fails")
+	}
+}
+
+func TestInstallWithOptions_VerifyWithInvalidProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a temporary plugin tarball with invalid .prov file
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+	defer os.Remove(pluginTgz)
+
+	provFile := pluginTgz + ".prov"
+	createProvFileInvalidFormat(t, provFile)
+	defer os.Remove(provFile)
+
+	// Create keyring with test key
+	keyring := createTestKeyring(t)
+	defer os.Remove(keyring)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install with verification enabled (should fail)
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: keyring})
+
+	// Should fail with verification error
+	if err == nil {
+		t.Fatalf("Expected installation with invalid .prov file to fail")
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification fails, got: %+v", result)
+	}
+
+	// Should contain verification failure message
+	expectedError := "plugin verification failed"
+	if !strings.Contains(err.Error(), expectedError) {
+		t.Errorf("Expected error message '%s', got: %s", expectedError, err.Error())
+	}
+
+	// Plugin should not be installed
+	if _, err := os.Stat(installer.Path()); !os.IsNotExist(err) {
+		t.Errorf("Plugin should not be installed when verification fails")
+	}
+}
+
+func TestInstallWithOptions_NoVerifyRequested(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a temporary plugin tarball without .prov file
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+	defer os.Remove(pluginTgz)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install without verification (should succeed without any verification)
+	result, err := InstallWithOptions(installer, Options{Verify: false})
+
+	// Should succeed with no verification
+	if err != nil {
+		t.Fatalf("Expected installation without verification to succeed, got error: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification is disabled, got: %+v", result)
+	}
+
+	// Plugin should be installed
+	if _, err := os.Stat(installer.Path()); os.IsNotExist(err) {
+		t.Errorf("Plugin should be installed at %s", installer.Path())
+	}
+}
+
+func TestInstallWithOptions_VerifyDirectoryNotSupported(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a directory-based plugin (not an archive)
+	pluginDir := createTestPluginDir(t)
+
+	// Create local installer for directory
+	installer, err := NewLocalInstaller(pluginDir)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install with verification should fail (directories don't support verification)
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: "dummy"})
+
+	// Should fail with verification not supported error
+	if err == nil {
+		t.Fatalf("Expected installation to fail with verification not supported error")
+	}
+	if !strings.Contains(err.Error(), "--verify is only supported for plugin tarballs") {
+		t.Errorf("Expected verification not supported error, got: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification fails, got: %+v", result)
+	}
+}
+
+func TestInstallWithOptions_VerifyMismatchedProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create plugin tarball
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+	defer os.Remove(pluginTgz)
+
+	provFile := pluginTgz + ".prov"
+	// Create provenance file with wrong hash (for a different file)
+	createProvFile(t, provFile, pluginTgz, "sha256:wronghash")
+	defer os.Remove(provFile)
+
+	// Create keyring with test key
+	keyring := createTestKeyring(t)
+	defer os.Remove(keyring)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install with verification should fail due to hash mismatch
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: keyring})
+
+	// Should fail with verification error
+	if err == nil {
+		t.Fatalf("Expected installation to fail with hash mismatch")
+	}
+	if !strings.Contains(err.Error(), "plugin verification failed") {
+		t.Errorf("Expected plugin verification failed error, got: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification fails, got: %+v", result)
+	}
+}
+
+func TestInstallWithOptions_VerifyProvenanceAccessError(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create plugin tarball
+	pluginDir := createTestPluginDir(t)
+	pluginTgz := createTarballFromPluginDir(t, pluginDir)
+	defer os.Remove(pluginTgz)
+
+	// Create a .prov file but make it inaccessible (simulate permission error)
+	provFile := pluginTgz + ".prov"
+	if err := os.WriteFile(provFile, []byte("test"), 0000); err != nil {
+		t.Fatalf("Failed to create inaccessible provenance file: %v", err)
+	}
+	defer os.Remove(provFile)
+
+	// Create keyring
+	keyring := createTestKeyring(t)
+	defer os.Remove(keyring)
+
+	// Create local installer
+	installer, err := NewLocalInstaller(pluginTgz)
+	if err != nil {
+		t.Fatalf("Failed to create installer: %v", err)
+	}
+	defer os.RemoveAll(installer.Path())
+
+	// Install with verification should fail due to access error
+	result, err := InstallWithOptions(installer, Options{Verify: true, Keyring: keyring})
+
+	// Should fail with access error (either at stat level or during verification)
+	if err == nil {
+		t.Fatalf("Expected installation to fail with provenance file access error")
+	}
+	// The error could be either "failed to access provenance file" or "plugin verification failed"
+	// depending on when the permission error occurs
+	if !strings.Contains(err.Error(), "failed to access provenance file") &&
+		!strings.Contains(err.Error(), "plugin verification failed") {
+		t.Errorf("Expected provenance file access or verification error, got: %v", err)
+	}
+	if result != nil {
+		t.Errorf("Expected nil verification result when verification fails, got: %+v", result)
+	}
+}
+
+// Helper functions for test setup
+
+func createTestPluginDir(t *testing.T) string {
+	t.Helper()
+
+	// Create temporary directory with plugin structure
+	tmpDir := t.TempDir()
+	pluginDir := filepath.Join(tmpDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatalf("Failed to create plugin directory: %v", err)
+	}
+
+	// Create plugin.yaml using the standardized v1 format
+	pluginYaml := `apiVersion: v1
+name: test-plugin
+type: cli/v1
+runtime: subprocess
+version: 1.0.0
+runtimeConfig:
+  platformCommand:
+    - command: echo`
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(pluginYaml), 0644); err != nil {
+		t.Fatalf("Failed to create plugin.yaml: %v", err)
+	}
+
+	return pluginDir
+}
+
+func createTarballFromPluginDir(t *testing.T, pluginDir string) string {
+	t.Helper()
+
+	// Create tarball using the plugin package helper
+	tmpDir := filepath.Dir(pluginDir)
+	tgzPath := filepath.Join(tmpDir, "test-plugin-1.0.0.tgz")
+	tarFile, err := os.Create(tgzPath)
+	if err != nil {
+		t.Fatalf("Failed to create tarball file: %v", err)
+	}
+	defer tarFile.Close()
+
+	if err := plugin.CreatePluginTarball(pluginDir, "test-plugin", tarFile); err != nil {
+		t.Fatalf("Failed to create tarball: %v", err)
+	}
+
+	return tgzPath
+}
+
+func createProvFile(t *testing.T, provFile, pluginTgz, hash string) {
+	t.Helper()
+
+	var hashStr string
+	if hash == "" {
+		// Calculate actual hash of the tarball for realistic testing
+		data, err := os.ReadFile(pluginTgz)
+		if err != nil {
+			t.Fatalf("Failed to read tarball for hashing: %v", err)
+		}
+		hashSum := sha256.Sum256(data)
+		hashStr = fmt.Sprintf("sha256:%x", hashSum)
+	} else {
+		// Use provided hash (could be wrong for testing)
+		hashStr = hash
+	}
+
+	// Create properly formatted provenance file with specified hash
+	provContent := fmt.Sprintf(`-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+name: test-plugin
+version: 1.0.0
+description: Test plugin for verification
+files:
+  test-plugin-1.0.0.tgz: %s
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAEBCAAGBQJktest...
+-----END PGP SIGNATURE-----
+`, hashStr)
+	if err := os.WriteFile(provFile, []byte(provContent), 0644); err != nil {
+		t.Fatalf("Failed to create provenance file: %v", err)
+	}
+}
+
+func createProvFileInvalidFormat(t *testing.T, provFile string) {
+	t.Helper()
+
+	// Create an invalid provenance file (not PGP signed format)
+	invalidProv := "This is not a valid PGP signed message"
+	if err := os.WriteFile(provFile, []byte(invalidProv), 0644); err != nil {
+		t.Fatalf("Failed to create invalid provenance file: %v", err)
+	}
+}
+
+func createTestKeyring(t *testing.T) string {
+	t.Helper()
+
+	// Create a temporary keyring file
+	tmpDir := t.TempDir()
+	keyringPath := filepath.Join(tmpDir, "pubring.gpg")
+
+	// Create empty keyring for testing
+	if err := os.WriteFile(keyringPath, []byte{}, 0644); err != nil {
+		t.Fatalf("Failed to create test keyring: %v", err)
+	}
+
+	return keyringPath
+}
diff --git a/internal/plugin/sign.go b/internal/plugin/sign.go
new file mode 100644
index 000000000..134c640e7
--- /dev/null
+++ b/internal/plugin/sign.go
@@ -0,0 +1,166 @@
+/*
+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 plugin
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
+	"sigs.k8s.io/yaml"
+
+	"helm.sh/helm/v4/pkg/provenance"
+)
+
+// SignPlugin signs a plugin using the SHA256 hash of the tarball.
+//
+// This is used when packaging and signing a plugin from a tarball file.
+// It creates a signature that includes the tarball hash and plugin metadata,
+// allowing verification of the original tarball later.
+func SignPlugin(tarballPath string, signer *provenance.Signatory) (string, error) {
+	// Extract plugin metadata from tarball
+	pluginMeta, err := extractPluginMetadata(tarballPath)
+	if err != nil {
+		return "", fmt.Errorf("failed to extract plugin metadata: %w", err)
+	}
+
+	// Marshal plugin metadata to YAML bytes
+	metadataBytes, err := yaml.Marshal(pluginMeta)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal plugin metadata: %w", err)
+	}
+
+	// Use the generic provenance signing function
+	return signer.ClearSign(tarballPath, metadataBytes)
+}
+
+// extractPluginMetadata extracts plugin metadata from a tarball
+func extractPluginMetadata(tarballPath string) (*Metadata, error) {
+	f, err := os.Open(tarballPath)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	return ExtractPluginMetadataFromReader(f)
+}
+
+// ExtractPluginMetadataFromReader extracts plugin metadata from a tarball reader
+func ExtractPluginMetadataFromReader(r io.Reader) (*Metadata, error) {
+	gzr, err := gzip.NewReader(r)
+	if err != nil {
+		return nil, err
+	}
+	defer gzr.Close()
+
+	tr := tar.NewReader(gzr)
+	for {
+		header, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		// Look for plugin.yaml file
+		if filepath.Base(header.Name) == "plugin.yaml" {
+			data, err := io.ReadAll(tr)
+			if err != nil {
+				return nil, err
+			}
+
+			// Parse the plugin metadata
+			metadata, err := loadMetadata(data)
+			if err != nil {
+				return nil, err
+			}
+
+			return metadata, nil
+		}
+	}
+
+	return nil, errors.New("plugin.yaml not found in tarball")
+}
+
+// parsePluginMessageBlock parses a signed message block to extract plugin metadata and checksums
+func parsePluginMessageBlock(data []byte) (*Metadata, *provenance.SumCollection, error) {
+	sc := &provenance.SumCollection{}
+
+	// We only need the checksums for verification, not the full metadata
+	if err := provenance.ParseMessageBlock(data, nil, sc); err != nil {
+		return nil, sc, err
+	}
+	return nil, sc, nil
+}
+
+// CreatePluginTarball creates a gzipped tarball from a plugin directory
+func CreatePluginTarball(sourceDir, pluginName string, w io.Writer) error {
+	gzw := gzip.NewWriter(w)
+	defer gzw.Close()
+
+	tw := tar.NewWriter(gzw)
+	defer tw.Close()
+
+	// Use the plugin name as the base directory in the tarball
+	baseDir := pluginName
+
+	// Walk the directory tree
+	return filepath.Walk(sourceDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Create header
+		header, err := tar.FileInfoHeader(info, "")
+		if err != nil {
+			return err
+		}
+
+		// Update the name to be relative to the source directory
+		relPath, err := filepath.Rel(sourceDir, path)
+		if err != nil {
+			return err
+		}
+
+		// Include the base directory name in the tarball
+		header.Name = filepath.Join(baseDir, relPath)
+
+		// Write header
+		if err := tw.WriteHeader(header); err != nil {
+			return err
+		}
+
+		// If it's a regular file, write its content
+		if info.Mode().IsRegular() {
+			file, err := os.Open(path)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+
+			if _, err := io.Copy(tw, file); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	})
+}
diff --git a/internal/plugin/sign_test.go b/internal/plugin/sign_test.go
new file mode 100644
index 000000000..a60970cdc
--- /dev/null
+++ b/internal/plugin/sign_test.go
@@ -0,0 +1,92 @@
+/*
+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 plugin
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"helm.sh/helm/v4/pkg/provenance"
+)
+
+func TestSignPlugin(t *testing.T) {
+	// Create a test plugin directory
+	tempDir := t.TempDir()
+	pluginDir := filepath.Join(tempDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a plugin.yaml file
+	pluginYAML := `apiVersion: v1
+name: test-plugin
+type: cli/v1
+runtime: subprocess
+version: 1.0.0
+runtimeConfig:
+  platformCommand:
+    - command: echo`
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(pluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a tarball
+	tarballPath := filepath.Join(tempDir, "test-plugin.tgz")
+	tarFile, err := os.Create(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := CreatePluginTarball(pluginDir, "test-plugin", tarFile); err != nil {
+		tarFile.Close()
+		t.Fatal(err)
+	}
+	tarFile.Close()
+
+	// Create a test key for signing
+	keyring := "../../pkg/cmd/testdata/helm-test-key.secret"
+	signer, err := provenance.NewFromKeyring(keyring, "helm-test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := signer.DecryptKey(func(_ string) ([]byte, error) {
+		return []byte(""), nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	// Sign the plugin tarball
+	sig, err := SignPlugin(tarballPath, signer)
+	if err != nil {
+		t.Fatalf("failed to sign plugin: %v", err)
+	}
+
+	// Verify the signature contains the expected content
+	if !strings.Contains(sig, "-----BEGIN PGP SIGNED MESSAGE-----") {
+		t.Error("signature does not contain PGP header")
+	}
+
+	// Verify the tarball hash is in the signature
+	expectedHash, err := provenance.DigestFile(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// The signature should contain the tarball hash
+	if !strings.Contains(sig, "sha256:"+expectedHash) {
+		t.Errorf("signature does not contain expected tarball hash: sha256:%s", expectedHash)
+	}
+}
diff --git a/internal/plugin/signing_info.go b/internal/plugin/signing_info.go
new file mode 100644
index 000000000..43d01c893
--- /dev/null
+++ b/internal/plugin/signing_info.go
@@ -0,0 +1,178 @@
+/*
+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 plugin
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"golang.org/x/crypto/openpgp/clearsign" //nolint
+
+	"helm.sh/helm/v4/pkg/helmpath"
+)
+
+// SigningInfo contains information about a plugin's signing status
+type SigningInfo struct {
+	// Status can be:
+	// - "local dev": Plugin is a symlink (development mode)
+	// - "unsigned": No provenance file found
+	// - "invalid provenance": Provenance file is malformed
+	// - "mismatched provenance": Provenance file does not match the installed tarball
+	// - "signed": Valid signature exists for the installed tarball
+	Status   string
+	IsSigned bool // True if plugin has a valid signature (even if not verified against keyring)
+}
+
+// GetPluginSigningInfo returns signing information for an installed plugin
+func GetPluginSigningInfo(metadata Metadata) (*SigningInfo, error) {
+	pluginName := metadata.Name
+	pluginDir := helmpath.DataPath("plugins", pluginName)
+
+	// Check if plugin directory exists
+	fi, err := os.Lstat(pluginDir)
+	if err != nil {
+		return nil, fmt.Errorf("plugin %s not found: %w", pluginName, err)
+	}
+
+	// Check if it's a symlink (local development)
+	if fi.Mode()&os.ModeSymlink != 0 {
+		return &SigningInfo{
+			Status:   "local dev",
+			IsSigned: false,
+		}, nil
+	}
+
+	// Find the exact tarball file for this plugin
+	pluginsDir := helmpath.DataPath("plugins")
+	tarballPath := filepath.Join(pluginsDir, fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version))
+	if _, err := os.Stat(tarballPath); err != nil {
+		return &SigningInfo{
+			Status:   "unsigned",
+			IsSigned: false,
+		}, nil
+	}
+
+	// Check for .prov file associated with the tarball
+	provFile := tarballPath + ".prov"
+	provData, err := os.ReadFile(provFile)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return &SigningInfo{
+				Status:   "unsigned",
+				IsSigned: false,
+			}, nil
+		}
+		return nil, fmt.Errorf("failed to read provenance file: %w", err)
+	}
+
+	// Parse the provenance file to check validity
+	block, _ := clearsign.Decode(provData)
+	if block == nil {
+		return &SigningInfo{
+			Status:   "invalid provenance",
+			IsSigned: false,
+		}, nil
+	}
+
+	// Check if provenance matches the actual tarball
+	blockContent := string(block.Plaintext)
+	if !validateProvenanceHash(blockContent, tarballPath) {
+		return &SigningInfo{
+			Status:   "mismatched provenance",
+			IsSigned: false,
+		}, nil
+	}
+
+	// We have a provenance file that is valid for this plugin
+	// Without a keyring, we can't verify the signature, but we know:
+	// 1. A .prov file exists
+	// 2. It's a valid clearsigned document (cryptographically signed)
+	// 3. The provenance contains valid checksums
+	return &SigningInfo{
+		Status:   "signed",
+		IsSigned: true,
+	}, nil
+}
+
+func validateProvenanceHash(blockContent string, tarballPath string) bool {
+	// Parse provenance to get the expected hash
+	_, sums, err := parsePluginMessageBlock([]byte(blockContent))
+	if err != nil {
+		return false
+	}
+
+	// Must have file checksums
+	if len(sums.Files) == 0 {
+		return false
+	}
+
+	// Calculate actual hash of the tarball
+	actualHash, err := calculateFileHash(tarballPath)
+	if err != nil {
+		return false
+	}
+
+	// Check if the actual hash matches the expected hash in the provenance
+	for filename, expectedHash := range sums.Files {
+		if strings.Contains(filename, filepath.Base(tarballPath)) && expectedHash == actualHash {
+			return true
+		}
+	}
+
+	return false
+}
+
+// calculateFileHash calculates the SHA256 hash of a file
+func calculateFileHash(filePath string) (string, error) {
+	file, err := os.Open(filePath)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	hasher := sha256.New()
+	if _, err := io.Copy(hasher, file); err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("sha256:%x", hasher.Sum(nil)), nil
+}
+
+// GetSigningInfoForPlugins returns signing info for multiple plugins
+func GetSigningInfoForPlugins(plugins []Plugin) map[string]*SigningInfo {
+	result := make(map[string]*SigningInfo)
+
+	for _, p := range plugins {
+		m := p.Metadata()
+
+		info, err := GetPluginSigningInfo(m)
+		if err != nil {
+			// If there's an error, treat as unsigned
+			result[m.Name] = &SigningInfo{
+				Status:   "unknown",
+				IsSigned: false,
+			}
+		} else {
+			result[m.Name] = info
+		}
+	}
+
+	return result
+}
diff --git a/internal/plugin/verify.go b/internal/plugin/verify.go
new file mode 100644
index 000000000..e9656a3a6
--- /dev/null
+++ b/internal/plugin/verify.go
@@ -0,0 +1,72 @@
+/*
+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 plugin
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"helm.sh/helm/v4/pkg/provenance"
+)
+
+// VerifyPlugin verifies a plugin tarball against a signature.
+//
+// This function verifies that a plugin tarball has a valid provenance file
+// and that the provenance file is signed by a trusted entity.
+func VerifyPlugin(pluginPath, keyring string) (*provenance.Verification, error) {
+	// Verify the plugin path exists
+	fi, err := os.Stat(pluginPath)
+	if err != nil {
+		return nil, err
+	}
+
+	// Only support tarball verification
+	if fi.IsDir() {
+		return nil, errors.New("directory verification not supported - only plugin tarballs can be verified")
+	}
+
+	// Verify it's a tarball
+	if !isTarball(pluginPath) {
+		return nil, errors.New("plugin file must be a gzipped tarball (.tar.gz or .tgz)")
+	}
+
+	// Look for provenance file
+	provFile := pluginPath + ".prov"
+	if _, err := os.Stat(provFile); err != nil {
+		return nil, fmt.Errorf("could not find provenance file %s: %w", provFile, err)
+	}
+
+	// Create signatory from keyring
+	sig, err := provenance.NewFromKeyring(keyring, "")
+	if err != nil {
+		return nil, err
+	}
+
+	return verifyPluginTarball(pluginPath, provFile, sig)
+}
+
+// verifyPluginTarball verifies a plugin tarball against its signature
+func verifyPluginTarball(pluginPath, provPath string, sig *provenance.Signatory) (*provenance.Verification, error) {
+	// Reuse chart verification logic from pkg/provenance
+	return sig.Verify(pluginPath, provPath)
+}
+
+// isTarball checks if a file has a tarball extension
+func isTarball(filename string) bool {
+	return filepath.Ext(filename) == ".gz" || filepath.Ext(filename) == ".tgz"
+}
diff --git a/internal/plugin/verify_test.go b/internal/plugin/verify_test.go
new file mode 100644
index 000000000..a09b35ec9
--- /dev/null
+++ b/internal/plugin/verify_test.go
@@ -0,0 +1,201 @@
+/*
+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 plugin
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"helm.sh/helm/v4/pkg/provenance"
+)
+
+const testKeyFile = "../../pkg/cmd/testdata/helm-test-key.secret"
+const testPubFile = "../../pkg/cmd/testdata/helm-test-key.pub"
+
+const testPluginYAML = `apiVersion: v1
+name: test-plugin
+type: cli/v1
+runtime: subprocess
+version: 1.0.0
+runtimeConfig:
+  platformCommand:
+    - command: echo`
+
+func TestVerifyPlugin(t *testing.T) {
+	// Create a test plugin and sign it
+	tempDir := t.TempDir()
+
+	// Create plugin directory
+	pluginDir := filepath.Join(tempDir, "verify-test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create tarball
+	tarballPath := filepath.Join(tempDir, "verify-test-plugin.tar.gz")
+	tarFile, err := os.Create(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := CreatePluginTarball(pluginDir, "test-plugin", tarFile); err != nil {
+		tarFile.Close()
+		t.Fatal(err)
+	}
+	tarFile.Close()
+
+	// Sign the plugin with source directory
+	signer, err := provenance.NewFromKeyring(testKeyFile, "helm-test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := signer.DecryptKey(func(_ string) ([]byte, error) {
+		return []byte(""), nil
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	sig, err := SignPlugin(tarballPath, signer)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Write the signature to .prov file
+	provFile := tarballPath + ".prov"
+	if err := os.WriteFile(provFile, []byte(sig), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Now verify the plugin
+	verification, err := VerifyPlugin(tarballPath, testPubFile)
+	if err != nil {
+		t.Fatalf("Failed to verify plugin: %v", err)
+	}
+
+	// Check verification results
+	if verification.SignedBy == nil {
+		t.Error("SignedBy is nil")
+	}
+
+	if verification.FileName != "verify-test-plugin.tar.gz" {
+		t.Errorf("Expected filename 'verify-test-plugin.tar.gz', got %s", verification.FileName)
+	}
+
+	if verification.FileHash == "" {
+		t.Error("FileHash is empty")
+	}
+}
+
+func TestVerifyPluginBadSignature(t *testing.T) {
+	tempDir := t.TempDir()
+
+	// Create a plugin tarball
+	pluginDir := filepath.Join(tempDir, "bad-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	tarballPath := filepath.Join(tempDir, "bad-plugin.tar.gz")
+	tarFile, err := os.Create(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := CreatePluginTarball(pluginDir, "test-plugin", tarFile); err != nil {
+		tarFile.Close()
+		t.Fatal(err)
+	}
+	tarFile.Close()
+
+	// Create a bad signature (just some text)
+	badSig := `-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+This is not a real signature
+-----BEGIN PGP SIGNATURE-----
+
+InvalidSignatureData
+
+-----END PGP SIGNATURE-----`
+
+	provFile := tarballPath + ".prov"
+	if err := os.WriteFile(provFile, []byte(badSig), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Try to verify - should fail
+	_, err = VerifyPlugin(tarballPath, testPubFile)
+	if err == nil {
+		t.Error("Expected verification to fail with bad signature")
+	}
+}
+
+func TestVerifyPluginMissingProvenance(t *testing.T) {
+	tempDir := t.TempDir()
+	tarballPath := filepath.Join(tempDir, "no-prov.tar.gz")
+
+	// Create a minimal tarball
+	if err := os.WriteFile(tarballPath, []byte("dummy"), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Try to verify without .prov file
+	_, err := VerifyPlugin(tarballPath, testPubFile)
+	if err == nil {
+		t.Error("Expected verification to fail without provenance file")
+	}
+}
+
+func TestVerifyPluginDirectory(t *testing.T) {
+	// Create a test plugin directory
+	tempDir := t.TempDir()
+	pluginDir := filepath.Join(tempDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a plugin.yaml file
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Attempt to verify the directory - should fail
+	_, err := VerifyPlugin(pluginDir, testPubFile)
+	if err == nil {
+		t.Error("Expected directory verification to fail, but it succeeded")
+	}
+
+	expectedError := "directory verification not supported"
+	if !containsString(err.Error(), expectedError) {
+		t.Errorf("Expected error to contain %q, got %q", expectedError, err.Error())
+	}
+}
+
+func containsString(s, substr string) bool {
+	return len(s) >= len(substr) && (s == substr || len(s) > len(substr) &&
+		(s[:len(substr)] == substr || s[len(s)-len(substr):] == substr ||
+			strings.Contains(s, substr)))
+}
diff --git a/pkg/action/package.go b/pkg/action/package.go
index e57ce4921..c59efcdb3 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"golang.org/x/term"
+	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
@@ -143,7 +144,20 @@ func (p *Package) Clearsign(filename string) error {
 		return err
 	}
 
-	sig, err := signer.ClearSign(filename)
+	// Load the chart archive to extract metadata
+	chart, err := loader.LoadFile(filename)
+	if err != nil {
+		return fmt.Errorf("failed to load chart for signing: %w", err)
+	}
+
+	// Marshal chart metadata to YAML bytes
+	metadataBytes, err := yaml.Marshal(chart.Metadata)
+	if err != nil {
+		return fmt.Errorf("failed to marshal chart metadata: %w", err)
+	}
+
+	// Use the generic provenance signing function
+	sig, err := signer.ClearSign(filename, metadataBytes)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/plugin.go b/pkg/cmd/plugin.go
index b03000ad4..393e9672c 100644
--- a/pkg/cmd/plugin.go
+++ b/pkg/cmd/plugin.go
@@ -38,6 +38,8 @@ func newPluginCmd(out io.Writer) *cobra.Command {
 		newPluginListCmd(out),
 		newPluginUninstallCmd(out),
 		newPluginUpdateCmd(out),
+		newPluginPackageCmd(out),
+		newPluginVerifyCmd(out),
 	)
 	return cmd
 }
diff --git a/pkg/cmd/plugin_install.go b/pkg/cmd/plugin_install.go
index 960404a76..0abefa76b 100644
--- a/pkg/cmd/plugin_install.go
+++ b/pkg/cmd/plugin_install.go
@@ -33,6 +33,9 @@ import (
 type pluginInstallOptions struct {
 	source  string
 	version string
+	// signing options
+	verify  bool
+	keyring string
 	// OCI-specific options
 	certFile              string
 	keyFile               string
@@ -45,6 +48,13 @@ type pluginInstallOptions struct {
 
 const pluginInstallDesc = `
 This command allows you to install a plugin from a url to a VCS repo or a local path.
+
+By default, plugin signatures are verified before installation when installing from
+tarballs (.tgz or .tar.gz). This requires a corresponding .prov file to be available
+alongside the tarball.
+For local development, plugins installed from local directories are automatically
+treated as "local dev" and do not require signatures.
+Use --verify=false to skip signature verification for remote plugins.
 `
 
 func newPluginInstallCmd(out io.Writer) *cobra.Command {
@@ -71,6 +81,8 @@ func newPluginInstallCmd(out io.Writer) *cobra.Command {
 		},
 	}
 	cmd.Flags().StringVar(&o.version, "version", "", "specify a version constraint. If this is not specified, the latest version is installed")
+	cmd.Flags().BoolVar(&o.verify, "verify", true, "verify the plugin signature before installing")
+	cmd.Flags().StringVar(&o.keyring, "keyring", defaultKeyring(), "location of public keys used for verification")
 
 	// Add OCI-specific flags
 	cmd.Flags().StringVar(&o.certFile, "cert-file", "", "identify registry client using this SSL certificate file")
@@ -113,10 +125,51 @@ func (o *pluginInstallOptions) run(out io.Writer) error {
 	if err != nil {
 		return err
 	}
-	if err := installer.Install(i); err != nil {
+
+	// Determine if we should verify based on installer type and flags
+	shouldVerify := o.verify
+
+	// Check if this is a local directory installation (for development)
+	if localInst, ok := i.(*installer.LocalInstaller); ok && !localInst.SupportsVerification() {
+		// Local directory installations are allowed without verification
+		shouldVerify = false
+		fmt.Fprintf(out, "Installing plugin from local directory (development mode)\n")
+	} else if shouldVerify {
+		// For remote installations, check if verification is supported
+		if verifier, ok := i.(installer.Verifier); !ok || !verifier.SupportsVerification() {
+			return fmt.Errorf("plugin source does not support verification. Use --verify=false to skip verification")
+		}
+	} else {
+		// User explicitly disabled verification
+		fmt.Fprintf(out, "WARNING: Skipping plugin signature verification\n")
+	}
+
+	// Set up installation options
+	opts := installer.Options{
+		Verify:  shouldVerify,
+		Keyring: o.keyring,
+	}
+
+	// If verify is requested, show verification output
+	if shouldVerify {
+		fmt.Fprintf(out, "Verifying plugin signature...\n")
+	}
+
+	// Install the plugin with options
+	verifyResult, err := installer.InstallWithOptions(i, opts)
+	if err != nil {
 		return err
 	}
 
+	// If verification was successful, show the details
+	if verifyResult != nil {
+		for _, signer := range verifyResult.SignedBy {
+			fmt.Fprintf(out, "Signed by: %s\n", signer)
+		}
+		fmt.Fprintf(out, "Using Key With Fingerprint: %s\n", verifyResult.Fingerprint)
+		fmt.Fprintf(out, "Plugin Hash Verified: %s\n", verifyResult.FileHash)
+	}
+
 	slog.Debug("loading plugin", "path", i.Path())
 	p, err := plugin.LoadDir(i.Path())
 	if err != nil {
diff --git a/pkg/cmd/plugin_list.go b/pkg/cmd/plugin_list.go
index 31a76330d..9b2895441 100644
--- a/pkg/cmd/plugin_list.go
+++ b/pkg/cmd/plugin_list.go
@@ -46,15 +46,23 @@ func newPluginListCmd(out io.Writer) *cobra.Command {
 				return err
 			}
 
+			// Get signing info for all plugins
+			signingInfo := plugin.GetSigningInfoForPlugins(plugins)
+
 			table := uitable.New()
-			table.AddRow("NAME", "VERSION", "TYPE", "APIVERSION", "SOURCE")
+			table.AddRow("NAME", "VERSION", "TYPE", "APIVERSION", "PROVENANCE", "SOURCE")
 			for _, p := range plugins {
 				m := p.Metadata()
 				sourceURL := m.SourceURL
 				if sourceURL == "" {
 					sourceURL = "unknown"
 				}
-				table.AddRow(m.Name, m.Version, m.Type, m.APIVersion, sourceURL)
+				// Get signing status
+				signedStatus := "unknown"
+				if info, ok := signingInfo[m.Name]; ok {
+					signedStatus = info.Status
+				}
+				table.AddRow(m.Name, m.Version, m.Type, m.APIVersion, signedStatus, sourceURL)
 			}
 			fmt.Fprintln(out, table)
 			return nil
diff --git a/pkg/cmd/plugin_package.go b/pkg/cmd/plugin_package.go
new file mode 100644
index 000000000..5da6c624e
--- /dev/null
+++ b/pkg/cmd/plugin_package.go
@@ -0,0 +1,209 @@
+/*
+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 cmd
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"syscall"
+
+	"github.com/spf13/cobra"
+	"golang.org/x/term"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/pkg/cmd/require"
+	"helm.sh/helm/v4/pkg/provenance"
+)
+
+const pluginPackageDesc = `
+This command packages a Helm plugin directory into a tarball.
+
+By default, the command will generate a provenance file signed with a PGP key.
+This ensures the plugin can be verified after installation.
+
+Use --sign=false to skip signing (not recommended for distribution).
+`
+
+type pluginPackageOptions struct {
+	sign           bool
+	keyring        string
+	key            string
+	passphraseFile string
+	pluginPath     string
+	destination    string
+}
+
+func newPluginPackageCmd(out io.Writer) *cobra.Command {
+	o := &pluginPackageOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "package [PATH]",
+		Short: "package a plugin directory into a plugin archive",
+		Long:  pluginPackageDesc,
+		Args:  require.ExactArgs(1),
+		RunE: func(_ *cobra.Command, args []string) error {
+			o.pluginPath = args[0]
+			return o.run(out)
+		},
+	}
+
+	f := cmd.Flags()
+	f.BoolVar(&o.sign, "sign", true, "use a PGP private key to sign this plugin")
+	f.StringVar(&o.key, "key", "", "name of the key to use when signing. Used if --sign is true")
+	f.StringVar(&o.keyring, "keyring", defaultKeyring(), "location of a public keyring")
+	f.StringVar(&o.passphraseFile, "passphrase-file", "", "location of a file which contains the passphrase for the signing key. Use \"-\" to read from stdin.")
+	f.StringVarP(&o.destination, "destination", "d", ".", "location to write the plugin tarball.")
+
+	return cmd
+}
+
+func (o *pluginPackageOptions) run(out io.Writer) error {
+	// Check if the plugin path exists and is a directory
+	fi, err := os.Stat(o.pluginPath)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return fmt.Errorf("plugin package only supports directories, not tarballs")
+	}
+
+	// Load and validate plugin metadata
+	pluginMeta, err := plugin.LoadDir(o.pluginPath)
+	if err != nil {
+		return fmt.Errorf("invalid plugin directory: %w", err)
+	}
+
+	// Create destination directory if needed
+	if err := os.MkdirAll(o.destination, 0755); err != nil {
+		return err
+	}
+
+	// If signing is requested, prepare the signer first
+	var signer *provenance.Signatory
+	if o.sign {
+		// Load the signing key
+		signer, err = provenance.NewFromKeyring(o.keyring, o.key)
+		if err != nil {
+			return fmt.Errorf("error reading from keyring: %w", err)
+		}
+
+		// Get passphrase
+		passphraseFetcher := o.promptUser
+		if o.passphraseFile != "" {
+			passphraseFetcher, err = o.passphraseFileFetcher()
+			if err != nil {
+				return err
+			}
+		}
+
+		// Decrypt the key
+		if err := signer.DecryptKey(passphraseFetcher); err != nil {
+			return err
+		}
+	} else {
+		// User explicitly disabled signing
+		fmt.Fprintf(out, "WARNING: Skipping plugin signing. This is not recommended for plugins intended for distribution.\n")
+	}
+
+	// Now create the tarball (only after signing prerequisites are met)
+	// Use plugin metadata for filename: PLUGIN_NAME-SEMVER.tgz
+	metadata := pluginMeta.Metadata()
+	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
+	tarballPath := filepath.Join(o.destination, filename)
+
+	tarFile, err := os.Create(tarballPath)
+	if err != nil {
+		return fmt.Errorf("failed to create tarball: %w", err)
+	}
+	defer tarFile.Close()
+
+	if err := plugin.CreatePluginTarball(o.pluginPath, metadata.Name, tarFile); err != nil {
+		os.Remove(tarballPath)
+		return fmt.Errorf("failed to create plugin tarball: %w", err)
+	}
+	tarFile.Close() // Ensure file is closed before signing
+
+	// If signing was requested, sign the tarball
+	if o.sign {
+		// Sign the plugin tarball (not the source directory)
+		sig, err := plugin.SignPlugin(tarballPath, signer)
+		if err != nil {
+			os.Remove(tarballPath)
+			return fmt.Errorf("failed to sign plugin: %w", err)
+		}
+
+		// Write the signature
+		provFile := tarballPath + ".prov"
+		if err := os.WriteFile(provFile, []byte(sig), 0644); err != nil {
+			os.Remove(tarballPath)
+			return err
+		}
+
+		fmt.Fprintf(out, "Successfully signed. Signature written to: %s\n", provFile)
+	}
+
+	fmt.Fprintf(out, "Successfully packaged plugin and saved it to: %s\n", tarballPath)
+
+	return nil
+}
+
+func (o *pluginPackageOptions) promptUser(name string) ([]byte, error) {
+	fmt.Printf("Password for key %q >  ", name)
+	pw, err := term.ReadPassword(int(syscall.Stdin))
+	fmt.Println()
+	return pw, err
+}
+
+func (o *pluginPackageOptions) passphraseFileFetcher() (provenance.PassphraseFetcher, error) {
+	file, err := openPassphraseFile(o.passphraseFile, os.Stdin)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	// Read the entire passphrase
+	passphrase, err := io.ReadAll(file)
+	if err != nil {
+		return nil, err
+	}
+
+	// Trim any trailing newline characters (both \n and \r\n)
+	passphrase = bytes.TrimRight(passphrase, "\r\n")
+
+	return func(_ string) ([]byte, error) {
+		return passphrase, nil
+	}, nil
+}
+
+// copied from action.openPassphraseFile
+// TODO: should we move this to pkg/action so we can reuse the func from there?
+func openPassphraseFile(passphraseFile string, stdin *os.File) (*os.File, error) {
+	if passphraseFile == "-" {
+		stat, err := stdin.Stat()
+		if err != nil {
+			return nil, err
+		}
+		if (stat.Mode() & os.ModeNamedPipe) == 0 {
+			return nil, errors.New("specified reading passphrase from stdin, without input on stdin")
+		}
+		return stdin, nil
+	}
+	return os.Open(passphraseFile)
+}
diff --git a/pkg/cmd/plugin_package_test.go b/pkg/cmd/plugin_package_test.go
new file mode 100644
index 000000000..df6cdd849
--- /dev/null
+++ b/pkg/cmd/plugin_package_test.go
@@ -0,0 +1,170 @@
+/*
+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 cmd
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// Common plugin.yaml content for v1 format tests
+const testPluginYAML = `apiVersion: v1
+name: test-plugin
+version: 1.0.0
+type: cli/v1
+runtime: subprocess
+config:
+  usage: test-plugin [flags]
+  shortHelp: A test plugin
+  longHelp: A test plugin for testing purposes
+runtimeConfig:
+  platformCommands:
+    - os: linux
+      command: echo
+      args: ["test"]`
+
+func TestPluginPackageWithoutSigning(t *testing.T) {
+	// Create a test plugin directory
+	tempDir := t.TempDir()
+	pluginDir := filepath.Join(tempDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a plugin.yaml file
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create package options with sign=false
+	o := &pluginPackageOptions{
+		sign:        false, // Explicitly disable signing
+		pluginPath:  pluginDir,
+		destination: tempDir,
+	}
+
+	// Run the package command
+	out := &bytes.Buffer{}
+	err := o.run(out)
+
+	// Should succeed without error
+	if err != nil {
+		t.Errorf("unexpected error: %v", err)
+	}
+
+	// Check that tarball was created with plugin name and version
+	tarballPath := filepath.Join(tempDir, "test-plugin-1.0.0.tgz")
+	if _, err := os.Stat(tarballPath); os.IsNotExist(err) {
+		t.Error("tarball should exist when sign=false")
+	}
+
+	// Check that no .prov file was created
+	provPath := tarballPath + ".prov"
+	if _, err := os.Stat(provPath); !os.IsNotExist(err) {
+		t.Error("provenance file should not exist when sign=false")
+	}
+
+	// Output should contain warning about skipping signing
+	output := out.String()
+	if !strings.Contains(output, "WARNING: Skipping plugin signing") {
+		t.Error("should print warning when signing is skipped")
+	}
+	if !strings.Contains(output, "Successfully packaged") {
+		t.Error("should print success message")
+	}
+}
+
+func TestPluginPackageDefaultRequiresSigning(t *testing.T) {
+	// Create a test plugin directory
+	tempDir := t.TempDir()
+	pluginDir := filepath.Join(tempDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a plugin.yaml file
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create package options with default sign=true and invalid keyring
+	o := &pluginPackageOptions{
+		sign:        true, // This is now the default
+		keyring:     "/non/existent/keyring",
+		pluginPath:  pluginDir,
+		destination: tempDir,
+	}
+
+	// Run the package command
+	out := &bytes.Buffer{}
+	err := o.run(out)
+
+	// Should fail because signing is required by default
+	if err == nil {
+		t.Error("expected error when signing fails with default settings")
+	}
+
+	// Check that no tarball was created
+	tarballPath := filepath.Join(tempDir, "test-plugin.tgz")
+	if _, err := os.Stat(tarballPath); !os.IsNotExist(err) {
+		t.Error("tarball should not exist when signing fails")
+	}
+}
+
+func TestPluginPackageSigningFailure(t *testing.T) {
+	// Create a test plugin directory
+	tempDir := t.TempDir()
+	pluginDir := filepath.Join(tempDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create a plugin.yaml file
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create package options with sign flag but invalid keyring
+	o := &pluginPackageOptions{
+		sign:        true,
+		keyring:     "/non/existent/keyring", // This will cause signing to fail
+		pluginPath:  pluginDir,
+		destination: tempDir,
+	}
+
+	// Run the package command
+	out := &bytes.Buffer{}
+	err := o.run(out)
+
+	// Should get an error
+	if err == nil {
+		t.Error("expected error when signing fails, got nil")
+	}
+
+	// Check that no tarball was created
+	tarballPath := filepath.Join(tempDir, "test-plugin.tgz")
+	if _, err := os.Stat(tarballPath); !os.IsNotExist(err) {
+		t.Error("tarball should not exist when signing fails")
+	}
+
+	// Output should not contain success message
+	if bytes.Contains(out.Bytes(), []byte("Successfully packaged")) {
+		t.Error("should not print success message when signing fails")
+	}
+}
diff --git a/pkg/cmd/plugin_verify.go b/pkg/cmd/plugin_verify.go
new file mode 100644
index 000000000..4772fcc33
--- /dev/null
+++ b/pkg/cmd/plugin_verify.go
@@ -0,0 +1,88 @@
+/*
+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 cmd
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/spf13/cobra"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/pkg/cmd/require"
+)
+
+const pluginVerifyDesc = `
+This command verifies that a Helm plugin has a valid provenance file,
+and that the provenance file is signed by a trusted PGP key.
+
+It supports both:
+- Plugin tarballs (.tgz or .tar.gz files)
+- Installed plugin directories
+
+For installed plugins, use the path shown by 'helm env HELM_PLUGINS' followed
+by the plugin name. For example:
+  helm plugin verify ~/.local/share/helm/plugins/example-cli
+
+To generate a signed plugin, use the 'helm plugin package --sign' command.
+`
+
+type pluginVerifyOptions struct {
+	keyring    string
+	pluginPath string
+}
+
+func newPluginVerifyCmd(out io.Writer) *cobra.Command {
+	o := &pluginVerifyOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "verify [PATH]",
+		Short: "verify that a plugin at the given path has been signed and is valid",
+		Long:  pluginVerifyDesc,
+		Args:  require.ExactArgs(1),
+		RunE: func(_ *cobra.Command, args []string) error {
+			o.pluginPath = args[0]
+			return o.run(out)
+		},
+	}
+
+	cmd.Flags().StringVar(&o.keyring, "keyring", defaultKeyring(), "keyring containing public keys")
+
+	return cmd
+}
+
+func (o *pluginVerifyOptions) run(out io.Writer) error {
+	// Verify the plugin
+	verification, err := plugin.VerifyPlugin(o.pluginPath, o.keyring)
+	if err != nil {
+		return err
+	}
+
+	// Output verification details
+	for name := range verification.SignedBy.Identities {
+		fmt.Fprintf(out, "Signed by: %v\n", name)
+	}
+	fmt.Fprintf(out, "Using Key With Fingerprint: %X\n", verification.SignedBy.PrimaryKey.Fingerprint)
+
+	// Only show hash for tarballs
+	if verification.FileHash != "" {
+		fmt.Fprintf(out, "Plugin Hash Verified: %s\n", verification.FileHash)
+	} else {
+		fmt.Fprintf(out, "Plugin Metadata Verified: %s\n", verification.FileName)
+	}
+
+	return nil
+}
diff --git a/pkg/cmd/plugin_verify_test.go b/pkg/cmd/plugin_verify_test.go
new file mode 100644
index 000000000..e631814dd
--- /dev/null
+++ b/pkg/cmd/plugin_verify_test.go
@@ -0,0 +1,264 @@
+/*
+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 cmd
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/test/ensure"
+)
+
+func TestPluginVerifyCmd_NoArgs(t *testing.T) {
+	ensure.HelmHome(t)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when no arguments provided")
+	}
+	if !strings.Contains(err.Error(), "requires 1 argument") {
+		t.Errorf("expected 'requires 1 argument' error, got: %v", err)
+	}
+}
+
+func TestPluginVerifyCmd_TooManyArgs(t *testing.T) {
+	ensure.HelmHome(t)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{"plugin1", "plugin2"})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when too many arguments provided")
+	}
+	if !strings.Contains(err.Error(), "requires 1 argument") {
+		t.Errorf("expected 'requires 1 argument' error, got: %v", err)
+	}
+}
+
+func TestPluginVerifyCmd_NonexistentFile(t *testing.T) {
+	ensure.HelmHome(t)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{"/nonexistent/plugin.tgz"})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when plugin file doesn't exist")
+	}
+}
+
+func TestPluginVerifyCmd_MissingProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a plugin tarball without .prov file
+	pluginTgz := createTestPluginTarball(t)
+	defer os.Remove(pluginTgz)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{pluginTgz})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when .prov file is missing")
+	}
+	if !strings.Contains(err.Error(), "could not find provenance file") {
+		t.Errorf("expected 'could not find provenance file' error, got: %v", err)
+	}
+}
+
+func TestPluginVerifyCmd_InvalidProvenance(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a plugin tarball with invalid .prov file
+	pluginTgz := createTestPluginTarball(t)
+	defer os.Remove(pluginTgz)
+
+	// Create invalid .prov file
+	provFile := pluginTgz + ".prov"
+	if err := os.WriteFile(provFile, []byte("invalid provenance"), 0644); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(provFile)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{pluginTgz})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when .prov file is invalid")
+	}
+}
+
+func TestPluginVerifyCmd_DirectoryNotSupported(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a plugin directory
+	pluginDir := createTestPluginDir(t)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{pluginDir})
+
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error when verifying directory")
+	}
+	if !strings.Contains(err.Error(), "directory verification not supported") {
+		t.Errorf("expected 'directory verification not supported' error, got: %v", err)
+	}
+}
+
+func TestPluginVerifyCmd_KeyringFlag(t *testing.T) {
+	ensure.HelmHome(t)
+
+	// Create a plugin tarball with .prov file
+	pluginTgz := createTestPluginTarball(t)
+	defer os.Remove(pluginTgz)
+
+	// Create .prov file
+	provFile := pluginTgz + ".prov"
+	createProvFile(t, provFile, pluginTgz, "")
+	defer os.Remove(provFile)
+
+	// Create empty keyring file
+	keyring := createTestKeyring(t)
+	defer os.Remove(keyring)
+
+	out := &bytes.Buffer{}
+	cmd := newPluginVerifyCmd(out)
+	cmd.SetArgs([]string{"--keyring", keyring, pluginTgz})
+
+	// Should fail with keyring error but command parsing should work
+	err := cmd.Execute()
+	if err == nil {
+		t.Error("expected error with empty keyring")
+	}
+	// The important thing is that the keyring flag was parsed and used
+}
+
+func TestPluginVerifyOptions_Run_Success(t *testing.T) {
+	// Skip this test as it would require real PGP keys and valid signatures
+	// The core verification logic is thoroughly tested in internal/plugin/verify_test.go
+	t.Skip("Success case requires real PGP keys - core logic tested in internal/plugin/verify_test.go")
+}
+
+// Helper functions for test setup
+
+func createTestPluginDir(t *testing.T) string {
+	t.Helper()
+
+	// Create temporary directory with plugin structure
+	tmpDir := t.TempDir()
+	pluginDir := filepath.Join(tmpDir, "test-plugin")
+	if err := os.MkdirAll(pluginDir, 0755); err != nil {
+		t.Fatalf("Failed to create plugin directory: %v", err)
+	}
+
+	// Use the same plugin YAML as other cmd tests
+	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+		t.Fatalf("Failed to create plugin.yaml: %v", err)
+	}
+
+	return pluginDir
+}
+
+func createTestPluginTarball(t *testing.T) string {
+	t.Helper()
+
+	pluginDir := createTestPluginDir(t)
+
+	// Create tarball using the plugin package helper
+	tmpDir := filepath.Dir(pluginDir)
+	tgzPath := filepath.Join(tmpDir, "test-plugin-1.0.0.tgz")
+	tarFile, err := os.Create(tgzPath)
+	if err != nil {
+		t.Fatalf("Failed to create tarball file: %v", err)
+	}
+	defer tarFile.Close()
+
+	if err := plugin.CreatePluginTarball(pluginDir, "test-plugin", tarFile); err != nil {
+		t.Fatalf("Failed to create tarball: %v", err)
+	}
+
+	return tgzPath
+}
+
+func createProvFile(t *testing.T, provFile, pluginTgz, hash string) {
+	t.Helper()
+
+	var hashStr string
+	if hash == "" {
+		// Calculate actual hash of the tarball
+		data, err := os.ReadFile(pluginTgz)
+		if err != nil {
+			t.Fatalf("Failed to read tarball for hashing: %v", err)
+		}
+		hashSum := sha256.Sum256(data)
+		hashStr = fmt.Sprintf("sha256:%x", hashSum)
+	} else {
+		// Use provided hash
+		hashStr = hash
+	}
+
+	// Create properly formatted provenance file with specified hash
+	provContent := fmt.Sprintf(`-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+name: test-plugin
+version: 1.0.0
+description: Test plugin for verification
+files:
+  test-plugin-1.0.0.tgz: %s
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAEBCAAGBQJktest...
+-----END PGP SIGNATURE-----
+`, hashStr)
+	if err := os.WriteFile(provFile, []byte(provContent), 0644); err != nil {
+		t.Fatalf("Failed to create provenance file: %v", err)
+	}
+}
+
+func createTestKeyring(t *testing.T) string {
+	t.Helper()
+
+	// Create a temporary keyring file
+	tmpDir := t.TempDir()
+	keyringPath := filepath.Join(tmpDir, "pubring.gpg")
+
+	// Create empty keyring for testing
+	if err := os.WriteFile(keyringPath, []byte{}, 0644); err != nil {
+		t.Fatalf("Failed to create test keyring: %v", err)
+	}
+
+	return keyringPath
+}
diff --git a/pkg/getter/ocigetter.go b/pkg/getter/ocigetter.go
index 121e000c8..24fc60c56 100644
--- a/pkg/getter/ocigetter.go
+++ b/pkg/getter/ocigetter.go
@@ -175,6 +175,12 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
 
 // getPlugin handles plugin-specific OCI pulls
 func (g *OCIGetter) getPlugin(client *registry.Client, ref string) (*bytes.Buffer, error) {
+	// Check if this is a provenance file request
+	requestingProv := strings.HasSuffix(ref, ".prov")
+	if requestingProv {
+		ref = strings.TrimSuffix(ref, ".prov")
+	}
+
 	// Extract plugin name from the reference
 	// e.g., "ghcr.io/user/plugin-name:v1.0.0" -> "plugin-name"
 	parts := strings.Split(ref, "/")
@@ -190,10 +196,18 @@ func (g *OCIGetter) getPlugin(client *registry.Client, ref string) (*bytes.Buffe
 		pluginName = lastPart[:idx]
 	}
 
-	result, err := client.PullPlugin(ref, pluginName)
+	var pullOpts []registry.PluginPullOption
+	if requestingProv {
+		pullOpts = append(pullOpts, registry.PullPluginOptWithProv(true))
+	}
+
+	result, err := client.PullPlugin(ref, pluginName, pullOpts...)
 	if err != nil {
 		return nil, err
 	}
 
+	if requestingProv {
+		return bytes.NewBuffer(result.Prov.Data), nil
+	}
 	return bytes.NewBuffer(result.PluginData), nil
 }
diff --git a/pkg/provenance/doc.go b/pkg/provenance/doc.go
index 883c0e724..dd14568d9 100644
--- a/pkg/provenance/doc.go
+++ b/pkg/provenance/doc.go
@@ -14,15 +14,15 @@ limitations under the License.
 */
 
 /*
-Package provenance provides tools for establishing the authenticity of a chart.
+Package provenance provides tools for establishing the authenticity of packages.
 
 In Helm, provenance is established via several factors. The primary factor is the
-cryptographic signature of a chart. Chart authors may sign charts, which in turn
-provide the necessary metadata to ensure the integrity of the chart file, the
-Chart.yaml, and the referenced Docker images.
+cryptographic signature of a package. Package authors may sign packages, which in turn
+provide the necessary metadata to ensure the integrity of the package file, the
+metadata, and the referenced Docker images.
 
 A provenance file is clear-signed. This provides cryptographic verification that
-a particular block of information (Chart.yaml, archive file, images) have not
+a particular block of information (metadata, archive file, images) have not
 been tampered with or altered. To learn more, read the GnuPG documentation on
 clear signatures:
 https://www.gnupg.org/gph/en/manual/x135.html
diff --git a/pkg/provenance/sign.go b/pkg/provenance/sign.go
index 504bc6aa1..103c81fbb 100644
--- a/pkg/provenance/sign.go
+++ b/pkg/provenance/sign.go
@@ -30,9 +30,6 @@ import (
 	"golang.org/x/crypto/openpgp/clearsign" //nolint
 	"golang.org/x/crypto/openpgp/packet"    //nolint
 	"sigs.k8s.io/yaml"
-
-	hapi "helm.sh/helm/v4/pkg/chart/v2"
-	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 var defaultPGPConfig = packet.Config{
@@ -58,7 +55,7 @@ type SumCollection struct {
 
 // Verification contains information about a verification operation.
 type Verification struct {
-	// SignedBy contains the entity that signed a chart.
+	// SignedBy contains the entity that signed a package.
 	SignedBy *openpgp.Entity
 	// FileHash is the hash, prepended with the scheme, for the file that was verified.
 	FileHash string
@@ -68,11 +65,11 @@ type Verification struct {
 
 // Signatory signs things.
 //
-// Signatories can be constructed from a PGP private key file using NewFromFiles
+// Signatories can be constructed from a PGP private key file using NewFromFiles,
 // or they can be constructed manually by setting the Entity to a valid
 // PGP entity.
 //
-// The same Signatory can be used to sign or validate multiple charts.
+// The same Signatory can be used to sign or validate multiple packages.
 type Signatory struct {
 	// The signatory for this instance of Helm. This is used for signing.
 	Entity *openpgp.Entity
@@ -197,20 +194,21 @@ func (s *Signatory) DecryptKey(fn PassphraseFetcher) error {
 	return s.Entity.PrivateKey.Decrypt(p)
 }
 
-// ClearSign signs a chart with the given key.
+// ClearSign signs a package with the given key and pre-marshalled metadata.
 //
-// This takes the path to a chart archive file and a key, and it returns a clear signature.
+// This takes the path to a package archive file, a key, and marshalled metadata bytes.
+// This allows both charts and plugins to use the same signing infrastructure.
 //
 // The Signatory must have a valid Entity.PrivateKey for this to work. If it does
 // not, an error will be returned.
-func (s *Signatory) ClearSign(chartpath string) (string, error) {
+func (s *Signatory) ClearSign(packagePath string, metadataBytes []byte) (string, error) {
 	if s.Entity == nil {
 		return "", errors.New("private key not found")
 	} else if s.Entity.PrivateKey == nil {
 		return "", errors.New("provided key is not a private key. Try providing a keyring with secret keys")
 	}
 
-	if fi, err := os.Stat(chartpath); err != nil {
+	if fi, err := os.Stat(packagePath); err != nil {
 		return "", err
 	} else if fi.IsDir() {
 		return "", errors.New("cannot sign a directory")
@@ -218,7 +216,7 @@ func (s *Signatory) ClearSign(chartpath string) (string, error) {
 
 	out := bytes.NewBuffer(nil)
 
-	b, err := messageBlock(chartpath)
+	b, err := messageBlock(packagePath, metadataBytes)
 	if err != nil {
 		return "", err
 	}
@@ -248,10 +246,10 @@ func (s *Signatory) ClearSign(chartpath string) (string, error) {
 	return out.String(), nil
 }
 
-// Verify checks a signature and verifies that it is legit for a chart.
-func (s *Signatory) Verify(chartpath, sigpath string) (*Verification, error) {
+// Verify checks a signature and verifies that it is legit for a package.
+func (s *Signatory) Verify(packagePath, sigpath string) (*Verification, error) {
 	ver := &Verification{}
-	for _, fname := range []string{chartpath, sigpath} {
+	for _, fname := range []string{packagePath, sigpath} {
 		if fi, err := os.Stat(fname); err != nil {
 			return ver, err
 		} else if fi.IsDir() {
@@ -272,17 +270,17 @@ func (s *Signatory) Verify(chartpath, sigpath string) (*Verification, error) {
 	ver.SignedBy = by
 
 	// Second, verify the hash of the tarball.
-	sum, err := DigestFile(chartpath)
+	sum, err := DigestFile(packagePath)
 	if err != nil {
 		return ver, err
 	}
-	_, sums, err := parseMessageBlock(sig.Plaintext)
+	sums, err := parseMessageBlock(sig.Plaintext)
 	if err != nil {
 		return ver, err
 	}
 
 	sum = "sha256:" + sum
-	basename := filepath.Base(chartpath)
+	basename := filepath.Base(packagePath)
 	if sha, ok := sums.Files[basename]; !ok {
 		return ver, fmt.Errorf("provenance does not contain a SHA for a file named %q", basename)
 	} else if sha != sum {
@@ -320,64 +318,64 @@ func (s *Signatory) verifySignature(block *clearsign.Block) (*openpgp.Entity, er
 	)
 }
 
-func messageBlock(chartpath string) (*bytes.Buffer, error) {
-	var b *bytes.Buffer
+// messageBlock creates a message block from a package path and pre-marshalled metadata
+func messageBlock(packagePath string, metadataBytes []byte) (*bytes.Buffer, error) {
 	// Checksum the archive
-	chash, err := DigestFile(chartpath)
+	chash, err := DigestFile(packagePath)
 	if err != nil {
-		return b, err
+		return nil, err
 	}
 
-	base := filepath.Base(chartpath)
+	base := filepath.Base(packagePath)
 	sums := &SumCollection{
 		Files: map[string]string{
 			base: "sha256:" + chash,
 		},
 	}
 
-	// Load the archive into memory.
-	chart, err := loader.LoadFile(chartpath)
-	if err != nil {
-		return b, err
-	}
-
-	// Buffer a hash + checksums YAML file
-	data, err := yaml.Marshal(chart.Metadata)
-	if err != nil {
-		return b, err
-	}
-
+	// Buffer the metadata + checksums YAML file
 	// FIXME: YAML uses ---\n as a file start indicator, but this is not legal in a PGP
 	// clearsign block. So we use ...\n, which is the YAML document end marker.
 	// http://yaml.org/spec/1.2/spec.html#id2800168
-	b = bytes.NewBuffer(data)
+	b := bytes.NewBuffer(metadataBytes)
 	b.WriteString("\n...\n")
 
-	data, err = yaml.Marshal(sums)
+	data, err := yaml.Marshal(sums)
 	if err != nil {
-		return b, err
+		return nil, err
 	}
 	b.Write(data)
 
 	return b, nil
 }
 
-// parseMessageBlock
-func parseMessageBlock(data []byte) (*hapi.Metadata, *SumCollection, error) {
-	// This sucks.
+// parseMessageBlock parses a message block and returns only checksums (metadata ignored like upstream)
+func parseMessageBlock(data []byte) (*SumCollection, error) {
+	sc := &SumCollection{}
+
+	// We ignore metadata, just like upstream - only need checksums for verification
+	if err := ParseMessageBlock(data, nil, sc); err != nil {
+		return sc, err
+	}
+	return sc, nil
+}
+
+// ParseMessageBlock parses a message block containing metadata and checksums.
+//
+// This is the generic version that can work with any metadata type.
+// The metadata parameter should be a pointer to a struct that can be unmarshaled from YAML.
+func ParseMessageBlock(data []byte, metadata interface{}, sums *SumCollection) error {
 	parts := bytes.Split(data, []byte("\n...\n"))
 	if len(parts) < 2 {
-		return nil, nil, errors.New("message block must have at least two parts")
+		return errors.New("message block must have at least two parts")
 	}
 
-	md := &hapi.Metadata{}
-	sc := &SumCollection{}
-
-	if err := yaml.Unmarshal(parts[0], md); err != nil {
-		return md, sc, err
+	if metadata != nil {
+		if err := yaml.Unmarshal(parts[0], metadata); err != nil {
+			return err
+		}
 	}
-	err := yaml.Unmarshal(parts[1], sc)
-	return md, sc, err
+	return yaml.Unmarshal(parts[1], sums)
 }
 
 // loadKey loads a GPG key found at a particular path.
@@ -406,7 +404,7 @@ func loadKeyRing(ringpath string) (openpgp.EntityList, error) {
 // It takes the path to the archive file, and returns a string representation of
 // the SHA256 sum.
 //
-// The intended use of this function is to generate a sum of a chart TGZ file.
+// This function can be used to generate a sum of any package archive file.
 func DigestFile(filename string) (string, error) {
 	f, err := os.Open(filename)
 	if err != nil {
diff --git a/pkg/provenance/sign_test.go b/pkg/provenance/sign_test.go
index 9a60fd19c..4594fac01 100644
--- a/pkg/provenance/sign_test.go
+++ b/pkg/provenance/sign_test.go
@@ -25,6 +25,9 @@ import (
 	"testing"
 
 	pgperrors "golang.org/x/crypto/openpgp/errors" //nolint
+	"sigs.k8s.io/yaml"
+
+	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
 
 const (
@@ -75,8 +78,27 @@ files:
   hashtest-1.2.3.tgz: sha256:c6841b3a895f1444a6738b5d04564a57e860ce42f8519c3be807fb6d9bee7888
 `
 
+// loadChartMetadataForSigning is a test helper that loads chart metadata and marshals it to YAML bytes
+func loadChartMetadataForSigning(t *testing.T, chartPath string) []byte {
+	t.Helper()
+
+	chart, err := loader.LoadFile(chartPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	metadataBytes, err := yaml.Marshal(chart.Metadata)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return metadataBytes
+}
+
 func TestMessageBlock(t *testing.T) {
-	out, err := messageBlock(testChartfile)
+	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
+
+	out, err := messageBlock(testChartfile, metadataBytes)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -88,14 +110,12 @@ func TestMessageBlock(t *testing.T) {
 }
 
 func TestParseMessageBlock(t *testing.T) {
-	md, sc, err := parseMessageBlock([]byte(testMessageBlock))
+	sc, err := parseMessageBlock([]byte(testMessageBlock))
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if md.Name != "hashtest" {
-		t.Errorf("Expected name %q, got %q", "hashtest", md.Name)
-	}
+	// parseMessageBlock only returns checksums, not metadata (like upstream)
 
 	if lsc := len(sc.Files); lsc != 1 {
 		t.Errorf("Expected 1 file, got %d", lsc)
@@ -221,7 +241,9 @@ func TestClearSign(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	sig, err := signer.ClearSign(testChartfile)
+	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
+
+	sig, err := signer.ClearSign(testChartfile, metadataBytes)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -252,7 +274,9 @@ func TestClearSignError(t *testing.T) {
 	// ensure that signing always fails
 	signer.Entity.PrivateKey.PrivateKey = failSigner{}
 
-	sig, err := signer.ClearSign(testChartfile)
+	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
+
+	sig, err := signer.ClearSign(testChartfile, metadataBytes)
 	if err == nil {
 		t.Fatal("didn't get an error from ClearSign but expected one")
 	}
@@ -271,7 +295,9 @@ func TestDecodeSignature(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	sig, err := signer.ClearSign(testChartfile)
+	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
+
+	sig, err := signer.ClearSign(testChartfile, metadataBytes)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/registry/plugin.go b/pkg/registry/plugin.go
index 5d22a99ee..991bace76 100644
--- a/pkg/registry/plugin.go
+++ b/pkg/registry/plugin.go
@@ -38,11 +38,13 @@ type PluginPullOptions struct {
 
 // PluginPullResult contains the result of a plugin pull operation
 type PluginPullResult struct {
-	Manifest       ocispec.Descriptor
-	PluginData     []byte
-	ProvenanceData []byte // Optional provenance data
-	Ref            string
-	PluginName     string
+	Manifest   ocispec.Descriptor
+	PluginData []byte
+	Prov       struct {
+		Data []byte
+	}
+	Ref        string
+	PluginName string
 }
 
 // PullPlugin downloads a plugin from an OCI registry using artifact type
@@ -96,30 +98,31 @@ func (c *Client) processPluginPull(genericResult *GenericPullResult, pluginName
 		return nil, fmt.Errorf("expected config media type %s for legacy compatibility, got %s", PluginArtifactType, manifest.Config.MediaType)
 	}
 
-	// Find the required plugin tarball and optional provenance
-	expectedTarball := pluginName + ".tgz"
-	expectedProvenance := pluginName + ".tgz.prov"
-
+	// Find the plugin tarball and optional provenance using NAME-VERSION.tgz format
 	var pluginDescriptor *ocispec.Descriptor
 	var provenanceDescriptor *ocispec.Descriptor
+	var foundProvenanceName string
 
 	// Look for layers with the expected titles/annotations
 	for _, layer := range manifest.Layers {
 		d := layer
-		// Check for title annotation (preferred method)
+		// Check for title annotation
 		if title, exists := d.Annotations[ocispec.AnnotationTitle]; exists {
-			switch title {
-			case expectedTarball:
+			// Check if this looks like a plugin tarball: {pluginName}-{version}.tgz
+			if pluginDescriptor == nil && strings.HasPrefix(title, pluginName+"-") && strings.HasSuffix(title, ".tgz") {
 				pluginDescriptor = &d
-			case expectedProvenance:
+			}
+			// Check if this looks like a plugin provenance: {pluginName}-{version}.tgz.prov
+			if provenanceDescriptor == nil && strings.HasPrefix(title, pluginName+"-") && strings.HasSuffix(title, ".tgz.prov") {
 				provenanceDescriptor = &d
+				foundProvenanceName = title
 			}
 		}
 	}
 
 	// Plugin tarball is required
 	if pluginDescriptor == nil {
-		return nil, fmt.Errorf("required layer %s not found in manifest", expectedTarball)
+		return nil, fmt.Errorf("required layer matching pattern %s-VERSION.tgz not found in manifest", pluginName)
 	}
 
 	// Build plugin-specific result
@@ -138,7 +141,7 @@ func (c *Client) processPluginPull(genericResult *GenericPullResult, pluginName
 
 	// Fetch provenance data if available
 	if provenanceDescriptor != nil {
-		result.ProvenanceData, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *provenanceDescriptor)
+		result.Prov.Data, err = genericClient.GetDescriptorData(genericResult.MemoryStore, *provenanceDescriptor)
 		if err != nil {
 			return nil, fmt.Errorf("unable to retrieve provenance data with digest %s: %w", provenanceDescriptor.Digest, err)
 		}
@@ -146,8 +149,8 @@ func (c *Client) processPluginPull(genericResult *GenericPullResult, pluginName
 
 	fmt.Fprintf(c.out, "Pulled plugin: %s\n", result.Ref)
 	fmt.Fprintf(c.out, "Digest: %s\n", result.Manifest.Digest)
-	if result.ProvenanceData != nil {
-		fmt.Fprintf(c.out, "Provenance: %s\n", expectedProvenance)
+	if result.Prov.Data != nil {
+		fmt.Fprintf(c.out, "Provenance: %s\n", foundProvenanceName)
 	}
 
 	if strings.Contains(result.Ref, "_") {
@@ -162,6 +165,7 @@ func (c *Client) processPluginPull(genericResult *GenericPullResult, pluginName
 type (
 	pluginPullOperation struct {
 		pluginName string
+		withProv   bool
 	}
 
 	// PluginPullOption allows customizing plugin pull operations
@@ -199,3 +203,10 @@ func GetPluginName(source string) (string, error) {
 
 	return pluginName, nil
 }
+
+// PullPluginOptWithProv configures the pull to fetch provenance data
+func PullPluginOptWithProv(withProv bool) PluginPullOption {
+	return func(operation *pluginPullOperation) {
+		operation.withProv = withProv
+	}
+}

From e814ff3c38043a092b559ac449ef6286e8fb0790 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Tue, 26 Aug 2025 23:19:54 -0400
Subject: [PATCH 174/211] Remove unnecessary file i/o operations from signing
 and verifying

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/installer/http_installer.go  |  95 +++++++---------
 internal/plugin/installer/installer.go       |  31 ++---
 internal/plugin/installer/local_installer.go |  47 +++++---
 internal/plugin/installer/oci_installer.go   | 114 +++++++++----------
 internal/plugin/sign.go                      |  28 ++---
 internal/plugin/sign_test.go                 |   8 +-
 internal/plugin/verify.go                    |  43 +------
 internal/plugin/verify_test.go               |  79 +++++++------
 pkg/action/package.go                        |   9 +-
 pkg/cmd/plugin_package.go                    |  11 +-
 pkg/cmd/plugin_verify.go                     |  39 ++++++-
 pkg/downloader/chart_downloader.go           |  13 ++-
 pkg/provenance/sign.go                       |  81 ++++---------
 pkg/provenance/sign_test.go                  |  75 ++++++------
 14 files changed, 332 insertions(+), 341 deletions(-)

diff --git a/internal/plugin/installer/http_installer.go b/internal/plugin/installer/http_installer.go
index a4687d8c9..bb96314f4 100644
--- a/internal/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@@ -38,8 +38,9 @@ type HTTPInstaller struct {
 	base
 	extractor Extractor
 	getter    getter.Getter
-	// Provenance data to save after installation
-	provData []byte
+	// Cached data to avoid duplicate downloads
+	pluginData []byte
+	provData   []byte
 }
 
 // NewHTTPInstaller creates a new HttpInstaller.
@@ -74,15 +75,18 @@ func NewHTTPInstaller(source string) (*HTTPInstaller, error) {
 //
 // Implements Installer.
 func (i *HTTPInstaller) Install() error {
-	pluginData, err := i.getter.Get(i.Source)
-	if err != nil {
-		return err
+	// Ensure plugin data is cached
+	if i.pluginData == nil {
+		pluginData, err := i.getter.Get(i.Source)
+		if err != nil {
+			return err
+		}
+		i.pluginData = pluginData.Bytes()
 	}
 
 	// Save the original tarball to plugins directory for verification
 	// Extract metadata to get the actual plugin name and version
-	pluginBytes := pluginData.Bytes()
-	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	metadata, err := plugin.ExtractTgzPluginMetadata(bytes.NewReader(i.pluginData))
 	if err != nil {
 		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
 	}
@@ -91,20 +95,28 @@ func (i *HTTPInstaller) Install() error {
 	if err := os.MkdirAll(filepath.Dir(tarballPath), 0755); err != nil {
 		return fmt.Errorf("failed to create plugins directory: %w", err)
 	}
-	if err := os.WriteFile(tarballPath, pluginBytes, 0644); err != nil {
+	if err := os.WriteFile(tarballPath, i.pluginData, 0644); err != nil {
 		return fmt.Errorf("failed to save tarball: %w", err)
 	}
 
-	// Try to download .prov file if it exists
-	provURL := i.Source + ".prov"
-	if provData, err := i.getter.Get(provURL); err == nil {
+	// Ensure prov data is cached if available
+	if i.provData == nil {
+		// Try to download .prov file if it exists
+		provURL := i.Source + ".prov"
+		if provData, err := i.getter.Get(provURL); err == nil {
+			i.provData = provData.Bytes()
+		}
+	}
+
+	// Save prov file if we have the data
+	if i.provData != nil {
 		provPath := tarballPath + ".prov"
-		if err := os.WriteFile(provPath, provData.Bytes(), 0644); err != nil {
+		if err := os.WriteFile(provPath, i.provData, 0644); err != nil {
 			slog.Debug("failed to save provenance file", "error", err)
 		}
 	}
 
-	if err := i.extractor.Extract(pluginData, i.CacheDir); err != nil {
+	if err := i.extractor.Extract(bytes.NewBuffer(i.pluginData), i.CacheDir); err != nil {
 		return fmt.Errorf("extracting files from archive: %w", err)
 	}
 
@@ -148,51 +160,32 @@ func (i *HTTPInstaller) SupportsVerification() bool {
 	return strings.HasSuffix(i.Source, ".tgz") || strings.HasSuffix(i.Source, ".tar.gz")
 }
 
-// PrepareForVerification downloads the plugin and signature files for verification
-func (i *HTTPInstaller) PrepareForVerification() (string, func(), error) {
+// GetVerificationData returns cached plugin and provenance data for verification
+func (i *HTTPInstaller) GetVerificationData() (archiveData, provData []byte, filename string, err error) {
 	if !i.SupportsVerification() {
-		return "", nil, fmt.Errorf("verification not supported for this source")
-	}
-
-	// Create temporary directory for downloads
-	tempDir, err := os.MkdirTemp("", "helm-plugin-verify-*")
-	if err != nil {
-		return "", nil, fmt.Errorf("failed to create temp directory: %w", err)
+		return nil, nil, "", fmt.Errorf("verification not supported for this source")
 	}
 
-	cleanup := func() {
-		os.RemoveAll(tempDir)
-	}
-
-	// Download plugin tarball
-	pluginFile := filepath.Join(tempDir, filepath.Base(i.Source))
-
-	g, err := getter.All(new(cli.EnvSettings)).ByScheme("http")
-	if err != nil {
-		cleanup()
-		return "", nil, err
-	}
-
-	data, err := g.Get(i.Source, getter.WithURL(i.Source))
-	if err != nil {
-		cleanup()
-		return "", nil, fmt.Errorf("failed to download plugin: %w", err)
-	}
-
-	if err := os.WriteFile(pluginFile, data.Bytes(), 0644); err != nil {
-		cleanup()
-		return "", nil, fmt.Errorf("failed to write plugin file: %w", err)
+	// Download plugin data once and cache it
+	if i.pluginData == nil {
+		data, err := i.getter.Get(i.Source)
+		if err != nil {
+			return nil, nil, "", fmt.Errorf("failed to download plugin: %w", err)
+		}
+		i.pluginData = data.Bytes()
 	}
 
-	// Try to download signature file - don't fail if it doesn't exist
-	if provData, err := g.Get(i.Source+".prov", getter.WithURL(i.Source+".prov")); err == nil {
-		if err := os.WriteFile(pluginFile+".prov", provData.Bytes(), 0644); err == nil {
-			// Store the provenance data so we can save it after installation
+	// Download prov data once and cache it if available
+	if i.provData == nil {
+		provData, err := i.getter.Get(i.Source + ".prov")
+		if err != nil {
+			// If provenance file doesn't exist, set provData to nil
+			// The verification logic will handle this gracefully
+			i.provData = nil
+		} else {
 			i.provData = provData.Bytes()
 		}
 	}
-	// Note: We don't fail if .prov file can't be downloaded - the verification logic
-	// in InstallWithOptions will handle missing .prov files appropriately
 
-	return pluginFile, cleanup, nil
+	return i.pluginData, i.provData, filepath.Base(i.Source), nil
 }
diff --git a/internal/plugin/installer/installer.go b/internal/plugin/installer/installer.go
index dd169397e..b65dac2f4 100644
--- a/internal/plugin/installer/installer.go
+++ b/internal/plugin/installer/installer.go
@@ -55,8 +55,8 @@ type Installer interface {
 type Verifier interface {
 	// SupportsVerification returns true if this installer can verify plugins
 	SupportsVerification() bool
-	// PrepareForVerification downloads necessary files for verification
-	PrepareForVerification() (pluginPath string, cleanup func(), err error)
+	// GetVerificationData returns plugin and provenance data for verification
+	GetVerificationData() (archiveData, provData []byte, filename string, err error)
 }
 
 // Install installs a plugin.
@@ -91,28 +91,19 @@ func InstallWithOptions(i Installer, opts Options) (*VerificationResult, error)
 			return nil, fmt.Errorf("--verify is only supported for plugin tarballs (.tgz files)")
 		}
 
-		// Prepare for verification (download files if needed)
-		pluginPath, cleanup, err := verifier.PrepareForVerification()
+		// Get verification data (works for both memory and file-based installers)
+		archiveData, provData, filename, err := verifier.GetVerificationData()
 		if err != nil {
-			return nil, fmt.Errorf("failed to prepare for verification: %w", err)
-		}
-		if cleanup != nil {
-			defer cleanup()
+			return nil, fmt.Errorf("failed to get verification data: %w", err)
 		}
 
-		// Check if provenance file exists
-		provFile := pluginPath + ".prov"
-		if _, err := os.Stat(provFile); err != nil {
-			if os.IsNotExist(err) {
-				// No .prov file found - emit warning but continue installation
-				fmt.Fprintf(os.Stderr, "WARNING: No provenance file found for plugin. Plugin is not signed and cannot be verified.\n")
-			} else {
-				// Other error accessing .prov file
-				return nil, fmt.Errorf("failed to access provenance file: %w", err)
-			}
+		// Check if provenance data exists
+		if len(provData) == 0 {
+			// No .prov file found - emit warning but continue installation
+			fmt.Fprintf(os.Stderr, "WARNING: No provenance file found for plugin. Plugin is not signed and cannot be verified.\n")
 		} else {
-			// Provenance file exists - verify the plugin
-			verification, err := plugin.VerifyPlugin(pluginPath, opts.Keyring)
+			// Provenance data exists - verify the plugin
+			verification, err := plugin.VerifyPlugin(archiveData, provData, filename, opts.Keyring)
 			if err != nil {
 				return nil, fmt.Errorf("plugin verification failed: %w", err)
 			}
diff --git a/internal/plugin/installer/local_installer.go b/internal/plugin/installer/local_installer.go
index 0e00c93d0..e02261d59 100644
--- a/internal/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@@ -35,9 +35,10 @@ var ErrPluginNotAFolder = errors.New("expected plugin to be a folder")
 // LocalInstaller installs plugins from the filesystem.
 type LocalInstaller struct {
 	base
-	isArchive bool
-	extractor Extractor
-	provData  []byte // Provenance data to save after installation
+	isArchive  bool
+	extractor  Extractor
+	pluginData []byte // Cached plugin data
+	provData   []byte // Cached provenance data
 }
 
 // NewLocalInstaller creates a new LocalInstaller.
@@ -110,7 +111,7 @@ func (i *LocalInstaller) installFromArchive() error {
 
 	// Copy the original tarball to plugins directory for verification
 	// Extract metadata to get the actual plugin name and version
-	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(data))
+	metadata, err := plugin.ExtractTgzPluginMetadata(bytes.NewReader(data))
 	if err != nil {
 		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
 	}
@@ -184,21 +185,35 @@ func (i *LocalInstaller) SupportsVerification() bool {
 	return i.isArchive
 }
 
-// PrepareForVerification returns the local path for verification
-func (i *LocalInstaller) PrepareForVerification() (string, func(), error) {
+// GetVerificationData loads plugin and provenance data from local files for verification
+func (i *LocalInstaller) GetVerificationData() (archiveData, provData []byte, filename string, err error) {
 	if !i.SupportsVerification() {
-		return "", nil, fmt.Errorf("verification not supported for directories")
+		return nil, nil, "", fmt.Errorf("verification not supported for directories")
 	}
 
-	// For local files, try to read the .prov file if it exists
-	provFile := i.Source + ".prov"
-	if provData, err := os.ReadFile(provFile); err == nil {
-		// Store the provenance data so we can save it after installation
-		i.provData = provData
+	// Read and cache the plugin archive file
+	if i.pluginData == nil {
+		i.pluginData, err = os.ReadFile(i.Source)
+		if err != nil {
+			return nil, nil, "", fmt.Errorf("failed to read plugin file: %w", err)
+		}
+	}
+
+	// Read and cache the provenance file if it exists
+	if i.provData == nil {
+		provFile := i.Source + ".prov"
+		i.provData, err = os.ReadFile(provFile)
+		if err != nil {
+			if os.IsNotExist(err) {
+				// If provenance file doesn't exist, set provData to nil
+				// The verification logic will handle this gracefully
+				i.provData = nil
+			} else {
+				// If file exists but can't be read (permissions, etc), return error
+				return nil, nil, "", fmt.Errorf("failed to access provenance file %s: %w", provFile, err)
+			}
+		}
 	}
-	// Note: We don't fail if .prov file doesn't exist - the verification logic
-	// in InstallWithOptions will handle missing .prov files appropriately
 
-	// Return the source path directly, no cleanup needed
-	return i.Source, nil, nil
+	return i.pluginData, i.provData, filepath.Base(i.Source), nil
 }
diff --git a/internal/plugin/installer/oci_installer.go b/internal/plugin/installer/oci_installer.go
index c33ef13d5..afbb42ca5 100644
--- a/internal/plugin/installer/oci_installer.go
+++ b/internal/plugin/installer/oci_installer.go
@@ -44,6 +44,9 @@ type OCIInstaller struct {
 	base
 	settings *cli.EnvSettings
 	getter   getter.Getter
+	// Cached data to avoid duplicate downloads
+	pluginData []byte
+	provData   []byte
 }
 
 // NewOCIInstaller creates a new OCIInstaller with optional getter options
@@ -83,18 +86,17 @@ func NewOCIInstaller(source string, options ...getter.Option) (*OCIInstaller, er
 func (i *OCIInstaller) Install() error {
 	slog.Debug("pulling OCI plugin", "source", i.Source)
 
-	// Use getter to download the plugin
-	pluginData, err := i.getter.Get(i.Source)
-	if err != nil {
-		return fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+	// Ensure plugin data is cached
+	if i.pluginData == nil {
+		pluginData, err := i.getter.Get(i.Source)
+		if err != nil {
+			return fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+		}
+		i.pluginData = pluginData.Bytes()
 	}
 
-	// Save the original tarball to plugins directory for verification
-	// For OCI plugins, extract version from plugin.yaml inside the tarball
-	pluginBytes := pluginData.Bytes()
-
 	// Extract metadata to get the actual plugin name and version
-	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	metadata, err := plugin.ExtractTgzPluginMetadata(bytes.NewReader(i.pluginData))
 	if err != nil {
 		return fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
 	}
@@ -104,21 +106,29 @@ func (i *OCIInstaller) Install() error {
 	if err := os.MkdirAll(filepath.Dir(tarballPath), 0755); err != nil {
 		return fmt.Errorf("failed to create plugins directory: %w", err)
 	}
-	if err := os.WriteFile(tarballPath, pluginBytes, 0644); err != nil {
+	if err := os.WriteFile(tarballPath, i.pluginData, 0644); err != nil {
 		return fmt.Errorf("failed to save tarball: %w", err)
 	}
 
-	// Try to download and save .prov file alongside the tarball
-	provSource := i.Source + ".prov"
-	if provData, err := i.getter.Get(provSource); err == nil {
+	// Ensure prov data is cached if available
+	if i.provData == nil {
+		// Try to download .prov file if it exists
+		provSource := i.Source + ".prov"
+		if provData, err := i.getter.Get(provSource); err == nil {
+			i.provData = provData.Bytes()
+		}
+	}
+
+	// Save prov file if we have the data
+	if i.provData != nil {
 		provPath := tarballPath + ".prov"
-		if err := os.WriteFile(provPath, provData.Bytes(), 0644); err != nil {
+		if err := os.WriteFile(provPath, i.provData, 0644); err != nil {
 			slog.Debug("failed to save provenance file", "error", err)
 		}
 	}
 
 	// Check if this is a gzip compressed file
-	if len(pluginBytes) < 2 || pluginBytes[0] != 0x1f || pluginBytes[1] != 0x8b {
+	if len(i.pluginData) < 2 || i.pluginData[0] != 0x1f || i.pluginData[1] != 0x8b {
 		return fmt.Errorf("plugin data is not a gzip compressed archive")
 	}
 
@@ -128,7 +138,7 @@ func (i *OCIInstaller) Install() error {
 	}
 
 	// Extract as gzipped tar
-	if err := extractTarGz(bytes.NewReader(pluginBytes), i.CacheDir); err != nil {
+	if err := extractTarGz(bytes.NewReader(i.pluginData), i.CacheDir); err != nil {
 		return fmt.Errorf("failed to extract plugin: %w", err)
 	}
 
@@ -251,55 +261,41 @@ func (i *OCIInstaller) SupportsVerification() bool {
 	return true
 }
 
-// PrepareForVerification downloads the plugin tarball and provenance to a temporary directory
-func (i *OCIInstaller) PrepareForVerification() (pluginPath string, cleanup func(), err error) {
-	slog.Debug("preparing OCI plugin for verification", "source", i.Source)
+// GetVerificationData downloads and caches plugin and provenance data from OCI registry for verification
+func (i *OCIInstaller) GetVerificationData() (archiveData, provData []byte, filename string, err error) {
+	slog.Debug("getting verification data for OCI plugin", "source", i.Source)
 
-	// Create temporary directory for verification
-	tempDir, err := os.MkdirTemp("", "helm-oci-verify-")
-	if err != nil {
-		return "", nil, fmt.Errorf("failed to create temp directory: %w", err)
-	}
-
-	cleanup = func() {
-		os.RemoveAll(tempDir)
+	// Download plugin data once and cache it
+	if i.pluginData == nil {
+		pluginDataBuffer, err := i.getter.Get(i.Source)
+		if err != nil {
+			return nil, nil, "", fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+		}
+		i.pluginData = pluginDataBuffer.Bytes()
 	}
 
-	// Download the plugin tarball
-	pluginData, err := i.getter.Get(i.Source)
-	if err != nil {
-		cleanup()
-		return "", nil, fmt.Errorf("failed to pull plugin from %s: %w", i.Source, err)
+	// Download prov data once and cache it if available
+	if i.provData == nil {
+		provSource := i.Source + ".prov"
+		// Calling getter.Get again is reasonable because: 1. The OCI registry client already optimizes the underlying network calls
+		// 2. Both calls use the same underlying manifest and memory store 3. The second .prov call is very fast since the data is already pulled
+		provDataBuffer, err := i.getter.Get(provSource)
+		if err != nil {
+			// If provenance file doesn't exist, set provData to nil
+			// The verification logic will handle this gracefully
+			i.provData = nil
+		} else {
+			i.provData = provDataBuffer.Bytes()
+		}
 	}
 
-	// Extract metadata to get the actual plugin name and version
-	pluginBytes := pluginData.Bytes()
-	metadata, err := plugin.ExtractPluginMetadataFromReader(bytes.NewReader(pluginBytes))
+	// Extract metadata to get the filename
+	metadata, err := plugin.ExtractTgzPluginMetadata(bytes.NewReader(i.pluginData))
 	if err != nil {
-		cleanup()
-		return "", nil, fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
-	}
-	filename := fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
-
-	// Save plugin tarball to temp directory
-	pluginTarball := filepath.Join(tempDir, filename)
-	if err := os.WriteFile(pluginTarball, pluginBytes, 0644); err != nil {
-		cleanup()
-		return "", nil, fmt.Errorf("failed to save plugin tarball: %w", err)
-	}
-
-	// Try to download the provenance file - don't fail if it doesn't exist
-	provSource := i.Source + ".prov"
-	if provData, err := i.getter.Get(provSource); err == nil {
-		// Save provenance to temp directory
-		provFile := filepath.Join(tempDir, filename+".prov")
-		if err := os.WriteFile(provFile, provData.Bytes(), 0644); err == nil {
-			slog.Debug("prepared plugin for verification", "plugin", pluginTarball, "provenance", provFile)
-		}
+		return nil, nil, "", fmt.Errorf("failed to extract plugin metadata from tarball: %w", err)
 	}
-	// Note: We don't fail if .prov file can't be downloaded - the verification logic
-	// in InstallWithOptions will handle missing .prov files appropriately
+	filename = fmt.Sprintf("%s-%s.tgz", metadata.Name, metadata.Version)
 
-	slog.Debug("prepared plugin for verification", "plugin", pluginTarball)
-	return pluginTarball, cleanup, nil
+	slog.Debug("got verification data for OCI plugin", "filename", filename)
+	return i.pluginData, i.provData, filename, nil
 }
diff --git a/internal/plugin/sign.go b/internal/plugin/sign.go
index 134c640e7..6b8aafd3e 100644
--- a/internal/plugin/sign.go
+++ b/internal/plugin/sign.go
@@ -17,6 +17,7 @@ package plugin
 
 import (
 	"archive/tar"
+	"bytes"
 	"compress/gzip"
 	"errors"
 	"fmt"
@@ -29,14 +30,14 @@ import (
 	"helm.sh/helm/v4/pkg/provenance"
 )
 
-// SignPlugin signs a plugin using the SHA256 hash of the tarball.
+// SignPlugin signs a plugin using the SHA256 hash of the tarball data.
 //
-// This is used when packaging and signing a plugin from a tarball file.
+// This is used when packaging and signing a plugin from tarball data.
 // It creates a signature that includes the tarball hash and plugin metadata,
 // allowing verification of the original tarball later.
-func SignPlugin(tarballPath string, signer *provenance.Signatory) (string, error) {
-	// Extract plugin metadata from tarball
-	pluginMeta, err := extractPluginMetadata(tarballPath)
+func SignPlugin(tarballData []byte, filename string, signer *provenance.Signatory) (string, error) {
+	// Extract plugin metadata from tarball data
+	pluginMeta, err := ExtractTgzPluginMetadata(bytes.NewReader(tarballData))
 	if err != nil {
 		return "", fmt.Errorf("failed to extract plugin metadata: %w", err)
 	}
@@ -48,22 +49,11 @@ func SignPlugin(tarballPath string, signer *provenance.Signatory) (string, error
 	}
 
 	// Use the generic provenance signing function
-	return signer.ClearSign(tarballPath, metadataBytes)
+	return signer.ClearSign(tarballData, filename, metadataBytes)
 }
 
-// extractPluginMetadata extracts plugin metadata from a tarball
-func extractPluginMetadata(tarballPath string) (*Metadata, error) {
-	f, err := os.Open(tarballPath)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	return ExtractPluginMetadataFromReader(f)
-}
-
-// ExtractPluginMetadataFromReader extracts plugin metadata from a tarball reader
-func ExtractPluginMetadataFromReader(r io.Reader) (*Metadata, error) {
+// ExtractTgzPluginMetadata extracts plugin metadata from a gzipped tarball reader
+func ExtractTgzPluginMetadata(r io.Reader) (*Metadata, error) {
 	gzr, err := gzip.NewReader(r)
 	if err != nil {
 		return nil, err
diff --git a/internal/plugin/sign_test.go b/internal/plugin/sign_test.go
index a60970cdc..fce2dbeb3 100644
--- a/internal/plugin/sign_test.go
+++ b/internal/plugin/sign_test.go
@@ -69,8 +69,14 @@ runtimeConfig:
 		t.Fatal(err)
 	}
 
+	// Read the tarball data
+	tarballData, err := os.ReadFile(tarballPath)
+	if err != nil {
+		t.Fatalf("failed to read tarball: %v", err)
+	}
+
 	// Sign the plugin tarball
-	sig, err := SignPlugin(tarballPath, signer)
+	sig, err := SignPlugin(tarballData, filepath.Base(tarballPath), signer)
 	if err != nil {
 		t.Fatalf("failed to sign plugin: %v", err)
 	}
diff --git a/internal/plugin/verify.go b/internal/plugin/verify.go
index e9656a3a6..760a56e67 100644
--- a/internal/plugin/verify.go
+++ b/internal/plugin/verify.go
@@ -16,57 +16,24 @@ limitations under the License.
 package plugin
 
 import (
-	"errors"
-	"fmt"
-	"os"
 	"path/filepath"
 
 	"helm.sh/helm/v4/pkg/provenance"
 )
 
-// VerifyPlugin verifies a plugin tarball against a signature.
-//
-// This function verifies that a plugin tarball has a valid provenance file
-// and that the provenance file is signed by a trusted entity.
-func VerifyPlugin(pluginPath, keyring string) (*provenance.Verification, error) {
-	// Verify the plugin path exists
-	fi, err := os.Stat(pluginPath)
-	if err != nil {
-		return nil, err
-	}
-
-	// Only support tarball verification
-	if fi.IsDir() {
-		return nil, errors.New("directory verification not supported - only plugin tarballs can be verified")
-	}
-
-	// Verify it's a tarball
-	if !isTarball(pluginPath) {
-		return nil, errors.New("plugin file must be a gzipped tarball (.tar.gz or .tgz)")
-	}
-
-	// Look for provenance file
-	provFile := pluginPath + ".prov"
-	if _, err := os.Stat(provFile); err != nil {
-		return nil, fmt.Errorf("could not find provenance file %s: %w", provFile, err)
-	}
-
+// VerifyPlugin verifies plugin data against a signature using data in memory.
+func VerifyPlugin(archiveData, provData []byte, filename, keyring string) (*provenance.Verification, error) {
 	// Create signatory from keyring
 	sig, err := provenance.NewFromKeyring(keyring, "")
 	if err != nil {
 		return nil, err
 	}
 
-	return verifyPluginTarball(pluginPath, provFile, sig)
-}
-
-// verifyPluginTarball verifies a plugin tarball against its signature
-func verifyPluginTarball(pluginPath, provPath string, sig *provenance.Signatory) (*provenance.Verification, error) {
-	// Reuse chart verification logic from pkg/provenance
-	return sig.Verify(pluginPath, provPath)
+	// Use the new VerifyData method directly
+	return sig.Verify(archiveData, provData, filename)
 }
 
 // isTarball checks if a file has a tarball extension
-func isTarball(filename string) bool {
+func IsTarball(filename string) bool {
 	return filepath.Ext(filename) == ".gz" || filepath.Ext(filename) == ".tgz"
 }
diff --git a/internal/plugin/verify_test.go b/internal/plugin/verify_test.go
index a09b35ec9..9c907788f 100644
--- a/internal/plugin/verify_test.go
+++ b/internal/plugin/verify_test.go
@@ -18,7 +18,6 @@ package plugin
 import (
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 
 	"helm.sh/helm/v4/pkg/provenance"
@@ -74,7 +73,13 @@ func TestVerifyPlugin(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	sig, err := SignPlugin(tarballPath, signer)
+	// Read the tarball data
+	tarballData, err := os.ReadFile(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sig, err := SignPlugin(tarballData, filepath.Base(tarballPath), signer)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -85,8 +90,19 @@ func TestVerifyPlugin(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Read the files for verification
+	archiveData, err := os.ReadFile(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	provData, err := os.ReadFile(provFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	// Now verify the plugin
-	verification, err := VerifyPlugin(tarballPath, testPubFile)
+	verification, err := VerifyPlugin(archiveData, provData, filepath.Base(tarballPath), testPubFile)
 	if err != nil {
 		t.Fatalf("Failed to verify plugin: %v", err)
 	}
@@ -146,8 +162,19 @@ InvalidSignatureData
 		t.Fatal(err)
 	}
 
+	// Read the files
+	archiveData, err := os.ReadFile(tarballPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	provData, err := os.ReadFile(provFile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	// Try to verify - should fail
-	_, err = VerifyPlugin(tarballPath, testPubFile)
+	_, err = VerifyPlugin(archiveData, provData, filepath.Base(tarballPath), testPubFile)
 	if err == nil {
 		t.Error("Expected verification to fail with bad signature")
 	}
@@ -162,40 +189,26 @@ func TestVerifyPluginMissingProvenance(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// Try to verify without .prov file
-	_, err := VerifyPlugin(tarballPath, testPubFile)
-	if err == nil {
-		t.Error("Expected verification to fail without provenance file")
-	}
-}
-
-func TestVerifyPluginDirectory(t *testing.T) {
-	// Create a test plugin directory
-	tempDir := t.TempDir()
-	pluginDir := filepath.Join(tempDir, "test-plugin")
-	if err := os.MkdirAll(pluginDir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a plugin.yaml file
-	if err := os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), []byte(testPluginYAML), 0644); err != nil {
+	// Read the tarball data
+	archiveData, err := os.ReadFile(tarballPath)
+	if err != nil {
 		t.Fatal(err)
 	}
 
-	// Attempt to verify the directory - should fail
-	_, err := VerifyPlugin(pluginDir, testPubFile)
+	// Try to verify with empty provenance data
+	_, err = VerifyPlugin(archiveData, nil, filepath.Base(tarballPath), testPubFile)
 	if err == nil {
-		t.Error("Expected directory verification to fail, but it succeeded")
-	}
-
-	expectedError := "directory verification not supported"
-	if !containsString(err.Error(), expectedError) {
-		t.Errorf("Expected error to contain %q, got %q", expectedError, err.Error())
+		t.Error("Expected verification to fail with empty provenance data")
 	}
 }
 
-func containsString(s, substr string) bool {
-	return len(s) >= len(substr) && (s == substr || len(s) > len(substr) &&
-		(s[:len(substr)] == substr || s[len(s)-len(substr):] == substr ||
-			strings.Contains(s, substr)))
+func TestVerifyPluginMalformedData(t *testing.T) {
+	// Test with malformed tarball data - should fail
+	malformedData := []byte("not a tarball")
+	provData := []byte("fake provenance")
+
+	_, err := VerifyPlugin(malformedData, provData, "malformed.tar.gz", testPubFile)
+	if err == nil {
+		t.Error("Expected malformed data verification to fail, but it succeeded")
+	}
 }
diff --git a/pkg/action/package.go b/pkg/action/package.go
index c59efcdb3..6e762b507 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"syscall"
 
 	"github.com/Masterminds/semver/v3"
@@ -156,8 +157,14 @@ func (p *Package) Clearsign(filename string) error {
 		return fmt.Errorf("failed to marshal chart metadata: %w", err)
 	}
 
+	// Read the chart archive file
+	archiveData, err := os.ReadFile(filename)
+	if err != nil {
+		return fmt.Errorf("failed to read chart archive: %w", err)
+	}
+
 	// Use the generic provenance signing function
-	sig, err := signer.ClearSign(filename, metadataBytes)
+	sig, err := signer.ClearSign(archiveData, filepath.Base(filename), metadataBytes)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/plugin_package.go b/pkg/cmd/plugin_package.go
index 5da6c624e..05f8bb5ad 100644
--- a/pkg/cmd/plugin_package.go
+++ b/pkg/cmd/plugin_package.go
@@ -142,8 +142,15 @@ func (o *pluginPackageOptions) run(out io.Writer) error {
 
 	// If signing was requested, sign the tarball
 	if o.sign {
-		// Sign the plugin tarball (not the source directory)
-		sig, err := plugin.SignPlugin(tarballPath, signer)
+		// Read the tarball data
+		tarballData, err := os.ReadFile(tarballPath)
+		if err != nil {
+			os.Remove(tarballPath)
+			return fmt.Errorf("failed to read tarball for signing: %w", err)
+		}
+
+		// Sign the plugin tarball data
+		sig, err := plugin.SignPlugin(tarballData, filepath.Base(tarballPath), signer)
 		if err != nil {
 			os.Remove(tarballPath)
 			return fmt.Errorf("failed to sign plugin: %w", err)
diff --git a/pkg/cmd/plugin_verify.go b/pkg/cmd/plugin_verify.go
index 4772fcc33..5f89e743e 100644
--- a/pkg/cmd/plugin_verify.go
+++ b/pkg/cmd/plugin_verify.go
@@ -18,6 +18,8 @@ package cmd
 import (
 	"fmt"
 	"io"
+	"os"
+	"path/filepath"
 
 	"github.com/spf13/cobra"
 
@@ -65,8 +67,41 @@ func newPluginVerifyCmd(out io.Writer) *cobra.Command {
 }
 
 func (o *pluginVerifyOptions) run(out io.Writer) error {
-	// Verify the plugin
-	verification, err := plugin.VerifyPlugin(o.pluginPath, o.keyring)
+	// Verify the plugin path exists
+	fi, err := os.Stat(o.pluginPath)
+	if err != nil {
+		return err
+	}
+
+	// Only support tarball verification
+	if fi.IsDir() {
+		return fmt.Errorf("directory verification not supported - only plugin tarballs can be verified")
+	}
+
+	// Verify it's a tarball
+	if !plugin.IsTarball(o.pluginPath) {
+		return fmt.Errorf("plugin file must be a gzipped tarball (.tar.gz or .tgz)")
+	}
+
+	// Look for provenance file
+	provFile := o.pluginPath + ".prov"
+	if _, err := os.Stat(provFile); err != nil {
+		return fmt.Errorf("could not find provenance file %s: %w", provFile, err)
+	}
+
+	// Read the files
+	archiveData, err := os.ReadFile(o.pluginPath)
+	if err != nil {
+		return fmt.Errorf("failed to read plugin file: %w", err)
+	}
+
+	provData, err := os.ReadFile(provFile)
+	if err != nil {
+		return fmt.Errorf("failed to read provenance file: %w", err)
+	}
+
+	// Verify the plugin using data
+	verification, err := plugin.VerifyPlugin(archiveData, provData, filepath.Base(o.pluginPath), o.keyring)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index 693e6b009..a24cad3fd 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -493,7 +493,18 @@ func VerifyChart(path, provfile, keyring string) (*provenance.Verification, erro
 	if err != nil {
 		return nil, fmt.Errorf("failed to load keyring: %w", err)
 	}
-	return sig.Verify(path, provfile)
+
+	// Read archive and provenance files
+	archiveData, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read chart archive: %w", err)
+	}
+	provData, err := os.ReadFile(provfile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read provenance file: %w", err)
+	}
+
+	return sig.Verify(archiveData, provData, filepath.Base(path))
 }
 
 // isTar tests whether the given file is a tar file.
diff --git a/pkg/provenance/sign.go b/pkg/provenance/sign.go
index 103c81fbb..3ffad2765 100644
--- a/pkg/provenance/sign.go
+++ b/pkg/provenance/sign.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"strings"
 
 	"golang.org/x/crypto/openpgp"           //nolint
@@ -194,29 +193,20 @@ func (s *Signatory) DecryptKey(fn PassphraseFetcher) error {
 	return s.Entity.PrivateKey.Decrypt(p)
 }
 
-// ClearSign signs a package with the given key and pre-marshalled metadata.
+// ClearSign signs package data with the given key and pre-marshalled metadata.
 //
-// This takes the path to a package archive file, a key, and marshalled metadata bytes.
-// This allows both charts and plugins to use the same signing infrastructure.
-//
-// The Signatory must have a valid Entity.PrivateKey for this to work. If it does
-// not, an error will be returned.
-func (s *Signatory) ClearSign(packagePath string, metadataBytes []byte) (string, error) {
+// This is the core signing method that works with data in memory.
+// The Signatory must have a valid Entity.PrivateKey for this to work.
+func (s *Signatory) ClearSign(archiveData []byte, filename string, metadataBytes []byte) (string, error) {
 	if s.Entity == nil {
 		return "", errors.New("private key not found")
 	} else if s.Entity.PrivateKey == nil {
 		return "", errors.New("provided key is not a private key. Try providing a keyring with secret keys")
 	}
 
-	if fi, err := os.Stat(packagePath); err != nil {
-		return "", err
-	} else if fi.IsDir() {
-		return "", errors.New("cannot sign a directory")
-	}
-
 	out := bytes.NewBuffer(nil)
 
-	b, err := messageBlock(packagePath, metadataBytes)
+	b, err := messageBlock(archiveData, filename, metadataBytes)
 	if err != nil {
 		return "", err
 	}
@@ -246,69 +236,47 @@ func (s *Signatory) ClearSign(packagePath string, metadataBytes []byte) (string,
 	return out.String(), nil
 }
 
-// Verify checks a signature and verifies that it is legit for a package.
-func (s *Signatory) Verify(packagePath, sigpath string) (*Verification, error) {
+// Verify checks a signature and verifies that it is legit for package data.
+// This is the core verification method that works with data in memory.
+func (s *Signatory) Verify(archiveData, provData []byte, filename string) (*Verification, error) {
 	ver := &Verification{}
-	for _, fname := range []string{packagePath, sigpath} {
-		if fi, err := os.Stat(fname); err != nil {
-			return ver, err
-		} else if fi.IsDir() {
-			return ver, fmt.Errorf("%s cannot be a directory", fname)
-		}
-	}
 
 	// First verify the signature
-	sig, err := s.decodeSignature(sigpath)
-	if err != nil {
-		return ver, fmt.Errorf("failed to decode signature: %w", err)
+	block, _ := clearsign.Decode(provData)
+	if block == nil {
+		return ver, errors.New("signature block not found")
 	}
 
-	by, err := s.verifySignature(sig)
+	by, err := s.verifySignature(block)
 	if err != nil {
 		return ver, err
 	}
 	ver.SignedBy = by
 
-	// Second, verify the hash of the tarball.
-	sum, err := DigestFile(packagePath)
+	// Second, verify the hash of the data.
+	sum, err := Digest(bytes.NewBuffer(archiveData))
 	if err != nil {
 		return ver, err
 	}
-	sums, err := parseMessageBlock(sig.Plaintext)
+	sums, err := parseMessageBlock(block.Plaintext)
 	if err != nil {
 		return ver, err
 	}
 
 	sum = "sha256:" + sum
-	basename := filepath.Base(packagePath)
-	if sha, ok := sums.Files[basename]; !ok {
-		return ver, fmt.Errorf("provenance does not contain a SHA for a file named %q", basename)
+	if sha, ok := sums.Files[filename]; !ok {
+		return ver, fmt.Errorf("provenance does not contain a SHA for a file named %q", filename)
 	} else if sha != sum {
-		return ver, fmt.Errorf("sha256 sum does not match for %s: %q != %q", basename, sha, sum)
+		return ver, fmt.Errorf("sha256 sum does not match for %s: %q != %q", filename, sha, sum)
 	}
 	ver.FileHash = sum
-	ver.FileName = basename
+	ver.FileName = filename
 
 	// TODO: when image signing is added, verify that here.
 
 	return ver, nil
 }
 
-func (s *Signatory) decodeSignature(filename string) (*clearsign.Block, error) {
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-
-	block, _ := clearsign.Decode(data)
-	if block == nil {
-		// There was no sig in the file.
-		return nil, errors.New("signature block not found")
-	}
-
-	return block, nil
-}
-
 // verifySignature verifies that the given block is validly signed, and returns the signer.
 func (s *Signatory) verifySignature(block *clearsign.Block) (*openpgp.Entity, error) {
 	return openpgp.CheckDetachedSignature(
@@ -318,18 +286,17 @@ func (s *Signatory) verifySignature(block *clearsign.Block) (*openpgp.Entity, er
 	)
 }
 
-// messageBlock creates a message block from a package path and pre-marshalled metadata
-func messageBlock(packagePath string, metadataBytes []byte) (*bytes.Buffer, error) {
-	// Checksum the archive
-	chash, err := DigestFile(packagePath)
+// messageBlock creates a message block from archive data and pre-marshalled metadata
+func messageBlock(archiveData []byte, filename string, metadataBytes []byte) (*bytes.Buffer, error) {
+	// Checksum the archive data
+	chash, err := Digest(bytes.NewBuffer(archiveData))
 	if err != nil {
 		return nil, err
 	}
 
-	base := filepath.Base(packagePath)
 	sums := &SumCollection{
 		Files: map[string]string{
-			base: "sha256:" + chash,
+			filename: "sha256:" + chash,
 		},
 	}
 
diff --git a/pkg/provenance/sign_test.go b/pkg/provenance/sign_test.go
index 4594fac01..4f2fc7298 100644
--- a/pkg/provenance/sign_test.go
+++ b/pkg/provenance/sign_test.go
@@ -98,7 +98,13 @@ func loadChartMetadataForSigning(t *testing.T, chartPath string) []byte {
 func TestMessageBlock(t *testing.T) {
 	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
 
-	out, err := messageBlock(testChartfile, metadataBytes)
+	// Read the chart file data
+	archiveData, err := os.ReadFile(testChartfile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	out, err := messageBlock(archiveData, filepath.Base(testChartfile), metadataBytes)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -243,7 +249,13 @@ func TestClearSign(t *testing.T) {
 
 	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
 
-	sig, err := signer.ClearSign(testChartfile, metadataBytes)
+	// Read the chart file data
+	archiveData, err := os.ReadFile(testChartfile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sig, err := signer.ClearSign(archiveData, filepath.Base(testChartfile), metadataBytes)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -276,7 +288,13 @@ func TestClearSignError(t *testing.T) {
 
 	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
 
-	sig, err := signer.ClearSign(testChartfile, metadataBytes)
+	// Read the chart file data
+	archiveData, err := os.ReadFile(testChartfile)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	sig, err := signer.ClearSign(archiveData, filepath.Base(testChartfile), metadataBytes)
 	if err == nil {
 		t.Fatal("didn't get an error from ClearSign but expected one")
 	}
@@ -286,56 +304,25 @@ func TestClearSignError(t *testing.T) {
 	}
 }
 
-func TestDecodeSignature(t *testing.T) {
-	// Unlike other tests, this does a round-trip test, ensuring that a signature
-	// generated by the library can also be verified by the library.
-
+func TestVerify(t *testing.T) {
 	signer, err := NewFromFiles(testKeyfile, testPubfile)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	metadataBytes := loadChartMetadataForSigning(t, testChartfile)
-
-	sig, err := signer.ClearSign(testChartfile, metadataBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := os.CreateTemp(t.TempDir(), "helm-test-sig-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tname := f.Name()
-	defer func() {
-		os.Remove(tname)
-	}()
-	f.WriteString(sig)
-	f.Close()
-
-	sig2, err := signer.decodeSignature(tname)
+	// Read the chart file data
+	archiveData, err := os.ReadFile(testChartfile)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	by, err := signer.verifySignature(sig2)
+	// Read the signature file data
+	sigData, err := os.ReadFile(testSigBlock)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if _, ok := by.Identities[testKeyName]; !ok {
-		t.Errorf("Expected identity %q", testKeyName)
-	}
-}
-
-func TestVerify(t *testing.T) {
-	signer, err := NewFromFiles(testKeyfile, testPubfile)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if ver, err := signer.Verify(testChartfile, testSigBlock); err != nil {
+	if ver, err := signer.Verify(archiveData, sigData, filepath.Base(testChartfile)); err != nil {
 		t.Errorf("Failed to pass verify. Err: %s", err)
 	} else if len(ver.FileHash) == 0 {
 		t.Error("Verification is missing hash.")
@@ -345,7 +332,13 @@ func TestVerify(t *testing.T) {
 		t.Errorf("FileName is unexpectedly %q", ver.FileName)
 	}
 
-	if _, err = signer.Verify(testChartfile, testTamperedSigBlock); err == nil {
+	// Read the tampered signature file data
+	tamperedSigData, err := os.ReadFile(testTamperedSigBlock)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err = signer.Verify(archiveData, tamperedSigData, filepath.Base(testChartfile)); err == nil {
 		t.Errorf("Expected %s to fail.", testTamperedSigBlock)
 	}
 

From 591d863df544ec5d4093e514636553a279a67e09 Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Wed, 20 Aug 2025 17:17:16 -0400
Subject: [PATCH 175/211] Move Postrenderer to a plugin type

Fix/add back postrenderer args unit tests

Signed-off-by: Scott Rigby <scott@r6by.com>
---
 internal/plugin/config.go                     |  10 +-
 internal/plugin/loader_test.go                |  30 ++-
 internal/plugin/metadata.go                   |   4 +-
 internal/plugin/metadata_v1.go                |   2 +-
 internal/plugin/runtime_subprocess.go         |  66 +++++-
 .../plugin/schema/postrenderer.go             |  30 +--
 .../plugdir/good/postrenderer-v1/plugin.yaml  |   8 +
 .../plugdir/good/postrenderer-v1/sed-test.sh  |   6 +
 pkg/action/action.go                          |   4 +-
 pkg/action/install.go                         |   4 +-
 pkg/action/upgrade.go                         |   4 +-
 pkg/cmd/flags.go                              |  27 +--
 pkg/cmd/flags_test.go                         |  12 +-
 pkg/cmd/install.go                            |   2 +-
 pkg/cmd/template.go                           |   2 +-
 .../helm/plugins/postrenderer-v1/plugin.yaml  |   8 +
 .../helm/plugins/postrenderer-v1/sed-test.sh  |   6 +
 pkg/cmd/upgrade.go                            |   2 +-
 pkg/postrender/exec.go                        | 114 -----------
 pkg/postrender/exec_test.go                   | 193 ------------------
 pkg/postrenderer/postrenderer.go              |  85 ++++++++
 pkg/postrenderer/postrenderer_test.go         |  89 ++++++++
 .../plugins/postrenderer-v1/plugin.yaml       |   8 +
 .../plugins/postrenderer-v1/sed-test.sh       |   6 +
 24 files changed, 368 insertions(+), 354 deletions(-)
 rename pkg/postrender/postrender.go => internal/plugin/schema/postrenderer.go (50%)
 create mode 100644 internal/plugin/testdata/plugdir/good/postrenderer-v1/plugin.yaml
 create mode 100755 internal/plugin/testdata/plugdir/good/postrenderer-v1/sed-test.sh
 create mode 100644 pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
 create mode 100755 pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/sed-test.sh
 delete mode 100644 pkg/postrender/exec.go
 delete mode 100644 pkg/postrender/exec_test.go
 create mode 100644 pkg/postrenderer/postrenderer.go
 create mode 100644 pkg/postrenderer/postrenderer_test.go
 create mode 100644 pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
 create mode 100755 pkg/postrenderer/testdata/plugins/postrenderer-v1/sed-test.sh

diff --git a/internal/plugin/config.go b/internal/plugin/config.go
index 83a2e0b25..e8bf4e356 100644
--- a/internal/plugin/config.go
+++ b/internal/plugin/config.go
@@ -46,8 +46,9 @@ type ConfigGetter struct {
 	Protocols []string `yaml:"protocols"`
 }
 
-func (c *ConfigCLI) GetType() string    { return "cli/v1" }
-func (c *ConfigGetter) GetType() string { return "getter/v1" }
+// ConfigPostrenderer represents the configuration for postrenderer plugins
+// there are no runtime-independent configurations for postrenderer/v1 plugin type
+type ConfigPostrenderer struct{}
 
 func (c *ConfigCLI) Validate() error {
 	// Config validation for CLI plugins
@@ -66,6 +67,11 @@ func (c *ConfigGetter) Validate() error {
 	return nil
 }
 
+func (c *ConfigPostrenderer) Validate() error {
+	// Config validation for postrenderer plugins
+	return nil
+}
+
 func remarshalConfig[T Config](configData map[string]any) (Config, error) {
 	data, err := yaml.Marshal(configData)
 	if err != nil {
diff --git a/internal/plugin/loader_test.go b/internal/plugin/loader_test.go
index 81ef26e02..63d930cbe 100644
--- a/internal/plugin/loader_test.go
+++ b/internal/plugin/loader_test.go
@@ -163,6 +163,31 @@ func TestLoadDirGetter(t *testing.T) {
 	assert.Equal(t, expect, plug.Metadata())
 }
 
+func TestPostRenderer(t *testing.T) {
+	dirname := "testdata/plugdir/good/postrenderer-v1"
+
+	expect := Metadata{
+		Name:       "postrenderer-v1",
+		Version:    "1.2.3",
+		Type:       "postrenderer/v1",
+		APIVersion: "v1",
+		Runtime:    "subprocess",
+		Config:     &ConfigPostrenderer{},
+		RuntimeConfig: &RuntimeConfigSubprocess{
+			PlatformCommands: []PlatformCommand{
+				{
+					Command: "${HELM_PLUGIN_DIR}/sed-test.sh",
+				},
+			},
+		},
+	}
+
+	plug, err := LoadDir(dirname)
+	require.NoError(t, err)
+	assert.Equal(t, dirname, plug.Dir())
+	assert.Equal(t, expect, plug.Metadata())
+}
+
 func TestDetectDuplicates(t *testing.T) {
 	plugs := []Plugin{
 		mockSubprocessCLIPlugin(t, "foo"),
@@ -195,13 +220,14 @@ func TestLoadAll(t *testing.T) {
 		plugsMap[p.Metadata().Name] = p
 	}
 
-	assert.Len(t, plugsMap, 6)
+	assert.Len(t, plugsMap, 7)
 	assert.Contains(t, plugsMap, "downloader")
 	assert.Contains(t, plugsMap, "echo-legacy")
 	assert.Contains(t, plugsMap, "echo-v1")
 	assert.Contains(t, plugsMap, "getter")
 	assert.Contains(t, plugsMap, "hello-legacy")
 	assert.Contains(t, plugsMap, "hello-v1")
+	assert.Contains(t, plugsMap, "postrenderer-v1")
 }
 
 func TestFindPlugins(t *testing.T) {
@@ -228,7 +254,7 @@ func TestFindPlugins(t *testing.T) {
 		{
 			name:     "normal",
 			plugdirs: "./testdata/plugdir/good",
-			expected: 6,
+			expected: 7,
 		},
 	}
 	for _, c := range cases {
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
index bb7e9409f..fbe7a16b8 100644
--- a/internal/plugin/metadata.go
+++ b/internal/plugin/metadata.go
@@ -31,7 +31,7 @@ type Metadata struct {
 	// Name is the name of the plugin
 	Name string
 
-	// Type of plugin (eg, cli/v1, getter/v1)
+	// Type of plugin (eg, cli/v1, getter/v1, postrenderer/v1)
 	Type string
 
 	// Runtime specifies the runtime type (subprocess, wasm)
@@ -191,6 +191,8 @@ func convertMetadataConfig(pluginType string, configRaw map[string]any) (Config,
 		config, err = remarshalConfig[*ConfigCLI](configRaw)
 	case "getter/v1":
 		config, err = remarshalConfig[*ConfigGetter](configRaw)
+	case "postrenderer/v1":
+		config, err = remarshalConfig[*ConfigPostrenderer](configRaw)
 	default:
 		return nil, fmt.Errorf("unsupported plugin type: %s", pluginType)
 	}
diff --git a/internal/plugin/metadata_v1.go b/internal/plugin/metadata_v1.go
index 654aa8900..81dbc2e20 100644
--- a/internal/plugin/metadata_v1.go
+++ b/internal/plugin/metadata_v1.go
@@ -27,7 +27,7 @@ type MetadataV1 struct {
 	// Name is the name of the plugin
 	Name string `yaml:"name"`
 
-	// Type of plugin (eg, cli/v1, getter/v1)
+	// Type of plugin (eg, cli/v1, getter/v1, postrenderer/v1)
 	Type string `yaml:"type"`
 
 	// Runtime specifies the runtime type (subprocess, wasm)
diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
index 163f0621f..e7faeed36 100644
--- a/internal/plugin/runtime_subprocess.go
+++ b/internal/plugin/runtime_subprocess.go
@@ -16,9 +16,11 @@ limitations under the License.
 package plugin
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"os/exec"
 	"syscall"
@@ -36,7 +38,7 @@ type SubprocessProtocolCommand struct {
 	Command string `yaml:"command"`
 }
 
-// RuntimeConfigSubprocess represents configuration for subprocess runtime
+// RuntimeConfigSubprocess implements RuntimeConfig for RuntimeSubprocess
 type RuntimeConfigSubprocess struct {
 	// PlatformCommand is a list containing a plugin command, with a platform selector and support for args.
 	PlatformCommands []PlatformCommand `yaml:"platformCommand"`
@@ -73,7 +75,7 @@ type RuntimeSubprocess struct{}
 
 var _ Runtime = (*RuntimeSubprocess)(nil)
 
-// CreateRuntime implementation for RuntimeConfig
+// CreatePlugin implementation for Runtime
 func (r *RuntimeSubprocess) CreatePlugin(pluginDir string, metadata *Metadata) (Plugin, error) {
 	return &SubprocessPluginRuntime{
 		metadata:      *metadata,
@@ -82,7 +84,7 @@ func (r *RuntimeSubprocess) CreatePlugin(pluginDir string, metadata *Metadata) (
 	}, nil
 }
 
-// RuntimeSubprocess implements the Runtime interface for subprocess execution
+// SubprocessPluginRuntime implements the Plugin interface for subprocess execution
 type SubprocessPluginRuntime struct {
 	metadata      Metadata
 	pluginDir     string
@@ -105,6 +107,8 @@ func (r *SubprocessPluginRuntime) Invoke(_ context.Context, input *Input) (*Outp
 		return r.runCLI(input)
 	case schema.InputMessageGetterV1:
 		return r.runGetter(input)
+	case schema.InputMessagePostRendererV1:
+		return r.runPostrenderer(input)
 	default:
 		return nil, fmt.Errorf("unsupported subprocess plugin type %q", r.metadata.Type)
 	}
@@ -216,6 +220,62 @@ func (r *SubprocessPluginRuntime) runCLI(input *Input) (*Output, error) {
 	}, nil
 }
 
+func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error) {
+	if _, ok := input.Message.(schema.InputMessagePostRendererV1); !ok {
+		return nil, fmt.Errorf("plugin %q input message does not implement InputMessagePostRendererV1", r.metadata.Name)
+	}
+
+	msg := input.Message.(schema.InputMessagePostRendererV1)
+	extraArgs := msg.ExtraArgs
+	settings := msg.Settings
+
+	// Setup plugin environment
+	SetupPluginEnv(settings, r.metadata.Name, r.pluginDir)
+
+	cmds := r.RuntimeConfig.PlatformCommands
+	if len(cmds) == 0 && len(r.RuntimeConfig.Command) > 0 {
+		cmds = []PlatformCommand{{Command: r.RuntimeConfig.Command}}
+	}
+
+	command, args, err := PrepareCommands(cmds, true, extraArgs)
+	if err != nil {
+		return nil, fmt.Errorf("failed to prepare plugin command: %w", err)
+	}
+
+	// TODO de-duplicate code here by calling RuntimeSubprocess.invokeWithEnv()
+	cmd := exec.Command(
+		command,
+		args...)
+
+	stdin, err := cmd.StdinPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	go func() {
+		defer stdin.Close()
+		io.Copy(stdin, msg.Manifests)
+	}()
+
+	postRendered := &bytes.Buffer{}
+	stderr := &bytes.Buffer{}
+
+	//cmd.Env = pluginExec.env
+	cmd.Stdout = postRendered
+	cmd.Stderr = stderr
+
+	if err := executeCmd(cmd, r.metadata.Name); err != nil {
+		slog.Info("plugin execution failed", slog.String("stderr", stderr.String()))
+		return nil, err
+	}
+
+	return &Output{
+		Message: &schema.OutputMessagePostRendererV1{
+			Manifests: postRendered,
+		},
+	}, nil
+}
+
 // SetupPluginEnv prepares os.Env for plugins. It operates on os.Env because
 // the plugin subsystem itself needs access to the environment variables
 // created here.
diff --git a/pkg/postrender/postrender.go b/internal/plugin/schema/postrenderer.go
similarity index 50%
rename from pkg/postrender/postrender.go
rename to internal/plugin/schema/postrenderer.go
index 3af384290..0f0c09369 100644
--- a/pkg/postrender/postrender.go
+++ b/internal/plugin/schema/postrenderer.go
@@ -14,16 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package postrender contains an interface that can be implemented for custom
-// post-renderers and an exec implementation that can be used for arbitrary
-// binaries and scripts
-package postrender
-
-import "bytes"
-
-type PostRenderer interface {
-	// Run expects a single buffer filled with Helm rendered manifests. It
-	// expects the modified results to be returned on a separate buffer or an
-	// error if there was an issue or failure while running the post render step
-	Run(renderedManifests *bytes.Buffer) (modifiedManifests *bytes.Buffer, err error)
+package schema
+
+import (
+	"bytes"
+
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+// InputMessagePostRendererV1 implements Input.Message
+type InputMessagePostRendererV1 struct {
+	Manifests *bytes.Buffer `json:"manifests"`
+	// from CLI --post-renderer-args
+	ExtraArgs []string         `json:"extraArgs"`
+	Settings  *cli.EnvSettings `json:"settings"`
+}
+
+type OutputMessagePostRendererV1 struct {
+	Manifests *bytes.Buffer `json:"manifests"`
 }
diff --git a/internal/plugin/testdata/plugdir/good/postrenderer-v1/plugin.yaml b/internal/plugin/testdata/plugdir/good/postrenderer-v1/plugin.yaml
new file mode 100644
index 000000000..30f1599b4
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/postrenderer-v1/plugin.yaml
@@ -0,0 +1,8 @@
+name: "postrenderer-v1"
+version: "1.2.3"
+type: postrenderer/v1
+apiVersion: v1
+runtime: subprocess
+runtimeConfig:
+  platformCommand:
+    - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
diff --git a/internal/plugin/testdata/plugdir/good/postrenderer-v1/sed-test.sh b/internal/plugin/testdata/plugdir/good/postrenderer-v1/sed-test.sh
new file mode 100755
index 000000000..a016e398f
--- /dev/null
+++ b/internal/plugin/testdata/plugdir/good/postrenderer-v1/sed-test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ $# -eq 0 ]; then
+  sed s/FOOTEST/BARTEST/g <&0
+else
+  sed s/FOOTEST/"$*"/g <&0
+fi
diff --git a/pkg/action/action.go b/pkg/action/action.go
index 38c8b6729..7b8fa3c34 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -43,7 +43,7 @@ import (
 	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/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -176,7 +176,7 @@ func splitAndDeannotate(postrendered string) (map[string]string, error) {
 // TODO: As part of the refactor the duplicate code in cmd/helm/template.go should be removed
 //
 //	This code has to do with writing files to disk.
-func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrender.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) {
+func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrenderer.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) {
 	var hs []*release.Hook
 	b := bytes.NewBuffer(nil)
 
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 276009b5c..5ca499d64 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -48,7 +48,7 @@ import (
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/kube"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
-	"helm.sh/helm/v4/pkg/postrender"
+	"helm.sh/helm/v4/pkg/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -124,7 +124,7 @@ type Install struct {
 	UseReleaseName bool
 	// TakeOwnership will ignore the check for helm annotations and take ownership of the resources.
 	TakeOwnership bool
-	PostRenderer  postrender.PostRenderer
+	PostRenderer  postrenderer.PostRenderer
 	// Lock to control raceconditions when the process receives a SIGTERM
 	Lock sync.Mutex
 }
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 63646c12b..f7fbd490f 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -31,7 +31,7 @@ import (
 	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/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
 	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -114,7 +114,7 @@ type Upgrade struct {
 	//
 	// If this is non-nil, then after templates are rendered, they will be sent to the
 	// post renderer before sending to the Kubernetes API server.
-	PostRenderer postrender.PostRenderer
+	PostRenderer postrenderer.PostRenderer
 	// DisableOpenAPIValidation controls whether OpenAPI validation is enforced.
 	DisableOpenAPIValidation bool
 	// Get missing dependencies
diff --git a/pkg/cmd/flags.go b/pkg/cmd/flags.go
index d11073e5f..98881c795 100644
--- a/pkg/cmd/flags.go
+++ b/pkg/cmd/flags.go
@@ -31,11 +31,12 @@ import (
 	"k8s.io/klog/v2"
 
 	"helm.sh/helm/v4/pkg/action"
+	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/kube"
-	"helm.sh/helm/v4/pkg/postrender"
+	"helm.sh/helm/v4/pkg/postrenderer"
 	"helm.sh/helm/v4/pkg/repo"
 )
 
@@ -164,16 +165,18 @@ func (o *outputValue) Set(s string) error {
 	return nil
 }
 
-func bindPostRenderFlag(cmd *cobra.Command, varRef *postrender.PostRenderer) {
-	p := &postRendererOptions{varRef, "", []string{}}
-	cmd.Flags().Var(&postRendererString{p}, postRenderFlag, "the path to an executable to be used for post rendering. If it exists in $PATH, the binary will be used, otherwise it will try to look for the executable at the given path")
+// TODO there is probably a better way to pass cobra settings than as a param
+func bindPostRenderFlag(cmd *cobra.Command, varRef *postrenderer.PostRenderer, settings *cli.EnvSettings) {
+	p := &postRendererOptions{varRef, "", []string{}, settings}
+	cmd.Flags().Var(&postRendererString{p}, postRenderFlag, "the name of a postrenderer type plugin to be used for post rendering. If it exists, the plugin will be used")
 	cmd.Flags().Var(&postRendererArgsSlice{p}, postRenderArgsFlag, "an argument to the post-renderer (can specify multiple)")
 }
 
 type postRendererOptions struct {
-	renderer   *postrender.PostRenderer
-	binaryPath string
+	renderer   *postrenderer.PostRenderer
+	pluginName string
 	args       []string
+	settings   *cli.EnvSettings
 }
 
 type postRendererString struct {
@@ -181,7 +184,7 @@ type postRendererString struct {
 }
 
 func (p *postRendererString) String() string {
-	return p.options.binaryPath
+	return p.options.pluginName
 }
 
 func (p *postRendererString) Type() string {
@@ -192,11 +195,11 @@ func (p *postRendererString) Set(val string) error {
 	if val == "" {
 		return nil
 	}
-	if p.options.binaryPath != "" {
+	if p.options.pluginName != "" {
 		return fmt.Errorf("cannot specify --post-renderer flag more than once")
 	}
-	p.options.binaryPath = val
-	pr, err := postrender.NewExec(p.options.binaryPath, p.options.args...)
+	p.options.pluginName = val
+	pr, err := postrenderer.NewPostRendererPlugin(p.options.settings, p.options.pluginName, p.options.args...)
 	if err != nil {
 		return err
 	}
@@ -221,11 +224,11 @@ func (p *postRendererArgsSlice) Set(val string) error {
 	// a post-renderer defined by a user may accept empty arguments
 	p.options.args = append(p.options.args, val)
 
-	if p.options.binaryPath == "" {
+	if p.options.pluginName == "" {
 		return nil
 	}
 	// overwrite if already create PostRenderer by `post-renderer` flags
-	pr, err := postrender.NewExec(p.options.binaryPath, p.options.args...)
+	pr, err := postrenderer.NewPostRendererPlugin(p.options.settings, p.options.pluginName, p.options.args...)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/flags_test.go b/pkg/cmd/flags_test.go
index cbc2e6419..dce748a6b 100644
--- a/pkg/cmd/flags_test.go
+++ b/pkg/cmd/flags_test.go
@@ -101,20 +101,22 @@ func outputFlagCompletionTest(t *testing.T, cmdName string) {
 func TestPostRendererFlagSetOnce(t *testing.T) {
 	cfg := action.Configuration{}
 	client := action.NewInstall(&cfg)
+	settings.PluginsDirectory = "testdata/helmhome/helm/plugins"
 	str := postRendererString{
 		options: &postRendererOptions{
 			renderer: &client.PostRenderer,
+			settings: settings,
 		},
 	}
-	// Set the binary once
-	err := str.Set("echo")
+	// Set the plugin name once
+	err := str.Set("postrenderer-v1")
 	require.NoError(t, err)
 
-	// Set the binary again to the same value is not ok
-	err = str.Set("echo")
+	// Set the plugin name again to the same value is not ok
+	err = str.Set("postrenderer-v1")
 	require.Error(t, err)
 
-	// Set the binary again to a different value is not ok
+	// Set the plugin name again to a different value is not ok
 	err = str.Set("cat")
 	require.Error(t, err)
 }
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 361d91e5f..c4e121c1f 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -179,7 +179,7 @@ func newInstallCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f := cmd.Flags()
 	f.BoolVar(&client.HideSecret, "hide-secret", false, "hide Kubernetes Secrets when also using the --dry-run flag")
 	bindOutputFlag(cmd, &outfmt)
-	bindPostRenderFlag(cmd, &client.PostRenderer)
+	bindPostRenderFlag(cmd, &client.PostRenderer, settings)
 
 	return cmd
 }
diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go
index ac20a45b3..c93b5395b 100644
--- a/pkg/cmd/template.go
+++ b/pkg/cmd/template.go
@@ -203,7 +203,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.StringVar(&kubeVersion, "kube-version", "", "Kubernetes version used for Capabilities.KubeVersion")
 	f.StringSliceVarP(&extraAPIs, "api-versions", "a", []string{}, "Kubernetes api versions used for Capabilities.APIVersions (multiple can be specified)")
 	f.BoolVar(&client.UseReleaseName, "release-name", false, "use release name in the output-dir path.")
-	bindPostRenderFlag(cmd, &client.PostRenderer)
+	bindPostRenderFlag(cmd, &client.PostRenderer, settings)
 
 	return cmd
 }
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
new file mode 100644
index 000000000..30f1599b4
--- /dev/null
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
@@ -0,0 +1,8 @@
+name: "postrenderer-v1"
+version: "1.2.3"
+type: postrenderer/v1
+apiVersion: v1
+runtime: subprocess
+runtimeConfig:
+  platformCommand:
+    - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/sed-test.sh b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/sed-test.sh
new file mode 100755
index 000000000..a016e398f
--- /dev/null
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/sed-test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ $# -eq 0 ]; then
+  sed s/FOOTEST/BARTEST/g <&0
+else
+  sed s/FOOTEST/"$*"/g <&0
+fi
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index 74061caf7..c8fbf8bd3 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -300,7 +300,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	addChartPathOptionsFlags(f, &client.ChartPathOptions)
 	addValueOptionsFlags(f, valueOpts)
 	bindOutputFlag(cmd, &outfmt)
-	bindPostRenderFlag(cmd, &client.PostRenderer)
+	bindPostRenderFlag(cmd, &client.PostRenderer, settings)
 	AddWaitFlag(cmd, &client.WaitStrategy)
 	cmd.MarkFlagsMutuallyExclusive("force-replace", "force-conflicts")
 	cmd.MarkFlagsMutuallyExclusive("force", "force-conflicts")
diff --git a/pkg/postrender/exec.go b/pkg/postrender/exec.go
deleted file mode 100644
index 16d9c09ce..000000000
--- a/pkg/postrender/exec.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-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 postrender
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os/exec"
-	"path/filepath"
-)
-
-type execRender struct {
-	binaryPath string
-	args       []string
-}
-
-// NewExec returns a PostRenderer implementation that calls the provided binary.
-// It returns an error if the binary cannot be found. If the path does not
-// contain any separators, it will search in $PATH, otherwise it will resolve
-// any relative paths to a fully qualified path
-func NewExec(binaryPath string, args ...string) (PostRenderer, error) {
-	fullPath, err := getFullPath(binaryPath)
-	if err != nil {
-		return nil, err
-	}
-	return &execRender{fullPath, args}, nil
-}
-
-// Run the configured binary for the post render
-func (p *execRender) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, error) {
-	cmd := exec.Command(p.binaryPath, p.args...)
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	var postRendered = &bytes.Buffer{}
-	var stderr = &bytes.Buffer{}
-	cmd.Stdout = postRendered
-	cmd.Stderr = stderr
-
-	go func() {
-		defer stdin.Close()
-		io.Copy(stdin, renderedManifests)
-	}()
-	err = cmd.Run()
-	if err != nil {
-		return nil, fmt.Errorf("error while running command %s. error output:\n%s: %w", p.binaryPath, stderr.String(), err)
-	}
-
-	// If the binary returned almost nothing, it's likely that it didn't
-	// successfully render anything
-	if len(bytes.TrimSpace(postRendered.Bytes())) == 0 {
-		return nil, fmt.Errorf("post-renderer %q produced empty output", p.binaryPath)
-	}
-
-	return postRendered, nil
-}
-
-// getFullPath returns the full filepath to the binary to execute. If the path
-// does not contain any separators, it will search in $PATH, otherwise it will
-// resolve any relative paths to a fully qualified path
-func getFullPath(binaryPath string) (string, error) {
-	// NOTE(thomastaylor312): I am leaving this code commented out here. During
-	// the implementation of post-render, it was brought up that if we are
-	// relying on plugins, we should actually use the plugin system so it can
-	// properly handle multiple OSs. This will be a feature add in the future,
-	// so I left this code for reference. It can be deleted or reused once the
-	// feature is implemented
-
-	// Manually check the plugin dir first
-	// if !strings.Contains(binaryPath, string(filepath.Separator)) {
-	// 	// First check the plugin dir
-	// 	pluginDir := helmpath.DataPath("plugins") // Default location
-	// 	// If location for plugins is explicitly set, check there
-	// 	if v, ok := os.LookupEnv("HELM_PLUGINS"); ok {
-	// 		pluginDir = v
-	// 	}
-	// 	// The plugins variable can actually contain multiple paths, so loop through those
-	// 	for _, p := range filepath.SplitList(pluginDir) {
-	// 		_, err := os.Stat(filepath.Join(p, binaryPath))
-	// 		if err != nil && !errors.Is(err, fs.ErrNotExist) {
-	// 			return "", err
-	// 		} else if err == nil {
-	// 			binaryPath = filepath.Join(p, binaryPath)
-	// 			break
-	// 		}
-	// 	}
-	// }
-
-	// Now check for the binary using the given path or check if it exists in
-	// the path and is executable
-	checkedPath, err := exec.LookPath(binaryPath)
-	if err != nil {
-		return "", fmt.Errorf("unable to find binary at %s: %w", binaryPath, err)
-	}
-
-	return filepath.Abs(checkedPath)
-}
diff --git a/pkg/postrender/exec_test.go b/pkg/postrender/exec_test.go
deleted file mode 100644
index a10ad2cc4..000000000
--- a/pkg/postrender/exec_test.go
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-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 postrender
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-const testingScript = `#!/bin/sh
-if [ $# -eq 0 ]; then
-sed s/FOOTEST/BARTEST/g <&0
-else
-sed s/FOOTEST/"$*"/g <&0
-fi
-`
-
-func TestGetFullPath(t *testing.T) {
-	is := assert.New(t)
-	t.Run("full path resolves correctly", func(t *testing.T) {
-		testpath := setupTestingScript(t)
-
-		fullPath, err := getFullPath(testpath)
-		is.NoError(err)
-		is.Equal(testpath, fullPath)
-	})
-
-	t.Run("relative path resolves correctly", func(t *testing.T) {
-		testpath := setupTestingScript(t)
-
-		currentDir, err := os.Getwd()
-		require.NoError(t, err)
-		relative, err := filepath.Rel(currentDir, testpath)
-		require.NoError(t, err)
-		fullPath, err := getFullPath(relative)
-		is.NoError(err)
-		is.Equal(testpath, fullPath)
-	})
-
-	t.Run("binary in PATH resolves correctly", func(t *testing.T) {
-		testpath := setupTestingScript(t)
-
-		t.Setenv("PATH", filepath.Dir(testpath))
-
-		fullPath, err := getFullPath(filepath.Base(testpath))
-		is.NoError(err)
-		is.Equal(testpath, fullPath)
-	})
-
-	// NOTE(thomastaylor312): See note in getFullPath for more details why this
-	// is here
-
-	// t.Run("binary in plugin path resolves correctly", func(t *testing.T) {
-	// 	testpath, cleanup := setupTestingScript(t)
-	// 	defer cleanup()
-
-	// 	realPath := os.Getenv("HELM_PLUGINS")
-	// 	os.Setenv("HELM_PLUGINS", filepath.Dir(testpath))
-	// 	defer func() {
-	// 		os.Setenv("HELM_PLUGINS", realPath)
-	// 	}()
-
-	// 	fullPath, err := getFullPath(filepath.Base(testpath))
-	// 	is.NoError(err)
-	// 	is.Equal(testpath, fullPath)
-	// })
-
-	// t.Run("binary in multiple plugin paths resolves correctly", func(t *testing.T) {
-	// 	testpath, cleanup := setupTestingScript(t)
-	// 	defer cleanup()
-
-	// 	realPath := os.Getenv("HELM_PLUGINS")
-	// 	os.Setenv("HELM_PLUGINS", filepath.Dir(testpath)+string(os.PathListSeparator)+"/another/dir")
-	// 	defer func() {
-	// 		os.Setenv("HELM_PLUGINS", realPath)
-	// 	}()
-
-	// 	fullPath, err := getFullPath(filepath.Base(testpath))
-	// 	is.NoError(err)
-	// 	is.Equal(testpath, fullPath)
-	// })
-}
-
-func TestExecRun(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// the actual Run test uses a basic sed example, so skip this test on windows
-		t.Skip("skipping on windows")
-	}
-	is := assert.New(t)
-	testpath := setupTestingScript(t)
-
-	renderer, err := NewExec(testpath)
-	require.NoError(t, err)
-
-	output, err := renderer.Run(bytes.NewBufferString("FOOTEST"))
-	is.NoError(err)
-	is.Contains(output.String(), "BARTEST")
-}
-
-func TestExecRunWithNoOutput(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// the actual Run test uses a basic sed example, so skip this test on windows
-		t.Skip("skipping on windows")
-	}
-	is := assert.New(t)
-	testpath := setupTestingScript(t)
-
-	renderer, err := NewExec(testpath)
-	require.NoError(t, err)
-
-	_, err = renderer.Run(bytes.NewBufferString(""))
-	is.Error(err)
-}
-
-func TestNewExecWithOneArgsRun(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// the actual Run test uses a basic sed example, so skip this test on windows
-		t.Skip("skipping on windows")
-	}
-	is := assert.New(t)
-	testpath := setupTestingScript(t)
-
-	renderer, err := NewExec(testpath, "ARG1")
-	require.NoError(t, err)
-
-	output, err := renderer.Run(bytes.NewBufferString("FOOTEST"))
-	is.NoError(err)
-	is.Contains(output.String(), "ARG1")
-}
-
-func TestNewExecWithTwoArgsRun(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// the actual Run test uses a basic sed example, so skip this test on windows
-		t.Skip("skipping on windows")
-	}
-	is := assert.New(t)
-	testpath := setupTestingScript(t)
-
-	renderer, err := NewExec(testpath, "ARG1", "ARG2")
-	require.NoError(t, err)
-
-	output, err := renderer.Run(bytes.NewBufferString("FOOTEST"))
-	is.NoError(err)
-	is.Contains(output.String(), "ARG1 ARG2")
-}
-
-func setupTestingScript(t *testing.T) (filepath string) {
-	t.Helper()
-
-	tempdir := t.TempDir()
-
-	f, err := os.CreateTemp(tempdir, "post-render-test.sh")
-	if err != nil {
-		t.Fatalf("unable to create tempfile for testing: %s", err)
-	}
-
-	_, err = f.WriteString(testingScript)
-	if err != nil {
-		t.Fatalf("unable to write tempfile for testing: %s", err)
-	}
-
-	err = f.Chmod(0o755)
-	if err != nil {
-		t.Fatalf("unable to make tempfile executable for testing: %s", err)
-	}
-
-	err = f.Close()
-	if err != nil {
-		t.Fatalf("unable to close tempfile after writing: %s", err)
-	}
-
-	return f.Name()
-}
diff --git a/pkg/postrenderer/postrenderer.go b/pkg/postrenderer/postrenderer.go
new file mode 100644
index 000000000..2107cc465
--- /dev/null
+++ b/pkg/postrenderer/postrenderer.go
@@ -0,0 +1,85 @@
+/*
+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 postrenderer
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+// PostRenderer is an interface different plugin runtimes
+// it may be also be used without the factory for custom post-renderers
+type PostRenderer interface {
+	// Run expects a single buffer filled with Helm rendered manifests. It
+	// expects the modified results to be returned on a separate buffer or an
+	// error if there was an issue or failure while running the post render step
+	Run(renderedManifests *bytes.Buffer) (modifiedManifests *bytes.Buffer, err error)
+}
+
+// NewPostRendererPlugin creates a PostRenderer that uses the plugin's Runtime
+func NewPostRendererPlugin(settings *cli.EnvSettings, pluginName string, args ...string) (PostRenderer, error) {
+	descriptor := plugin.Descriptor{
+		Name: pluginName,
+		Type: "postrenderer/v1",
+	}
+	p, err := plugin.FindPlugin(filepath.SplitList(settings.PluginsDirectory), descriptor)
+	if err != nil {
+		return nil, err
+	}
+
+	return &postRendererPlugin{
+		plugin:   p,
+		args:     args,
+		settings: settings,
+	}, nil
+}
+
+// postRendererPlugin implements PostRenderer by delegating to the plugin's Runtime
+type postRendererPlugin struct {
+	plugin   plugin.Plugin
+	args     []string
+	settings *cli.EnvSettings
+}
+
+// Run implements PostRenderer by using the plugin's Runtime
+func (r *postRendererPlugin) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer, error) {
+	input := &plugin.Input{
+		Message: schema.InputMessagePostRendererV1{
+			ExtraArgs: r.args,
+			Manifests: renderedManifests,
+			Settings:  r.settings,
+		},
+	}
+	output, err := r.plugin.Invoke(context.Background(), input)
+	if err != nil {
+		return nil, fmt.Errorf("failed to invoke post-renderer plugin %q: %w", r.plugin.Metadata().Name, err)
+	}
+
+	outputMessage := output.Message.(*schema.OutputMessagePostRendererV1)
+
+	// If the binary returned almost nothing, it's likely that it didn't
+	// successfully render anything
+	if len(bytes.TrimSpace(outputMessage.Manifests.Bytes())) == 0 {
+		return nil, fmt.Errorf("post-renderer %q produced empty output", r.plugin.Metadata().Name)
+	}
+
+	return outputMessage.Manifests, nil
+}
diff --git a/pkg/postrenderer/postrenderer_test.go b/pkg/postrenderer/postrenderer_test.go
new file mode 100644
index 000000000..9addd481d
--- /dev/null
+++ b/pkg/postrenderer/postrenderer_test.go
@@ -0,0 +1,89 @@
+/*
+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 postrenderer
+
+import (
+	"bytes"
+	"path/filepath"
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/pkg/cli"
+)
+
+func TestNewPostRenderPluginRunWithNoOutput(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		// the actual Run test uses a basic sed example, so skip this test on windows
+		t.Skip("skipping on windows")
+	}
+	is := assert.New(t)
+	s := cli.New()
+	s.PluginsDirectory = "testdata/plugins"
+	name := "postrenderer-v1"
+	base := filepath.Join(s.PluginsDirectory, name)
+	plugin.SetupPluginEnv(s, name, base)
+
+	renderer, err := NewPostRendererPlugin(s, name, "")
+	require.NoError(t, err)
+
+	_, err = renderer.Run(bytes.NewBufferString(""))
+	is.Error(err)
+}
+
+func TestNewPostRenderPluginWithOneArgsRun(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		// the actual Run test uses a basic sed example, so skip this test on windows
+		t.Skip("skipping on windows")
+	}
+	is := assert.New(t)
+	s := cli.New()
+	s.PluginsDirectory = "testdata/plugins"
+	name := "postrenderer-v1"
+	base := filepath.Join(s.PluginsDirectory, name)
+	plugin.SetupPluginEnv(s, name, base)
+
+	renderer, err := NewPostRendererPlugin(s, name, "ARG1")
+	require.NoError(t, err)
+
+	output, err := renderer.Run(bytes.NewBufferString("FOOTEST"))
+	is.NoError(err)
+	is.Contains(output.String(), "ARG1")
+}
+
+func TestNewPostRenderPluginWithTwoArgsRun(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		// the actual Run test uses a basic sed example, so skip this test on windows
+		t.Skip("skipping on windows")
+	}
+	is := assert.New(t)
+	s := cli.New()
+	s.PluginsDirectory = "testdata/plugins"
+	name := "postrenderer-v1"
+	base := filepath.Join(s.PluginsDirectory, name)
+	plugin.SetupPluginEnv(s, name, base)
+
+	renderer, err := NewPostRendererPlugin(s, name, "ARG1", "ARG2")
+	require.NoError(t, err)
+
+	output, err := renderer.Run(bytes.NewBufferString("FOOTEST"))
+	is.NoError(err)
+	is.Contains(output.String(), "ARG1 ARG2")
+}
diff --git a/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml b/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
new file mode 100644
index 000000000..30f1599b4
--- /dev/null
+++ b/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
@@ -0,0 +1,8 @@
+name: "postrenderer-v1"
+version: "1.2.3"
+type: postrenderer/v1
+apiVersion: v1
+runtime: subprocess
+runtimeConfig:
+  platformCommand:
+    - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
diff --git a/pkg/postrenderer/testdata/plugins/postrenderer-v1/sed-test.sh b/pkg/postrenderer/testdata/plugins/postrenderer-v1/sed-test.sh
new file mode 100755
index 000000000..a016e398f
--- /dev/null
+++ b/pkg/postrenderer/testdata/plugins/postrenderer-v1/sed-test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ $# -eq 0 ]; then
+  sed s/FOOTEST/BARTEST/g <&0
+else
+  sed s/FOOTEST/"$*"/g <&0
+fi

From c35755a197e0509a654d44893149e08a438576e5 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Fri, 22 Aug 2025 12:26:33 -0700
Subject: [PATCH 176/211] Remove legacy Command/Hooks from v1 Subprocess (#23)

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 .../plugin/installer/local_installer_test.go  |  2 +-
 internal/plugin/loader_test.go                |  9 +--
 internal/plugin/metadata.go                   | 27 +++++++--
 internal/plugin/metadata_legacy.go            |  6 +-
 internal/plugin/metadata_test.go              | 39 +++----------
 internal/plugin/plugin_test.go                |  2 +-
 internal/plugin/runtime_subprocess.go         | 58 +++++--------------
 internal/plugin/runtime_subprocess_getter.go  | 12 ++--
 internal/plugin/subprocess_commands_test.go   |  8 +--
 .../bad/duplicate-entries-v1/plugin.yaml      | 13 +++--
 .../testdata/plugdir/good/getter/plugin.yaml  |  3 +-
 pkg/cmd/plugin_package_test.go                |  2 +-
 pkg/cmd/plugin_test.go                        |  2 +-
 .../helm/plugins/fullenv/plugin.yaml          |  6 +-
 .../helmhome/helm/plugins/args/plugin.yaml    |  3 +-
 .../helmhome/helm/plugins/echo/plugin.yaml    |  3 +-
 .../helmhome/helm/plugins/env/plugin.yaml     |  6 +-
 .../helm/plugins/exitwith/plugin.yaml         |  6 +-
 .../helmhome/helm/plugins/fullenv/plugin.yaml |  6 +-
 .../helm/plugins/postrenderer-v1/plugin.yaml  |  9 ++-
 pkg/cmd/testdata/testplugin/plugin.yaml       | 12 ++++
 pkg/getter/plugingetter_test.go               |  2 +-
 .../plugins/postrenderer-v1/plugin.yaml       |  2 +-
 23 files changed, 120 insertions(+), 118 deletions(-)
 create mode 100644 pkg/cmd/testdata/testplugin/plugin.yaml

diff --git a/internal/plugin/installer/local_installer_test.go b/internal/plugin/installer/local_installer_test.go
index 339028ef3..189108fdb 100644
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@@ -86,7 +86,7 @@ func TestLocalInstallerTarball(t *testing.T) {
 		Body string
 		Mode int64
 	}{
-		{"test-plugin/plugin.yaml", "name: test-plugin\nversion: 1.0.0\nusage: test\ndescription: test\ncommand: echo", 0644},
+		{"test-plugin/plugin.yaml", "name: test-plugin\napiVersion: v1\ntype: cli/v1\nruntime: subprocess\nversion: 1.0.0\nconfig:\n  shortHelp: test\n  longHelp: test\nruntimeConfig:\n  platformCommand:\n  - command: echo", 0644},
 		{"test-plugin/bin/test-plugin", "#!/bin/bash\necho test", 0755},
 	}
 
diff --git a/internal/plugin/loader_test.go b/internal/plugin/loader_test.go
index 63d930cbe..d214f7b6b 100644
--- a/internal/plugin/loader_test.go
+++ b/internal/plugin/loader_test.go
@@ -80,7 +80,7 @@ func TestLoadDir(t *testing.T) {
 				IgnoreFlags: true,
 			},
 			RuntimeConfig: &RuntimeConfigSubprocess{
-				PlatformCommands: []PlatformCommand{
+				PlatformCommand: []PlatformCommand{
 					{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.sh"}},
 					{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "${HELM_PLUGIN_DIR}/hello.ps1"}},
 				},
@@ -90,6 +90,7 @@ func TestLoadDir(t *testing.T) {
 						{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"installing...\""}},
 					},
 				},
+				expandHookArgs: apiVersion == "legacy",
 			},
 		}
 	}
@@ -150,8 +151,8 @@ func TestLoadDirGetter(t *testing.T) {
 		RuntimeConfig: &RuntimeConfigSubprocess{
 			ProtocolCommands: []SubprocessProtocolCommand{
 				{
-					Protocols: []string{"myprotocol", "myprotocols"},
-					Command:   "echo getter",
+					Protocols:       []string{"myprotocol", "myprotocols"},
+					PlatformCommand: []PlatformCommand{{Command: "echo getter"}},
 				},
 			},
 		},
@@ -174,7 +175,7 @@ func TestPostRenderer(t *testing.T) {
 		Runtime:    "subprocess",
 		Config:     &ConfigPostrenderer{},
 		RuntimeConfig: &RuntimeConfigSubprocess{
-			PlatformCommands: []PlatformCommand{
+			PlatformCommand: []PlatformCommand{
 				{
 					Command: "${HELM_PLUGIN_DIR}/sed-test.sh",
 				},
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
index fbe7a16b8..1c4f02836 100644
--- a/internal/plugin/metadata.go
+++ b/internal/plugin/metadata.go
@@ -144,15 +144,32 @@ func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
 		protocolCommands =
 			make([]SubprocessProtocolCommand, 0, len(m.Downloaders))
 		for _, d := range m.Downloaders {
-			protocolCommands = append(protocolCommands, SubprocessProtocolCommand(d))
+			protocolCommands = append(protocolCommands, SubprocessProtocolCommand{
+				Protocols:       d.Protocols,
+				PlatformCommand: []PlatformCommand{{Command: d.Command}},
+			})
+		}
+	}
+
+	platformCommand := m.PlatformCommand
+	if len(platformCommand) == 0 && len(m.Command) > 0 {
+		platformCommand = []PlatformCommand{{Command: m.Command}}
+	}
+
+	platformHooks := m.PlatformHooks
+	expandHookArgs := true
+	if len(platformHooks) == 0 && len(m.Hooks) > 0 {
+		platformHooks = make(PlatformHooks, len(m.Hooks))
+		for hookName, hookCommand := range m.Hooks {
+			platformHooks[hookName] = []PlatformCommand{{Command: "sh", Args: []string{"-c", hookCommand}}}
+			expandHookArgs = false
 		}
 	}
 	return &RuntimeConfigSubprocess{
-		PlatformCommands: m.PlatformCommands,
-		Command:          m.Command,
-		PlatformHooks:    m.PlatformHooks,
-		Hooks:            m.Hooks,
+		PlatformCommand:  platformCommand,
+		PlatformHooks:    platformHooks,
 		ProtocolCommands: protocolCommands,
+		expandHookArgs:   expandHookArgs,
 	}
 }
 
diff --git a/internal/plugin/metadata_legacy.go b/internal/plugin/metadata_legacy.go
index ce9c2f580..a7b245dc0 100644
--- a/internal/plugin/metadata_legacy.go
+++ b/internal/plugin/metadata_legacy.go
@@ -45,8 +45,8 @@ type MetadataLegacy struct {
 	// Description is a long description shown in places like `helm help`
 	Description string `yaml:"description"`
 
-	// PlatformCommands is the plugin command, with a platform selector and support for args.
-	PlatformCommands []PlatformCommand `yaml:"platformCommand"`
+	// PlatformCommand is the plugin command, with a platform selector and support for args.
+	PlatformCommand []PlatformCommand `yaml:"platformCommand"`
 
 	// Command is the plugin command, as a single string.
 	// DEPRECATED: Use PlatformCommand instead. Removed in subprocess/v1 plugins.
@@ -73,7 +73,7 @@ func (m *MetadataLegacy) Validate() error {
 	}
 	m.Usage = sanitizeString(m.Usage)
 
-	if len(m.PlatformCommands) > 0 && len(m.Command) > 0 {
+	if len(m.PlatformCommand) > 0 && len(m.Command) > 0 {
 		return fmt.Errorf("both platformCommand and command are set")
 	}
 
diff --git a/internal/plugin/metadata_test.go b/internal/plugin/metadata_test.go
index 810020a67..28bc4cf51 100644
--- a/internal/plugin/metadata_test.go
+++ b/internal/plugin/metadata_test.go
@@ -25,44 +25,25 @@ func TestValidatePluginData(t *testing.T) {
 	// A mock plugin with no commands
 	mockNoCommand := mockSubprocessCLIPlugin(t, "foo")
 	mockNoCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
-		PlatformCommands: []PlatformCommand{},
-		PlatformHooks:    map[string][]PlatformCommand{},
+		PlatformCommand: []PlatformCommand{},
+		PlatformHooks:   map[string][]PlatformCommand{},
 	}
 
 	// A mock plugin with legacy commands
 	mockLegacyCommand := mockSubprocessCLIPlugin(t, "foo")
 	mockLegacyCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
-		PlatformCommands: []PlatformCommand{},
-		Command:          "echo \"mock plugin\"",
-		PlatformHooks:    map[string][]PlatformCommand{},
-		Hooks: map[string]string{
-			Install: "echo installing...",
-		},
-	}
-
-	// A mock plugin with a command also set
-	mockWithCommand := mockSubprocessCLIPlugin(t, "foo")
-	mockWithCommand.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
-		PlatformCommands: []PlatformCommand{
-			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
-		},
-		Command: "echo \"mock plugin\"",
-	}
-
-	// A mock plugin with a hooks also set
-	mockWithHooks := mockSubprocessCLIPlugin(t, "foo")
-	mockWithHooks.metadata.RuntimeConfig = &RuntimeConfigSubprocess{
-		PlatformCommands: []PlatformCommand{
-			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
+		PlatformCommand: []PlatformCommand{
+			{
+				Command: "echo \"mock plugin\"",
+			},
 		},
 		PlatformHooks: map[string][]PlatformCommand{
 			Install: {
-				{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
+				PlatformCommand{
+					Command: "echo installing...",
+				},
 			},
 		},
-		Hooks: map[string]string{
-			Install: "echo installing...",
-		},
 	}
 
 	for i, item := range []struct {
@@ -78,8 +59,6 @@ func TestValidatePluginData(t *testing.T) {
 		{false, mockSubprocessCLIPlugin(t, "foo\nbar"), "invalid name"},  // Test newline
 		{true, mockNoCommand, ""},     // Test no command metadata works
 		{true, mockLegacyCommand, ""}, // Test legacy command metadata works
-		{false, mockWithCommand, "runtime config validation failed: both platformCommand and command are set"}, // Test platformCommand and command both set fails
-		{false, mockWithHooks, "runtime config validation failed: both platformHooks and hooks are set"},       // Test platformHooks and hooks both set fails
 	} {
 		err := item.plug.Metadata().Validate()
 		if item.pass && err != nil {
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index fbebecac4..bddabd136 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -23,7 +23,7 @@ func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginR
 	t.Helper()
 
 	rc := RuntimeConfigSubprocess{
-		PlatformCommands: []PlatformCommand{
+		PlatformCommand: []PlatformCommand{
 			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
 			{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"mock plugin\""}},
 		},
diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
index e7faeed36..6961d1fa5 100644
--- a/internal/plugin/runtime_subprocess.go
+++ b/internal/plugin/runtime_subprocess.go
@@ -33,28 +33,25 @@ import (
 type SubprocessProtocolCommand struct {
 	// Protocols are the list of schemes from the charts URL.
 	Protocols []string `yaml:"protocols"`
-	// Command is the executable path with which the plugin performs
-	// the actual download for the corresponding Protocols
-	Command string `yaml:"command"`
+	// PlatformCommand is the platform based command which the plugin performs
+	// to download for the corresponding getter Protocols.
+	PlatformCommand []PlatformCommand `yaml:"platformCommand"`
 }
 
 // RuntimeConfigSubprocess implements RuntimeConfig for RuntimeSubprocess
 type RuntimeConfigSubprocess struct {
 	// PlatformCommand is a list containing a plugin command, with a platform selector and support for args.
-	PlatformCommands []PlatformCommand `yaml:"platformCommand"`
-	// Command is the plugin command, as a single string.
-	// DEPRECATED: Use PlatformCommand instead. Remove in Helm 4.
-	Command string `yaml:"command"`
+	PlatformCommand []PlatformCommand `yaml:"platformCommand"`
 	// PlatformHooks are commands that will run on plugin events, with a platform selector and support for args.
 	PlatformHooks PlatformHooks `yaml:"platformHooks"`
-	// Hooks are commands that will run on plugin events, as a single string.
-	// DEPRECATED: Use PlatformHooks instead. Remove in Helm 4.
-	Hooks Hooks `yaml:"hooks"`
-	// ProtocolCommands field is used if the plugin supply downloader mechanism
-	// for special protocols.
-	// (This is a compatibility hangover from the old plugin downloader mechanism, which was extended to support multiple
-	// protocols in a given plugin)
+	// ProtocolCommands allows the plugin to specify protocol specific commands
+	//
+	// Obsolete/deprecated: This is a compatibility hangover from the old plugin downloader mechanism, which was extended
+	// to support multiple protocols in a given plugin. The command supplied in PlatformCommand should implement protocol
+	// specific logic by inspecting the download URL
 	ProtocolCommands []SubprocessProtocolCommand `yaml:"protocolCommands,omitempty"`
+
+	expandHookArgs bool
 }
 
 var _ RuntimeConfig = (*RuntimeConfigSubprocess)(nil)
@@ -62,12 +59,6 @@ var _ RuntimeConfig = (*RuntimeConfigSubprocess)(nil)
 func (r *RuntimeConfigSubprocess) GetType() string { return "subprocess" }
 
 func (r *RuntimeConfigSubprocess) Validate() error {
-	if len(r.PlatformCommands) > 0 && len(r.Command) > 0 {
-		return fmt.Errorf("both platformCommand and command are set")
-	}
-	if len(r.PlatformHooks) > 0 && len(r.Hooks) > 0 {
-		return fmt.Errorf("both platformHooks and hooks are set")
-	}
 	return nil
 }
 
@@ -138,25 +129,13 @@ func (r *SubprocessPluginRuntime) InvokeWithEnv(main string, argv []string, env
 }
 
 func (r *SubprocessPluginRuntime) InvokeHook(event string) error {
-	// Get hook commands for the event
-	var cmds []PlatformCommand
-	expandArgs := true
-
-	cmds = r.RuntimeConfig.PlatformHooks[event]
-	if len(cmds) == 0 && len(r.RuntimeConfig.Hooks) > 0 {
-		cmd := r.RuntimeConfig.Hooks[event]
-		if len(cmd) > 0 {
-			cmds = []PlatformCommand{{Command: "sh", Args: []string{"-c", cmd}}}
-			expandArgs = false
-		}
-	}
+	cmds := r.RuntimeConfig.PlatformHooks[event]
 
-	// If no hook commands are defined, just return successfully
 	if len(cmds) == 0 {
 		return nil
 	}
 
-	main, argv, err := PrepareCommands(cmds, expandArgs, []string{})
+	main, argv, err := PrepareCommands(cmds, r.RuntimeConfig.expandHookArgs, []string{})
 	if err != nil {
 		return err
 	}
@@ -200,10 +179,7 @@ func (r *SubprocessPluginRuntime) runCLI(input *Input) (*Output, error) {
 
 	extraArgs := input.Message.(schema.InputMessageCLIV1).ExtraArgs
 
-	cmds := r.RuntimeConfig.PlatformCommands
-	if len(cmds) == 0 && len(r.RuntimeConfig.Command) > 0 {
-		cmds = []PlatformCommand{{Command: r.RuntimeConfig.Command}}
-	}
+	cmds := r.RuntimeConfig.PlatformCommand
 
 	command, args, err := PrepareCommands(cmds, true, extraArgs)
 	if err != nil {
@@ -232,11 +208,7 @@ func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error)
 	// Setup plugin environment
 	SetupPluginEnv(settings, r.metadata.Name, r.pluginDir)
 
-	cmds := r.RuntimeConfig.PlatformCommands
-	if len(cmds) == 0 && len(r.RuntimeConfig.Command) > 0 {
-		cmds = []PlatformCommand{{Command: r.RuntimeConfig.Command}}
-	}
-
+	cmds := r.RuntimeConfig.PlatformCommand
 	command, args, err := PrepareCommands(cmds, true, extraArgs)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare plugin command: %w", err)
diff --git a/internal/plugin/runtime_subprocess_getter.go b/internal/plugin/runtime_subprocess_getter.go
index af2d0c572..d1884bc93 100644
--- a/internal/plugin/runtime_subprocess_getter.go
+++ b/internal/plugin/runtime_subprocess_getter.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"slices"
-	"strings"
 
 	"helm.sh/helm/v4/internal/plugin/schema"
 )
@@ -55,9 +54,12 @@ func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
 		return nil, fmt.Errorf("no downloader found for protocol %q", msg.Protocol)
 	}
 
-	commands := strings.Split(d.Command, " ")
-	args := append(
-		commands[1:],
+	command, args, err := PrepareCommands(d.PlatformCommand, false, []string{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to prepare commands for protocol %q: %w", msg.Protocol, err)
+	}
+	args = append(
+		args,
 		msg.Options.CertFile,
 		msg.Options.KeyFile,
 		msg.Options.CAFile,
@@ -73,7 +75,7 @@ func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
 	// TODO should we pass along input.Stdout?
 	buf := bytes.Buffer{} // subprocess getters are expected to write content to stdout
 
-	pluginCommand := filepath.Join(r.pluginDir, commands[0])
+	pluginCommand := filepath.Join(r.pluginDir, command)
 	prog := exec.Command(
 		pluginCommand,
 		args...)
diff --git a/internal/plugin/subprocess_commands_test.go b/internal/plugin/subprocess_commands_test.go
index 3cb9325ab..16446cdec 100644
--- a/internal/plugin/subprocess_commands_test.go
+++ b/internal/plugin/subprocess_commands_test.go
@@ -27,14 +27,14 @@ func TestPrepareCommand(t *testing.T) {
 	cmdMain := "sh"
 	cmdArgs := []string{"-c", "echo \"test\""}
 
-	platformCommands := []PlatformCommand{
+	platformCommand := []PlatformCommand{
 		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
 	}
 
-	cmd, args, err := PrepareCommands(platformCommands, true, []string{})
+	cmd, args, err := PrepareCommands(platformCommand, true, []string{})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -50,7 +50,7 @@ func TestPrepareCommandExtraArgs(t *testing.T) {
 
 	cmdMain := "sh"
 	cmdArgs := []string{"-c", "echo \"test\""}
-	platformCommands := []PlatformCommand{
+	platformCommand := []PlatformCommand{
 		{OperatingSystem: "no-os", Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
 		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
@@ -91,7 +91,7 @@ func TestPrepareCommandExtraArgs(t *testing.T) {
 			if tc.ignoreFlags {
 				testExtraArgs = []string{}
 			}
-			cmd, args, err := PrepareCommands(platformCommands, true, testExtraArgs)
+			cmd, args, err := PrepareCommands(platformCommand, true, testExtraArgs)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml b/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
index 030ae6aca..344141121 100644
--- a/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/bad/duplicate-entries-v1/plugin.yaml
@@ -9,8 +9,11 @@ config:
     description
   ignoreFlags: true
 runtimeConfig:
-  command: "echo hello"
-  hooks:
-    install: "echo installing..."
-  hooks:
-    install: "echo installing something different"
+  platformCommand:
+  - command: "echo hello"
+  platformHooks:
+    install:
+    - command: "echo installing..."
+  platformHooks:
+    install:
+    - command: "echo installing something different"
diff --git a/internal/plugin/testdata/plugdir/good/getter/plugin.yaml b/internal/plugin/testdata/plugdir/good/getter/plugin.yaml
index cfe80fbdc..7bdee9bde 100644
--- a/internal/plugin/testdata/plugdir/good/getter/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/getter/plugin.yaml
@@ -10,7 +10,8 @@ config:
     - "myprotocols"
 runtimeConfig:
   protocolCommands:
-    - command: "echo getter"
+    - platformCommand:
+      - command: "echo getter"
       protocols:
         - "myprotocol"
         - "myprotocols"
diff --git a/pkg/cmd/plugin_package_test.go b/pkg/cmd/plugin_package_test.go
index df6cdd849..7d97562f8 100644
--- a/pkg/cmd/plugin_package_test.go
+++ b/pkg/cmd/plugin_package_test.go
@@ -34,7 +34,7 @@ config:
   shortHelp: A test plugin
   longHelp: A test plugin for testing purposes
 runtimeConfig:
-  platformCommands:
+  platformCommand:
     - os: linux
       command: echo
       args: ["test"]`
diff --git a/pkg/cmd/plugin_test.go b/pkg/cmd/plugin_test.go
index b476b80d2..738a64740 100644
--- a/pkg/cmd/plugin_test.go
+++ b/pkg/cmd/plugin_test.go
@@ -122,7 +122,7 @@ func TestLoadCLIPlugins(t *testing.T) {
 
 	require.Len(t, plugins, len(tests), "Expected %d plugins, got %d", len(tests), len(plugins))
 
-	for i := 0; i < len(plugins); i++ {
+	for i := range plugins {
 		out.Reset()
 		tt := tests[i]
 		pp := plugins[i]
diff --git a/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml b/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml
index 8b874da1d..a58544b03 100644
--- a/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml	
+++ b/pkg/cmd/testdata/helm home with space/helm/plugins/fullenv/plugin.yaml	
@@ -1,10 +1,12 @@
+---
+apiVersion: v1
 name: fullenv
 type: cli/v1
-apiVersion: v1
 runtime: subprocess
 config:
   shortHelp: "show env vars"
   longHelp: "show all env vars"
   ignoreFlags: false
 runtimeConfig:
-  command: "$HELM_PLUGIN_DIR/fullenv.sh"
+  platformCommand:
+  - command: "$HELM_PLUGIN_DIR/fullenv.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
index 57312cbfa..4156e7f17 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/args/plugin.yaml
@@ -7,4 +7,5 @@ config:
   longHelp: "This echos args"
   ignoreFlags: false
 runtimeConfig:
-  command: "$HELM_PLUGIN_DIR/args.sh"
+  platformCommand:
+  - command: "$HELM_PLUGIN_DIR/args.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
index 544efa85e..a0a0b5255 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/echo/plugin.yaml
@@ -7,4 +7,5 @@ config:
   longHelp: "This echos stuff"
   ignoreFlags: false
 runtimeConfig:
-  command: "echo hello"
+  platformCommand:
+  - command: "echo hello"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
index d7a4c229c..fa933af93 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
@@ -1,10 +1,12 @@
+---
+apiVersion: v1
 name: env
 type: cli/v1
-apiVersion: v1
 runtime: subprocess
 config:
   shortHelp: "env stuff"
   longHelp: "show the env"
   ignoreFlags: false
 runtimeConfig:
-  command: "echo $HELM_PLUGIN_NAME"
+  platformCommand:
+  - command: "echo $HELM_PLUGIN_NAME"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
index 06a350f83..ba9508255 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/exitwith/plugin.yaml
@@ -1,10 +1,12 @@
+---
+apiVersion: v1
 name: exitwith
 type: cli/v1
-apiVersion: v1
 runtime: subprocess
 config:
   shortHelp: "exitwith code"
   longHelp: "This exits with the specified exit code"
   ignoreFlags: false
 runtimeConfig:
-  command: "$HELM_PLUGIN_DIR/exitwith.sh"
+  platformCommand:
+  - command: "$HELM_PLUGIN_DIR/exitwith.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
index 8b874da1d..a58544b03 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/plugin.yaml
@@ -1,10 +1,12 @@
+---
+apiVersion: v1
 name: fullenv
 type: cli/v1
-apiVersion: v1
 runtime: subprocess
 config:
   shortHelp: "show env vars"
   longHelp: "show all env vars"
   ignoreFlags: false
 runtimeConfig:
-  command: "$HELM_PLUGIN_DIR/fullenv.sh"
+  platformCommand:
+  - command: "$HELM_PLUGIN_DIR/fullenv.sh"
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
index 30f1599b4..d4cd57a13 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
@@ -1,8 +1,13 @@
+---
+apiVersion: v1
 name: "postrenderer-v1"
 version: "1.2.3"
 type: postrenderer/v1
-apiVersion: v1
 runtime: subprocess
+config:
+  shortHelp: "echo test"
+  longHelp: "This echos test"
+  ignoreFlags: false
 runtimeConfig:
   platformCommand:
-    - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
+  - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
diff --git a/pkg/cmd/testdata/testplugin/plugin.yaml b/pkg/cmd/testdata/testplugin/plugin.yaml
new file mode 100644
index 000000000..3ee5d04f6
--- /dev/null
+++ b/pkg/cmd/testdata/testplugin/plugin.yaml
@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+name: testplugin
+type: cli/v1
+runtime: subprocess
+config:
+  shortHelp: "echo test"
+  longHelp: "This echos test"
+  ignoreFlags: false
+runtimeConfig:
+  platformCommand:
+  - command: "echo test"
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index 8e0619635..23cfc80f8 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -112,7 +112,7 @@ func (t *testPlugin) Metadata() plugin.Metadata {
 		Runtime:    "subprocess",
 		Config:     &plugin.ConfigCLI{},
 		RuntimeConfig: &plugin.RuntimeConfigSubprocess{
-			PlatformCommands: []plugin.PlatformCommand{
+			PlatformCommand: []plugin.PlatformCommand{
 				{
 					Command: "echo fake-plugin",
 				},
diff --git a/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml b/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
index 30f1599b4..423a5191e 100644
--- a/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
+++ b/pkg/postrenderer/testdata/plugins/postrenderer-v1/plugin.yaml
@@ -5,4 +5,4 @@ apiVersion: v1
 runtime: subprocess
 runtimeConfig:
   platformCommand:
-    - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
+  - command: "${HELM_PLUGIN_DIR}/sed-test.sh"

From 89aca09e5e40674f63c1d01cfcd69bfac0dc219d Mon Sep 17 00:00:00 2001
From: tzchenxixi <tzchenxixi@icloud.com>
Date: Mon, 1 Sep 2025 18:30:27 +0800
Subject: [PATCH 177/211] chore: fix function name

Signed-off-by: tzchenxixi <tzchenxixi@icloud.com>
---
 pkg/kube/client.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index c41165490..26ba7abfc 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -214,7 +214,7 @@ type clientCreateOptions struct {
 
 type ClientCreateOption func(*clientCreateOptions) error
 
-// ClientUpdateOptionServerSideApply enables performing object apply server-side
+// ClientCreateOptionServerSideApply enables performing object apply server-side
 // see: https://kubernetes.io/docs/reference/using-api/server-side-apply/
 //
 // `forceConflicts` forces conflicts to be resolved (may be  when serverSideApply enabled only)

From 5595c0d00587892beb03505dd99ae3ec31ceefa9 Mon Sep 17 00:00:00 2001
From: Benoit Tigeot <benoit.tigeot@lifen.fr>
Date: Mon, 1 Sep 2025 17:48:35 +0200
Subject: [PATCH 178/211] Prevent failing helm push on ghcr.io using standard
 GET auth token flow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix GHCR auth by not forcing OAuth2 POST but also reset
ForceAttemptOAuth2 after login.

- Remove ForceAttemptOAuth2 in NewClient and only enable during Login
ping and always restore to false.
- Aligns with OCI Distribution auth (token via GET), avoiding GHCR 405
on POST /token.
- Some tests

Failures logs:

```sh
~/p/lifen/test/helm-f/quicktest ❯ ../../../helm/bin/helm push quicktest-0.1.0.tgz oci://ghcr.io/benoittgt/helm-charts --debug
level=DEBUG msg=HEAD id=0 url=https://ghcr.io/v2/benoittgt/helm-charts/quicktest/manifests/sha256:af359fd8fb968ec1097afbd6e8e1dac9ee130861082e54dc2340d0c019407873 header="   \"Accept\": \"application/vnd.docker.distribution.manifest.v2+json, application/vnd.docker.distribution.manifest.list.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.oci.image.index.v1+json, application/vnd.oci.artifact.manifest.v1+json\"\n   \"User-Agent\": \"Helm/4.0+unreleased\""
level=DEBUG msg=Resp id=0 status="401 Unauthorized" header="   \"Www-Authenticate\": \"Bearer realm=\\\"https://ghcr.io/token\\\",service=\\\"ghcr.io\\\",scope=\\\"repository:benoittgt/helm-charts/quicktest:pull\\\"\"\n   \"Date\": \"Mon, 01 Sep 2025 13:56:35 GMT\"\n   \"Content-Length\": \"73\"\n   \"X-Github-Request-Id\": \"DC73:115F:2B40F2C:2BAB567:68B5A613\"\n   \"Content-Type\": \"application/json\"" body="   Response body is empty"
level=DEBUG msg=POST id=1 url=https://ghcr.io/token header="   \"Content-Type\": \"application/x-www-form-urlencoded\"\n   \"User-Agent\": \"Helm/4.0+unreleased\""
level=DEBUG msg=Resp id=1 status="405 Method Not Allowed" header="   \"Docker-Distribution-Api-Version\": \"registry/2.0\"\n   \"Strict-Transport-Security\": \"max-age=63072000; includeSubDomains; preload\"\n   \"Date\": \"Mon, 01 Sep 2025 13:56:35 GMT\"\n   \"Content-Length\": \"78\"\n   \"X-Github-Request-Id\": \"DC73:115F:2B40F75:2BAB5C2:68B5A613\"\n   \"Content-Type\": \"application/json\"" body="{\"errors\":[{\"code\":\"UNSUPPORTED\",\"message\":\"The operation is unsupported.\"}]}\n"
Error: failed to perform "Exists" on destination: HEAD "https://ghcr.io/v2/benoittgt/helm-charts/quicktest/manifests/sha256:af359fd8fb968ec1097afbd6e8e1dac9ee130861082e54dc2340d0c019407873": POST "https://ghcr.io/token": response status code 405: unsupported: The operation is unsupported.
```

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
---
 pkg/registry/client.go      |  4 +--
 pkg/registry/client_test.go | 69 +++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/pkg/registry/client.go b/pkg/registry/client.go
index 7ba26ac5c..95250f8da 100644
--- a/pkg/registry/client.go
+++ b/pkg/registry/client.go
@@ -137,8 +137,6 @@ func NewClient(options ...ClientOption) (*Client, error) {
 		if client.enableCache {
 			authorizer.Cache = auth.NewCache()
 		}
-
-		authorizer.ForceAttemptOAuth2 = true
 		client.authorizer = &authorizer
 	}
 
@@ -251,6 +249,8 @@ func (c *Client) Login(host string, options ...LoginOption) error {
 			return fmt.Errorf("authenticating to %q: %w", host, err)
 		}
 	}
+	// Always restore to false after probing, to avoid forcing POST to token endpoints like GHCR.
+	c.authorizer.ForceAttemptOAuth2 = false
 
 	key := credentials.ServerAddressFromRegistry(host)
 	key = credentials.ServerAddressFromHostname(key)
diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go
index 2ffd691c2..6ae32e342 100644
--- a/pkg/registry/client_test.go
+++ b/pkg/registry/client_test.go
@@ -18,6 +18,10 @@ package registry
 
 import (
 	"io"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"strings"
 	"testing"
 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -51,3 +55,68 @@ func TestTagManifestTransformsReferences(t *testing.T) {
 	_, err = memStore.Resolve(ctx, refWithPlus)
 	require.Error(t, err, "Should NOT find the reference with the original +")
 }
+
+// Verifies that Login always restores ForceAttemptOAuth2 to false on success.
+func TestLogin_ResetsForceAttemptOAuth2_OnSuccess(t *testing.T) {
+	t.Parallel()
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/v2/" {
+			// Accept either HEAD or GET
+			w.WriteHeader(http.StatusOK)
+			return
+		}
+		http.NotFound(w, r)
+	}))
+	defer srv.Close()
+
+	host := strings.TrimPrefix(srv.URL, "http://")
+
+	credFile := filepath.Join(t.TempDir(), "config.json")
+	c, err := NewClient(
+		ClientOptWriter(io.Discard),
+		ClientOptCredentialsFile(credFile),
+	)
+	if err != nil {
+		t.Fatalf("NewClient error: %v", err)
+	}
+
+	if c.authorizer == nil || c.authorizer.ForceAttemptOAuth2 {
+		t.Fatalf("expected ForceAttemptOAuth2 default to be false")
+	}
+
+	// Call Login with plain HTTP against our test server
+	if err := c.Login(host, LoginOptPlainText(true), LoginOptBasicAuth("u", "p")); err != nil {
+		t.Fatalf("Login error: %v", err)
+	}
+
+	if c.authorizer.ForceAttemptOAuth2 {
+		t.Errorf("ForceAttemptOAuth2 should be false after successful Login")
+	}
+}
+
+// Verifies that Login restores ForceAttemptOAuth2 to false even when ping fails.
+func TestLogin_ResetsForceAttemptOAuth2_OnFailure(t *testing.T) {
+	t.Parallel()
+
+	// Start and immediately close, so connections will fail
+	srv := httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) {}))
+	host := strings.TrimPrefix(srv.URL, "http://")
+	srv.Close()
+
+	credFile := filepath.Join(t.TempDir(), "config.json")
+	c, err := NewClient(
+		ClientOptWriter(io.Discard),
+		ClientOptCredentialsFile(credFile),
+	)
+	if err != nil {
+		t.Fatalf("NewClient error: %v", err)
+	}
+
+	// Invoke Login, expect an error but ForceAttemptOAuth2 must end false
+	_ = c.Login(host, LoginOptPlainText(true), LoginOptBasicAuth("u", "p"))
+
+	if c.authorizer.ForceAttemptOAuth2 {
+		t.Errorf("ForceAttemptOAuth2 should be false after failed Login")
+	}
+}

From d99d73254261d851d5f2fd8dad45b8881d1b9638 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 1 Sep 2025 09:39:38 -0700
Subject: [PATCH 179/211] fix: Adjust PostRenderer plugin output to value

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 internal/plugin/runtime_subprocess.go | 2 +-
 pkg/postrenderer/postrenderer.go      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
index e7faeed36..55362b972 100644
--- a/internal/plugin/runtime_subprocess.go
+++ b/internal/plugin/runtime_subprocess.go
@@ -270,7 +270,7 @@ func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error)
 	}
 
 	return &Output{
-		Message: &schema.OutputMessagePostRendererV1{
+		Message: schema.OutputMessagePostRendererV1{
 			Manifests: postRendered,
 		},
 	}, nil
diff --git a/pkg/postrenderer/postrenderer.go b/pkg/postrenderer/postrenderer.go
index 2107cc465..ed6699c32 100644
--- a/pkg/postrenderer/postrenderer.go
+++ b/pkg/postrenderer/postrenderer.go
@@ -73,7 +73,7 @@ func (r *postRendererPlugin) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer
 		return nil, fmt.Errorf("failed to invoke post-renderer plugin %q: %w", r.plugin.Metadata().Name, err)
 	}
 
-	outputMessage := output.Message.(*schema.OutputMessagePostRendererV1)
+	outputMessage := output.Message.(schema.OutputMessagePostRendererV1)
 
 	// If the binary returned almost nothing, it's likely that it didn't
 	// successfully render anything

From ee37c00c33e96c9c8747560c5e967e496547b33b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Sep 2025 16:57:28 +0000
Subject: [PATCH 180/211] chore(deps): bump sigs.k8s.io/controller-runtime from
 0.21.0 to 0.22.0

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.22.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3c9992dce..ab8797e6f 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.34.0
 	oras.land/oras-go/v2 v2.6.0
-	sigs.k8s.io/controller-runtime v0.21.0
+	sigs.k8s.io/controller-runtime v0.22.0
 	sigs.k8s.io/kustomize/kyaml v0.20.1
 	sigs.k8s.io/yaml v1.6.0
 )
diff --git a/go.sum b/go.sum
index d9e7c3d3d..076b6e5bd 100644
--- a/go.sum
+++ b/go.sum
@@ -532,8 +532,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
 oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
-sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
-sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
+sigs.k8s.io/controller-runtime v0.22.0 h1:mTOfibb8Hxwpx3xEkR56i7xSjB+nH4hZG37SrlCY5e0=
+sigs.k8s.io/controller-runtime v0.22.0/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=

From 5926ec83dd4760d02f316652a801f0812af39d87 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Fri, 22 Aug 2025 15:06:09 -0700
Subject: [PATCH 181/211] Remove SetupPluginEnv

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 cmd/helm/helm.go                              |   8 +-
 cmd/helm/helm_test.go                         |  20 +--
 internal/plugin/error.go                      |   4 +-
 internal/plugin/plugin_test.go                |   2 +
 internal/plugin/runtime.go                    |   9 ++
 internal/plugin/runtime_extismv1.go           |   2 +-
 internal/plugin/runtime_subprocess.go         | 117 ++++++++++--------
 internal/plugin/runtime_subprocess_getter.go  |  34 ++---
 internal/plugin/runtime_subprocess_test.go    |  92 ++++++++------
 internal/plugin/runtime_test.go               |  37 ++++++
 internal/plugin/schema/postrenderer.go        |   5 +-
 internal/plugin/subprocess_commands.go        |   6 +-
 internal/plugin/subprocess_commands_test.go   |  31 +++--
 pkg/cmd/load_plugins.go                       |  16 +--
 pkg/cmd/plugin.go                             |   1 -
 pkg/cmd/plugin_test.go                        |  86 +++++++------
 pkg/cmd/root.go                               |   5 +
 .../helmhome/helm/plugins/env/plugin-name.sh  |   3 +
 .../helmhome/helm/plugins/env/plugin.yaml     |   2 +-
 .../helmhome/helm/plugins/fullenv/fullenv.sh  |  12 +-
 pkg/postrenderer/postrenderer.go              |   1 -
 pkg/postrenderer/postrenderer_test.go         |   8 --
 22 files changed, 296 insertions(+), 205 deletions(-)
 create mode 100755 pkg/cmd/testdata/helmhome/helm/plugins/env/plugin-name.sh

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 05e7e7ba2..66d342500 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -41,11 +41,9 @@ func main() {
 	}
 
 	if err := cmd.Execute(); err != nil {
-		switch e := err.(type) {
-		case helmcmd.PluginError:
-			os.Exit(e.Code)
-		default:
-			os.Exit(1)
+		if cerr, ok := err.(helmcmd.CommandError); ok {
+			os.Exit(cerr.ExitCode)
 		}
+		os.Exit(1)
 	}
 }
diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go
index 5431daad0..0458e8037 100644
--- a/cmd/helm/helm_test.go
+++ b/cmd/helm/helm_test.go
@@ -22,11 +22,13 @@ import (
 	"os/exec"
 	"runtime"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
-func TestPluginExitCode(t *testing.T) {
+func TestCliPluginExitCode(t *testing.T) {
 	if os.Getenv("RUN_MAIN_FOR_TESTING") == "1" {
-		os.Args = []string{"helm", "exitwith", "2"}
+		os.Args = []string{"helm", "exitwith", "43"}
 
 		// We DO call helm's main() here. So this looks like a normal `helm` process.
 		main()
@@ -43,7 +45,7 @@ func TestPluginExitCode(t *testing.T) {
 		// So that the second run is able to run main() and this first run can verify the exit status returned by that.
 		//
 		// This technique originates from https://talks.golang.org/2014/testing.slide#23.
-		cmd := exec.Command(os.Args[0], "-test.run=TestPluginExitCode")
+		cmd := exec.Command(os.Args[0], "-test.run=TestCliPluginExitCode")
 		cmd.Env = append(
 			os.Environ(),
 			"RUN_MAIN_FOR_TESTING=1",
@@ -57,23 +59,21 @@ func TestPluginExitCode(t *testing.T) {
 		cmd.Stdout = stdout
 		cmd.Stderr = stderr
 		err := cmd.Run()
-		exiterr, ok := err.(*exec.ExitError)
 
+		exiterr, ok := err.(*exec.ExitError)
 		if !ok {
-			t.Fatalf("Unexpected error returned by os.Exit: %T", err)
+			t.Fatalf("Unexpected error type returned by os.Exit: %T", err)
 		}
 
-		if stdout.String() != "" {
-			t.Errorf("Expected no write to stdout: Got %q", stdout.String())
-		}
+		assert.Empty(t, stdout.String())
 
 		expectedStderr := "Error: plugin \"exitwith\" exited with error\n"
 		if stderr.String() != expectedStderr {
 			t.Errorf("Expected %q written to stderr: Got %q", expectedStderr, stderr.String())
 		}
 
-		if exiterr.ExitCode() != 2 {
-			t.Errorf("Expected exit code 2: Got %d", exiterr.ExitCode())
+		if exiterr.ExitCode() != 43 {
+			t.Errorf("Expected exit code 43: Got %d", exiterr.ExitCode())
 		}
 	}
 }
diff --git a/internal/plugin/error.go b/internal/plugin/error.go
index 5ace680cb..212460cea 100644
--- a/internal/plugin/error.go
+++ b/internal/plugin/error.go
@@ -19,8 +19,8 @@ package plugin
 // - subprocess plugin: child process exit code
 // - extism plugin: wasm function return code
 type InvokeExecError struct {
-	Err  error // Underlying error
-	Code int   // Exeit code from plugin code execution
+	ExitCode int   // Exit code from plugin code execution
+	Err      error // Underlying error
 }
 
 // Error implements the error interface
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index bddabd136..a4de8e52a 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -24,11 +24,13 @@ func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginR
 
 	rc := RuntimeConfigSubprocess{
 		PlatformCommand: []PlatformCommand{
+			{OperatingSystem: "darwin", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
 			{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"mock plugin\""}},
 			{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"mock plugin\""}},
 		},
 		PlatformHooks: map[string][]PlatformCommand{
 			Install: {
+				{OperatingSystem: "darwin", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
 				{OperatingSystem: "linux", Architecture: "", Command: "sh", Args: []string{"-c", "echo \"installing...\""}},
 				{OperatingSystem: "windows", Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"installing...\""}},
 			},
diff --git a/internal/plugin/runtime.go b/internal/plugin/runtime.go
index a9c01a380..b2ff0b7ca 100644
--- a/internal/plugin/runtime.go
+++ b/internal/plugin/runtime.go
@@ -16,6 +16,7 @@ limitations under the License.
 package plugin
 
 import (
+	"fmt"
 	"strings"
 
 	"go.yaml.in/yaml/v3"
@@ -73,3 +74,11 @@ func parseEnv(env []string) map[string]string {
 	}
 	return result
 }
+
+func formatEnv(env map[string]string) []string {
+	result := make([]string, 0, len(env))
+	for key, value := range env {
+		result = append(result, fmt.Sprintf("%s=%s", key, value))
+	}
+	return result
+}
diff --git a/internal/plugin/runtime_extismv1.go b/internal/plugin/runtime_extismv1.go
index c0122d08f..b5cc79a6f 100644
--- a/internal/plugin/runtime_extismv1.go
+++ b/internal/plugin/runtime_extismv1.go
@@ -196,7 +196,7 @@ func (p *ExtismV1PluginRuntime) Invoke(ctx context.Context, input *Input) (*Outp
 
 	if exitCode != 0 {
 		return nil, &InvokeExecError{
-			Code: int(exitCode),
+			ExitCode: int(exitCode),
 		}
 	}
 
diff --git a/internal/plugin/runtime_subprocess.go b/internal/plugin/runtime_subprocess.go
index a1a698679..5e6676a00 100644
--- a/internal/plugin/runtime_subprocess.go
+++ b/internal/plugin/runtime_subprocess.go
@@ -21,12 +21,12 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
+	"maps"
 	"os"
 	"os/exec"
-	"syscall"
+	"slices"
 
 	"helm.sh/helm/v4/internal/plugin/schema"
-	"helm.sh/helm/v4/pkg/cli"
 )
 
 // SubprocessProtocolCommand maps a given protocol to the getter command used to retrieve artifacts for that protcol
@@ -62,7 +62,9 @@ func (r *RuntimeConfigSubprocess) Validate() error {
 	return nil
 }
 
-type RuntimeSubprocess struct{}
+type RuntimeSubprocess struct {
+	EnvVars map[string]string
+}
 
 var _ Runtime = (*RuntimeSubprocess)(nil)
 
@@ -72,6 +74,7 @@ func (r *RuntimeSubprocess) CreatePlugin(pluginDir string, metadata *Metadata) (
 		metadata:      *metadata,
 		pluginDir:     pluginDir,
 		RuntimeConfig: *(metadata.RuntimeConfig.(*RuntimeConfigSubprocess)),
+		EnvVars:       maps.Clone(r.EnvVars),
 	}, nil
 }
 
@@ -80,6 +83,7 @@ type SubprocessPluginRuntime struct {
 	metadata      Metadata
 	pluginDir     string
 	RuntimeConfig RuntimeConfigSubprocess
+	EnvVars       map[string]string
 }
 
 var _ Plugin = (*SubprocessPluginRuntime)(nil)
@@ -109,22 +113,22 @@ func (r *SubprocessPluginRuntime) Invoke(_ context.Context, input *Input) (*Outp
 // This method allows execution with different command/args than the plugin's default
 func (r *SubprocessPluginRuntime) InvokeWithEnv(main string, argv []string, env []string, stdin io.Reader, stdout, stderr io.Writer) error {
 	mainCmdExp := os.ExpandEnv(main)
-	prog := exec.Command(mainCmdExp, argv...)
-	prog.Env = env
-	prog.Stdin = stdin
-	prog.Stdout = stdout
-	prog.Stderr = stderr
+	cmd := exec.Command(mainCmdExp, argv...)
+	cmd.Env = slices.Clone(os.Environ())
+	cmd.Env = append(
+		cmd.Env,
+		fmt.Sprintf("HELM_PLUGIN_NAME=%s", r.metadata.Name),
+		fmt.Sprintf("HELM_PLUGIN_DIR=%s", r.pluginDir))
+	cmd.Env = append(cmd.Env, env...)
+
+	cmd.Stdin = stdin
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
 
-	if err := prog.Run(); err != nil {
-		if eerr, ok := err.(*exec.ExitError); ok {
-			os.Stderr.Write(eerr.Stderr)
-			status := eerr.Sys().(syscall.WaitStatus)
-			return &InvokeExecError{
-				Err:  fmt.Errorf("plugin %q exited with error", r.metadata.Name),
-				Code: status.ExitStatus(),
-			}
-		}
+	if err := executeCmd(cmd, r.metadata.Name); err != nil {
+		return err
 	}
+
 	return nil
 }
 
@@ -135,15 +139,23 @@ func (r *SubprocessPluginRuntime) InvokeHook(event string) error {
 		return nil
 	}
 
-	main, argv, err := PrepareCommands(cmds, r.RuntimeConfig.expandHookArgs, []string{})
+	env := parseEnv(os.Environ())
+	maps.Insert(env, maps.All(r.EnvVars))
+	env["HELM_PLUGIN_NAME"] = r.metadata.Name
+	env["HELM_PLUGIN_DIR"] = r.pluginDir
+
+	main, argv, err := PrepareCommands(cmds, r.RuntimeConfig.expandHookArgs, []string{}, env)
 	if err != nil {
 		return err
 	}
 
-	prog := exec.Command(main, argv...)
-	prog.Stdout, prog.Stderr = os.Stdout, os.Stderr
+	cmd := exec.Command(main, argv...)
+	cmd.Env = formatEnv(env)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
 
-	if err := prog.Run(); err != nil {
+	slog.Debug("executing plugin hook command", slog.String("pluginName", r.metadata.Name), slog.String("command", cmd.String()))
+	if err := cmd.Run(); err != nil {
 		if eerr, ok := err.(*exec.ExitError); ok {
 			os.Stderr.Write(eerr.Stderr)
 			return fmt.Errorf("plugin %s hook for %q exited with error", event, r.metadata.Name)
@@ -159,10 +171,15 @@ func (r *SubprocessPluginRuntime) InvokeHook(event string) error {
 func executeCmd(prog *exec.Cmd, pluginName string) error {
 	if err := prog.Run(); err != nil {
 		if eerr, ok := err.(*exec.ExitError); ok {
-			os.Stderr.Write(eerr.Stderr)
+			slog.Debug(
+				"plugin execution failed",
+				slog.String("pluginName", pluginName),
+				slog.String("error", err.Error()),
+				slog.Int("exitCode", eerr.ExitCode()),
+				slog.String("stderr", string(bytes.TrimSpace(eerr.Stderr))))
 			return &InvokeExecError{
-				Err:  fmt.Errorf("plugin %q exited with error", pluginName),
-				Code: eerr.ExitCode(),
+				Err:      fmt.Errorf("plugin %q exited with error", pluginName),
+				ExitCode: eerr.ExitCode(),
 			}
 		}
 
@@ -181,14 +198,27 @@ func (r *SubprocessPluginRuntime) runCLI(input *Input) (*Output, error) {
 
 	cmds := r.RuntimeConfig.PlatformCommand
 
-	command, args, err := PrepareCommands(cmds, true, extraArgs)
+	env := parseEnv(os.Environ())
+	maps.Insert(env, maps.All(r.EnvVars))
+	maps.Insert(env, maps.All(parseEnv(input.Env)))
+	env["HELM_PLUGIN_NAME"] = r.metadata.Name
+	env["HELM_PLUGIN_DIR"] = r.pluginDir
+
+	command, args, err := PrepareCommands(cmds, true, extraArgs, env)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare plugin command: %w", err)
 	}
 
-	err2 := r.InvokeWithEnv(command, args, input.Env, input.Stdin, input.Stdout, input.Stderr)
-	if err2 != nil {
-		return nil, err2
+	cmd := exec.Command(command, args...)
+	cmd.Env = formatEnv(env)
+
+	cmd.Stdin = input.Stdin
+	cmd.Stdout = input.Stdout
+	cmd.Stderr = input.Stderr
+
+	slog.Debug("executing plugin command", slog.String("pluginName", r.metadata.Name), slog.String("command", cmd.String()))
+	if err := executeCmd(cmd, r.metadata.Name); err != nil {
+		return nil, err
 	}
 
 	return &Output{
@@ -201,20 +231,19 @@ func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error)
 		return nil, fmt.Errorf("plugin %q input message does not implement InputMessagePostRendererV1", r.metadata.Name)
 	}
 
-	msg := input.Message.(schema.InputMessagePostRendererV1)
-	extraArgs := msg.ExtraArgs
-	settings := msg.Settings
-
-	// Setup plugin environment
-	SetupPluginEnv(settings, r.metadata.Name, r.pluginDir)
+	env := parseEnv(os.Environ())
+	maps.Insert(env, maps.All(r.EnvVars))
+	maps.Insert(env, maps.All(parseEnv(input.Env)))
+	env["HELM_PLUGIN_NAME"] = r.metadata.Name
+	env["HELM_PLUGIN_DIR"] = r.pluginDir
 
+	msg := input.Message.(schema.InputMessagePostRendererV1)
 	cmds := r.RuntimeConfig.PlatformCommand
-	command, args, err := PrepareCommands(cmds, true, extraArgs)
+	command, args, err := PrepareCommands(cmds, true, msg.ExtraArgs, env)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare plugin command: %w", err)
 	}
 
-	// TODO de-duplicate code here by calling RuntimeSubprocess.invokeWithEnv()
 	cmd := exec.Command(
 		command,
 		args...)
@@ -232,12 +261,12 @@ func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error)
 	postRendered := &bytes.Buffer{}
 	stderr := &bytes.Buffer{}
 
-	//cmd.Env = pluginExec.env
+	cmd.Env = formatEnv(env)
 	cmd.Stdout = postRendered
 	cmd.Stderr = stderr
 
+	slog.Debug("executing plugin command", slog.String("pluginName", r.metadata.Name), slog.String("command", cmd.String()))
 	if err := executeCmd(cmd, r.metadata.Name); err != nil {
-		slog.Info("plugin execution failed", slog.String("stderr", stderr.String()))
 		return nil, err
 	}
 
@@ -247,15 +276,3 @@ func (r *SubprocessPluginRuntime) runPostrenderer(input *Input) (*Output, error)
 		},
 	}, nil
 }
-
-// SetupPluginEnv prepares os.Env for plugins. It operates on os.Env because
-// the plugin subsystem itself needs access to the environment variables
-// created here.
-func SetupPluginEnv(settings *cli.EnvSettings, name, base string) { // TODO: remove
-	env := settings.EnvVars()
-	env["HELM_PLUGIN_NAME"] = name
-	env["HELM_PLUGIN_DIR"] = base
-	for key, val := range env {
-		os.Setenv(key, val)
-	}
-}
diff --git a/internal/plugin/runtime_subprocess_getter.go b/internal/plugin/runtime_subprocess_getter.go
index d1884bc93..6a41b149f 100644
--- a/internal/plugin/runtime_subprocess_getter.go
+++ b/internal/plugin/runtime_subprocess_getter.go
@@ -18,6 +18,8 @@ package plugin
 import (
 	"bytes"
 	"fmt"
+	"log/slog"
+	"maps"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -54,10 +56,20 @@ func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
 		return nil, fmt.Errorf("no downloader found for protocol %q", msg.Protocol)
 	}
 
-	command, args, err := PrepareCommands(d.PlatformCommand, false, []string{})
+	env := parseEnv(os.Environ())
+	maps.Insert(env, maps.All(r.EnvVars))
+	maps.Insert(env, maps.All(parseEnv(input.Env)))
+	env["HELM_PLUGIN_NAME"] = r.metadata.Name
+	env["HELM_PLUGIN_DIR"] = r.pluginDir
+	env["HELM_PLUGIN_USERNAME"] = msg.Options.Username
+	env["HELM_PLUGIN_PASSWORD"] = msg.Options.Password
+	env["HELM_PLUGIN_PASS_CREDENTIALS_ALL"] = fmt.Sprintf("%t", msg.Options.PassCredentialsAll)
+
+	command, args, err := PrepareCommands(d.PlatformCommand, false, []string{}, env)
 	if err != nil {
 		return nil, fmt.Errorf("failed to prepare commands for protocol %q: %w", msg.Protocol, err)
 	}
+
 	args = append(
 		args,
 		msg.Options.CertFile,
@@ -65,24 +77,18 @@ func (r *SubprocessPluginRuntime) runGetter(input *Input) (*Output, error) {
 		msg.Options.CAFile,
 		msg.Href)
 
-	// TODO should we append to input.Env too?
-	env := append(
-		os.Environ(),
-		fmt.Sprintf("HELM_PLUGIN_USERNAME=%s", msg.Options.Username),
-		fmt.Sprintf("HELM_PLUGIN_PASSWORD=%s", msg.Options.Password),
-		fmt.Sprintf("HELM_PLUGIN_PASS_CREDENTIALS_ALL=%t", msg.Options.PassCredentialsAll))
-
-	// TODO should we pass along input.Stdout?
 	buf := bytes.Buffer{} // subprocess getters are expected to write content to stdout
 
 	pluginCommand := filepath.Join(r.pluginDir, command)
-	prog := exec.Command(
+	cmd := exec.Command(
 		pluginCommand,
 		args...)
-	prog.Env = env
-	prog.Stdout = &buf
-	prog.Stderr = os.Stderr
-	if err := executeCmd(prog, r.metadata.Name); err != nil {
+	cmd.Env = formatEnv(env)
+	cmd.Stdout = &buf
+	cmd.Stderr = os.Stderr
+
+	slog.Debug("executing plugin command", slog.String("pluginName", r.metadata.Name), slog.String("command", cmd.String()))
+	if err := executeCmd(cmd, r.metadata.Name); err != nil {
 		return nil, err
 	}
 
diff --git a/internal/plugin/runtime_subprocess_test.go b/internal/plugin/runtime_subprocess_test.go
index 9d932816d..dab372027 100644
--- a/internal/plugin/runtime_subprocess_test.go
+++ b/internal/plugin/runtime_subprocess_test.go
@@ -16,49 +16,69 @@ limitations under the License.
 package plugin
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/cli"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.yaml.in/yaml/v3"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 )
 
-func TestSetupEnv(t *testing.T) {
-	name := "pequod"
-	base := filepath.Join("testdata/helmhome/helm/plugins", name)
-
-	s := cli.New()
-	s.PluginsDirectory = "testdata/helmhome/helm/plugins"
-
-	SetupPluginEnv(s, name, base)
-	for _, tt := range []struct {
-		name, expect string
-	}{
-		{"HELM_PLUGIN_NAME", name},
-		{"HELM_PLUGIN_DIR", base},
-	} {
-		if got := os.Getenv(tt.name); got != tt.expect {
-			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
-		}
+func mockSubprocessCLIPluginErrorExit(t *testing.T, pluginName string, exitCode uint8) *SubprocessPluginRuntime {
+	t.Helper()
+
+	rc := RuntimeConfigSubprocess{
+		PlatformCommand: []PlatformCommand{
+			{Command: "sh", Args: []string{"-c", fmt.Sprintf("echo \"mock plugin $@\"; exit %d", exitCode)}},
+		},
+	}
+
+	pluginDir := t.TempDir()
+
+	md := Metadata{
+		Name:       pluginName,
+		Version:    "v0.1.2",
+		Type:       "cli/v1",
+		APIVersion: "v1",
+		Runtime:    "subprocess",
+		Config: &ConfigCLI{
+			Usage:       "Mock plugin",
+			ShortHelp:   "Mock plugin",
+			LongHelp:    "Mock plugin for testing",
+			IgnoreFlags: false,
+		},
+		RuntimeConfig: &rc,
 	}
-}
 
-func TestSetupEnvWithSpace(t *testing.T) {
-	name := "sureshdsk"
-	base := filepath.Join("testdata/helm home/helm/plugins", name)
-
-	s := cli.New()
-	s.PluginsDirectory = "testdata/helm home/helm/plugins"
-
-	SetupPluginEnv(s, name, base)
-	for _, tt := range []struct {
-		name, expect string
-	}{
-		{"HELM_PLUGIN_NAME", name},
-		{"HELM_PLUGIN_DIR", base},
-	} {
-		if got := os.Getenv(tt.name); got != tt.expect {
-			t.Errorf("Expected $%s=%q, got %q", tt.name, tt.expect, got)
-		}
+	data, err := yaml.Marshal(md)
+	require.NoError(t, err)
+	os.WriteFile(filepath.Join(pluginDir, "plugin.yaml"), data, 0o644)
+
+	return &SubprocessPluginRuntime{
+		metadata:      md,
+		pluginDir:     pluginDir,
+		RuntimeConfig: rc,
 	}
 }
+
+func TestSubprocessPluginRuntime(t *testing.T) {
+	p := mockSubprocessCLIPluginErrorExit(t, "foo", 56)
+
+	output, err := p.Invoke(t.Context(), &Input{
+		Message: schema.InputMessageCLIV1{
+			ExtraArgs: []string{"arg1", "arg2"},
+			//Env:       []string{"FOO=bar"},
+		},
+	})
+
+	require.Error(t, err)
+	ieerr, ok := err.(*InvokeExecError)
+	require.True(t, ok, "expected InvokeExecError, got %T", err)
+	assert.Equal(t, 56, ieerr.ExitCode)
+
+	assert.Nil(t, output)
+}
diff --git a/internal/plugin/runtime_test.go b/internal/plugin/runtime_test.go
index 8b72648b2..f8fe481c1 100644
--- a/internal/plugin/runtime_test.go
+++ b/internal/plugin/runtime_test.go
@@ -61,3 +61,40 @@ func TestParseEnv(t *testing.T) {
 		})
 	}
 }
+
+func TestFormatEnv(t *testing.T) {
+	type testCase struct {
+		env      map[string]string
+		expected []string
+	}
+
+	testCases := map[string]testCase{
+		"empty": {
+			env:      map[string]string{},
+			expected: []string{},
+		},
+		"single": {
+			env:      map[string]string{"KEY": "value"},
+			expected: []string{"KEY=value"},
+		},
+		"multiple": {
+			env:      map[string]string{"KEY1": "value1", "KEY2": "value2"},
+			expected: []string{"KEY1=value1", "KEY2=value2"},
+		},
+		"empty_key": {
+			env:      map[string]string{"": "value1", "KEY2": "value2"},
+			expected: []string{"=value1", "KEY2=value2"},
+		},
+		"empty_value": {
+			env:      map[string]string{"KEY1": "value1", "KEY2": "", "KEY3": "value3"},
+			expected: []string{"KEY1=value1", "KEY2=", "KEY3=value3"},
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			result := formatEnv(tc.env)
+			assert.ElementsMatch(t, tc.expected, result)
+		})
+	}
+}
diff --git a/internal/plugin/schema/postrenderer.go b/internal/plugin/schema/postrenderer.go
index 0f0c09369..82fd3059f 100644
--- a/internal/plugin/schema/postrenderer.go
+++ b/internal/plugin/schema/postrenderer.go
@@ -18,16 +18,13 @@ package schema
 
 import (
 	"bytes"
-
-	"helm.sh/helm/v4/pkg/cli"
 )
 
 // InputMessagePostRendererV1 implements Input.Message
 type InputMessagePostRendererV1 struct {
 	Manifests *bytes.Buffer `json:"manifests"`
 	// from CLI --post-renderer-args
-	ExtraArgs []string         `json:"extraArgs"`
-	Settings  *cli.EnvSettings `json:"settings"`
+	ExtraArgs []string `json:"extraArgs"`
 }
 
 type OutputMessagePostRendererV1 struct {
diff --git a/internal/plugin/subprocess_commands.go b/internal/plugin/subprocess_commands.go
index d979f98e3..e21ec2bab 100644
--- a/internal/plugin/subprocess_commands.go
+++ b/internal/plugin/subprocess_commands.go
@@ -77,13 +77,15 @@ func getPlatformCommand(cmds []PlatformCommand) ([]string, []string) {
 // returns the main command and an args array.
 //
 // The result is suitable to pass to exec.Command.
-func PrepareCommands(cmds []PlatformCommand, expandArgs bool, extraArgs []string) (string, []string, error) {
+func PrepareCommands(cmds []PlatformCommand, expandArgs bool, extraArgs []string, env map[string]string) (string, []string, error) {
 	cmdParts, args := getPlatformCommand(cmds)
 	if len(cmdParts) == 0 || cmdParts[0] == "" {
 		return "", nil, fmt.Errorf("no plugin command is applicable")
 	}
 
-	main := os.ExpandEnv(cmdParts[0])
+	main := os.Expand(cmdParts[0], func(key string) string {
+		return env[key]
+	})
 	baseArgs := []string{}
 	if len(cmdParts) > 1 {
 		for _, cmdPart := range cmdParts[1:] {
diff --git a/internal/plugin/subprocess_commands_test.go b/internal/plugin/subprocess_commands_test.go
index 16446cdec..c1eba7a55 100644
--- a/internal/plugin/subprocess_commands_test.go
+++ b/internal/plugin/subprocess_commands_test.go
@@ -34,7 +34,8 @@ func TestPrepareCommand(t *testing.T) {
 		{OperatingSystem: runtime.GOOS, Architecture: runtime.GOARCH, Command: cmdMain, Args: cmdArgs},
 	}
 
-	cmd, args, err := PrepareCommands(platformCommand, true, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(platformCommand, true, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -91,7 +92,9 @@ func TestPrepareCommandExtraArgs(t *testing.T) {
 			if tc.ignoreFlags {
 				testExtraArgs = []string{}
 			}
-			cmd, args, err := PrepareCommands(platformCommand, true, testExtraArgs)
+
+			env := map[string]string{}
+			cmd, args, err := PrepareCommands(platformCommand, true, testExtraArgs, env)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -112,7 +115,8 @@ func TestPrepareCommands(t *testing.T) {
 		{OperatingSystem: runtime.GOOS, Architecture: "", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 	}
 
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, true, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -138,7 +142,8 @@ func TestPrepareCommandsExtraArgs(t *testing.T) {
 
 	expectedArgs := append(cmdArgs, extraArgs...)
 
-	cmd, args, err := PrepareCommands(cmds, true, extraArgs)
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, true, extraArgs, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,7 +165,8 @@ func TestPrepareCommandsNoArch(t *testing.T) {
 		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 	}
 
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, true, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -182,7 +188,8 @@ func TestPrepareCommandsNoOsNoArch(t *testing.T) {
 		{OperatingSystem: runtime.GOOS, Architecture: "no-arch", Command: "pwsh", Args: []string{"-c", "echo \"error\""}},
 	}
 
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, true, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -201,7 +208,8 @@ func TestPrepareCommandsNoMatch(t *testing.T) {
 		{OperatingSystem: "no-os", Architecture: runtime.GOARCH, Command: "sh", Args: []string{"-c", "echo \"test\""}},
 	}
 
-	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
+	env := map[string]string{}
+	if _, _, err := PrepareCommands(cmds, true, []string{}, env); err == nil {
 		t.Fatalf("Expected error to be returned")
 	}
 }
@@ -209,7 +217,8 @@ func TestPrepareCommandsNoMatch(t *testing.T) {
 func TestPrepareCommandsNoCommands(t *testing.T) {
 	cmds := []PlatformCommand{}
 
-	if _, _, err := PrepareCommands(cmds, true, []string{}); err == nil {
+	env := map[string]string{}
+	if _, _, err := PrepareCommands(cmds, true, []string{}, env); err == nil {
 		t.Fatalf("Expected error to be returned")
 	}
 }
@@ -224,7 +233,8 @@ func TestPrepareCommandsExpand(t *testing.T) {
 
 	expectedArgs := []string{"-c", "echo \"test\""}
 
-	cmd, args, err := PrepareCommands(cmds, true, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, true, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -244,7 +254,8 @@ func TestPrepareCommandsNoExpand(t *testing.T) {
 		{OperatingSystem: "", Architecture: "", Command: cmdMain, Args: cmdArgs},
 	}
 
-	cmd, args, err := PrepareCommands(cmds, false, []string{})
+	env := map[string]string{}
+	cmd, args, err := PrepareCommands(cmds, false, []string{}, env)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index 5057c1033..75cfdc3cf 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -46,11 +46,6 @@ const (
 	pluginDynamicCompletionExecutable = "plugin.complete"
 )
 
-type PluginError struct {
-	error
-	Code int
-}
-
 // loadCLIPlugins loads CLI plugins into the command list.
 //
 // This follows a different pattern than the other commands because it has
@@ -101,8 +96,6 @@ func loadCLIPlugins(baseCmd *cobra.Command, out io.Writer) {
 				if err != nil {
 					return err
 				}
-				// Setup plugin environment
-				plugin.SetupPluginEnv(settings, plug.Metadata().Name, plug.Dir())
 
 				// For CLI plugin types runtime, set extra args and settings
 				extraArgs := []string{}
@@ -128,12 +121,10 @@ func loadCLIPlugins(baseCmd *cobra.Command, out io.Writer) {
 					Stderr: os.Stderr,
 				}
 				_, err = plug.Invoke(context.Background(), input)
-				// TODO do we want to keep execErr here?
 				if execErr, ok := err.(*plugin.InvokeExecError); ok {
-					// TODO can we replace cmd.PluginError with plugin.Error?
-					return PluginError{
-						error: execErr.Err,
-						Code:  execErr.Code,
+					return CommandError{
+						error:    execErr.Err,
+						ExitCode: execErr.ExitCode,
 					}
 				}
 				return err
@@ -369,7 +360,6 @@ func pluginDynamicComp(plug plugin.Plugin, cmd *cobra.Command, args []string, to
 		argv = append(argv, u...)
 		argv = append(argv, toComplete)
 	}
-	plugin.SetupPluginEnv(settings, plug.Metadata().Name, plug.Dir())
 
 	cobra.CompDebugln(fmt.Sprintf("calling %s with args %v", main, argv), settings.Debug)
 	buf := new(bytes.Buffer)
diff --git a/pkg/cmd/plugin.go b/pkg/cmd/plugin.go
index 393e9672c..ba904ef5f 100644
--- a/pkg/cmd/plugin.go
+++ b/pkg/cmd/plugin.go
@@ -48,7 +48,6 @@ func newPluginCmd(out io.Writer) *cobra.Command {
 func runHook(p plugin.Plugin, event string) error {
 	pluginHook, ok := p.(plugin.PluginHook)
 	if ok {
-		plugin.SetupPluginEnv(settings, p.Metadata().Name, p.Dir())
 		return pluginHook.InvokeHook(event)
 	}
 
diff --git a/pkg/cmd/plugin_test.go b/pkg/cmd/plugin_test.go
index 738a64740..f7a418569 100644
--- a/pkg/cmd/plugin_test.go
+++ b/pkg/cmd/plugin_test.go
@@ -17,6 +17,7 @@ package cmd
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"runtime"
 	"strings"
@@ -93,14 +94,14 @@ func TestLoadCLIPlugins(t *testing.T) {
 	)
 	loadCLIPlugins(&cmd, &out)
 
-	envs := strings.Join([]string{
-		"fullenv",
-		"testdata/helmhome/helm/plugins/fullenv",
-		"testdata/helmhome/helm/plugins",
-		"testdata/helmhome/helm/repositories.yaml",
-		"testdata/helmhome/helm/repository",
-		os.Args[0],
-	}, "\n")
+	fullEnvOutput := strings.Join([]string{
+		"HELM_PLUGIN_NAME=fullenv",
+		"HELM_PLUGIN_DIR=testdata/helmhome/helm/plugins/fullenv",
+		"HELM_PLUGINS=testdata/helmhome/helm/plugins",
+		"HELM_REPOSITORY_CONFIG=testdata/helmhome/helm/repositories.yaml",
+		"HELM_REPOSITORY_CACHE=testdata/helmhome/helm/repository",
+		fmt.Sprintf("HELM_BIN=%s", os.Args[0]),
+	}, "\n") + "\n"
 
 	// Test that the YAML file was correctly converted to a command.
 	tests := []struct {
@@ -113,47 +114,50 @@ func TestLoadCLIPlugins(t *testing.T) {
 	}{
 		{"args", "echo args", "This echos args", "-a -b -c\n", []string{"-a", "-b", "-c"}, 0},
 		{"echo", "echo stuff", "This echos stuff", "hello\n", []string{}, 0},
-		{"env", "env stuff", "show the env", "env\n", []string{}, 0},
+		{"env", "env stuff", "show the env", "HELM_PLUGIN_NAME=env\n", []string{}, 0},
 		{"exitwith", "exitwith code", "This exits with the specified exit code", "", []string{"2"}, 2},
-		{"fullenv", "show env vars", "show all env vars", envs + "\n", []string{}, 0},
+		{"fullenv", "show env vars", "show all env vars", fullEnvOutput, []string{}, 0},
 	}
 
-	plugins := cmd.Commands()
+	pluginCmds := cmd.Commands()
 
-	require.Len(t, plugins, len(tests), "Expected %d plugins, got %d", len(tests), len(plugins))
+	require.Len(t, pluginCmds, len(tests), "Expected %d plugins, got %d", len(tests), len(pluginCmds))
 
-	for i := range plugins {
+	for i := range pluginCmds {
 		out.Reset()
 		tt := tests[i]
-		pp := plugins[i]
-		if pp.Use != tt.use {
-			t.Errorf("%d: Expected Use=%q, got %q", i, tt.use, pp.Use)
-		}
-		if pp.Short != tt.short {
-			t.Errorf("%d: Expected Use=%q, got %q", i, tt.short, pp.Short)
-		}
-		if pp.Long != tt.long {
-			t.Errorf("%d: Expected Use=%q, got %q", i, tt.long, pp.Long)
-		}
+		pluginCmd := pluginCmds[i]
+		t.Run(fmt.Sprintf("%s-%d", pluginCmd.Name(), i), func(t *testing.T) {
+			out.Reset()
+			if pluginCmd.Use != tt.use {
+				t.Errorf("%d: Expected Use=%q, got %q", i, tt.use, pluginCmd.Use)
+			}
+			if pluginCmd.Short != tt.short {
+				t.Errorf("%d: Expected Use=%q, got %q", i, tt.short, pluginCmd.Short)
+			}
+			if pluginCmd.Long != tt.long {
+				t.Errorf("%d: Expected Use=%q, got %q", i, tt.long, pluginCmd.Long)
+			}
 
-		// Currently, plugins assume a Linux subsystem. Skip the execution
-		// tests until this is fixed
-		if runtime.GOOS != "windows" {
-			if err := pp.RunE(pp, tt.args); err != nil {
-				if tt.code > 0 {
-					perr, ok := err.(PluginError)
-					if !ok {
-						t.Errorf("Expected %s to return pluginError: got %v(%T)", tt.use, err, err)
+			// Currently, plugins assume a Linux subsystem. Skip the execution
+			// tests until this is fixed
+			if runtime.GOOS != "windows" {
+				if err := pluginCmd.RunE(pluginCmd, tt.args); err != nil {
+					if tt.code > 0 {
+						cerr, ok := err.(CommandError)
+						if !ok {
+							t.Errorf("Expected %s to return pluginError: got %v(%T)", tt.use, err, err)
+						}
+						if cerr.ExitCode != tt.code {
+							t.Errorf("Expected %s to return %d: got %d", tt.use, tt.code, cerr.ExitCode)
+						}
+					} else {
+						t.Errorf("Error running %s: %+v", tt.use, err)
 					}
-					if perr.Code != tt.code {
-						t.Errorf("Expected %s to return %d: got %d", tt.use, tt.code, perr.Code)
-					}
-				} else {
-					t.Errorf("Error running %s: %+v", tt.use, err)
 				}
+				assert.Equal(t, tt.expect, out.String(), "expected output for %q", tt.use)
 			}
-			assert.Equal(t, tt.expect, out.String(), "expected output for %s", tt.use)
-		}
+		})
 	}
 }
 
@@ -214,12 +218,12 @@ func TestLoadPluginsWithSpace(t *testing.T) {
 		if runtime.GOOS != "windows" {
 			if err := pp.RunE(pp, tt.args); err != nil {
 				if tt.code > 0 {
-					perr, ok := err.(PluginError)
+					cerr, ok := err.(CommandError)
 					if !ok {
 						t.Errorf("Expected %s to return pluginError: got %v(%T)", tt.use, err, err)
 					}
-					if perr.Code != tt.code {
-						t.Errorf("Expected %s to return %d: got %d", tt.use, tt.code, perr.Code)
+					if cerr.ExitCode != tt.code {
+						t.Errorf("Expected %s to return %d: got %d", tt.use, tt.code, cerr.ExitCode)
 					}
 				} else {
 					t.Errorf("Error running %s: %+v", tt.use, err)
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 836df834d..2b2f7b750 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -460,3 +460,8 @@ func newRegistryClientWithTLS(
 	}
 	return registryClient, nil
 }
+
+type CommandError struct {
+	error
+	ExitCode int
+}
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin-name.sh b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin-name.sh
new file mode 100755
index 000000000..9e823ac13
--- /dev/null
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin-name.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+echo HELM_PLUGIN_NAME=${HELM_PLUGIN_NAME}
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
index fa933af93..78a0a23fb 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/env/plugin.yaml
@@ -9,4 +9,4 @@ config:
   ignoreFlags: false
 runtimeConfig:
   platformCommand:
-  - command: "echo $HELM_PLUGIN_NAME"
+  - command: ${HELM_PLUGIN_DIR}/plugin-name.sh
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/fullenv.sh b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/fullenv.sh
index 2efad9b3c..cc0c64a6a 100755
--- a/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/fullenv.sh
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/fullenv/fullenv.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-echo $HELM_PLUGIN_NAME
-echo $HELM_PLUGIN_DIR
-echo $HELM_PLUGINS
-echo $HELM_REPOSITORY_CONFIG
-echo $HELM_REPOSITORY_CACHE
-echo $HELM_BIN
+echo HELM_PLUGIN_NAME=${HELM_PLUGIN_NAME}
+echo HELM_PLUGIN_DIR=${HELM_PLUGIN_DIR}
+echo HELM_PLUGINS=${HELM_PLUGINS}
+echo HELM_REPOSITORY_CONFIG=${HELM_REPOSITORY_CONFIG}
+echo HELM_REPOSITORY_CACHE=${HELM_REPOSITORY_CACHE}
+echo HELM_BIN=${HELM_BIN}
diff --git a/pkg/postrenderer/postrenderer.go b/pkg/postrenderer/postrenderer.go
index ed6699c32..55e6d3adf 100644
--- a/pkg/postrenderer/postrenderer.go
+++ b/pkg/postrenderer/postrenderer.go
@@ -65,7 +65,6 @@ func (r *postRendererPlugin) Run(renderedManifests *bytes.Buffer) (*bytes.Buffer
 		Message: schema.InputMessagePostRendererV1{
 			ExtraArgs: r.args,
 			Manifests: renderedManifests,
-			Settings:  r.settings,
 		},
 	}
 	output, err := r.plugin.Invoke(context.Background(), input)
diff --git a/pkg/postrenderer/postrenderer_test.go b/pkg/postrenderer/postrenderer_test.go
index 9addd481d..824a1d179 100644
--- a/pkg/postrenderer/postrenderer_test.go
+++ b/pkg/postrenderer/postrenderer_test.go
@@ -18,14 +18,12 @@ package postrenderer
 
 import (
 	"bytes"
-	"path/filepath"
 	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/pkg/cli"
 )
 
@@ -38,8 +36,6 @@ func TestNewPostRenderPluginRunWithNoOutput(t *testing.T) {
 	s := cli.New()
 	s.PluginsDirectory = "testdata/plugins"
 	name := "postrenderer-v1"
-	base := filepath.Join(s.PluginsDirectory, name)
-	plugin.SetupPluginEnv(s, name, base)
 
 	renderer, err := NewPostRendererPlugin(s, name, "")
 	require.NoError(t, err)
@@ -57,8 +53,6 @@ func TestNewPostRenderPluginWithOneArgsRun(t *testing.T) {
 	s := cli.New()
 	s.PluginsDirectory = "testdata/plugins"
 	name := "postrenderer-v1"
-	base := filepath.Join(s.PluginsDirectory, name)
-	plugin.SetupPluginEnv(s, name, base)
 
 	renderer, err := NewPostRendererPlugin(s, name, "ARG1")
 	require.NoError(t, err)
@@ -77,8 +71,6 @@ func TestNewPostRenderPluginWithTwoArgsRun(t *testing.T) {
 	s := cli.New()
 	s.PluginsDirectory = "testdata/plugins"
 	name := "postrenderer-v1"
-	base := filepath.Join(s.PluginsDirectory, name)
-	plugin.SetupPluginEnv(s, name, base)
 
 	renderer, err := NewPostRendererPlugin(s, name, "ARG1", "ARG2")
 	require.NoError(t, err)

From 6f957f4922ea065138f76b990ba5cc95bbcd774b Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Sun, 31 Aug 2025 08:48:15 -0400
Subject: [PATCH 182/211] Move the release util to the versioned directory

The release util package is directly related to the v1 of
releases and uses the v1 of releases.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 pkg/action/action.go                              | 2 +-
 pkg/action/install.go                             | 2 +-
 pkg/action/list.go                                | 2 +-
 pkg/action/resource_policy.go                     | 2 +-
 pkg/action/uninstall.go                           | 2 +-
 pkg/action/upgrade.go                             | 2 +-
 pkg/cmd/history.go                                | 2 +-
 pkg/cmd/template.go                               | 2 +-
 pkg/release/{ => v1}/util/filter.go               | 2 +-
 pkg/release/{ => v1}/util/filter_test.go          | 2 +-
 pkg/release/{ => v1}/util/kind_sorter.go          | 0
 pkg/release/{ => v1}/util/kind_sorter_test.go     | 0
 pkg/release/{ => v1}/util/manifest.go             | 0
 pkg/release/{ => v1}/util/manifest_sorter.go      | 0
 pkg/release/{ => v1}/util/manifest_sorter_test.go | 0
 pkg/release/{ => v1}/util/manifest_test.go        | 2 +-
 pkg/release/{ => v1}/util/sorter.go               | 2 +-
 pkg/release/{ => v1}/util/sorter_test.go          | 2 +-
 pkg/storage/storage.go                            | 2 +-
 19 files changed, 14 insertions(+), 14 deletions(-)
 rename pkg/release/{ => v1}/util/filter.go (97%)
 rename pkg/release/{ => v1}/util/filter_test.go (96%)
 rename pkg/release/{ => v1}/util/kind_sorter.go (100%)
 rename pkg/release/{ => v1}/util/kind_sorter_test.go (100%)
 rename pkg/release/{ => v1}/util/manifest.go (100%)
 rename pkg/release/{ => v1}/util/manifest_sorter.go (100%)
 rename pkg/release/{ => v1}/util/manifest_sorter_test.go (100%)
 rename pkg/release/{ => v1}/util/manifest_test.go (95%)
 rename pkg/release/{ => v1}/util/sorter.go (96%)
 rename pkg/release/{ => v1}/util/sorter_test.go (97%)

diff --git a/pkg/action/action.go b/pkg/action/action.go
index 7b8fa3c34..522226a1a 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -45,8 +45,8 @@ import (
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
 	"helm.sh/helm/v4/pkg/time"
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 5ca499d64..484cdbf8c 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -50,8 +50,8 @@ import (
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/repo"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
diff --git a/pkg/action/list.go b/pkg/action/list.go
index 82500582f..c6d6f2037 100644
--- a/pkg/action/list.go
+++ b/pkg/action/list.go
@@ -22,8 +22,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/labels"
 
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 )
 
 // ListStates represents zero or more status codes that a list item may have set
diff --git a/pkg/action/resource_policy.go b/pkg/action/resource_policy.go
index b72e94124..fcea98ad6 100644
--- a/pkg/action/resource_policy.go
+++ b/pkg/action/resource_policy.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	"helm.sh/helm/v4/pkg/kube"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 )
 
 func filterManifestsToKeep(manifests []releaseutil.Manifest) (keep, remaining []releaseutil.Manifest) {
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 6aa87d331..866be5d54 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -27,8 +27,8 @@ import (
 
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage/driver"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index f7fbd490f..c00a59079 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -33,8 +33,8 @@ import (
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrenderer"
 	"helm.sh/helm/v4/pkg/registry"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage/driver"
 )
 
diff --git a/pkg/cmd/history.go b/pkg/cmd/history.go
index ec2a1bc12..9f029268c 100644
--- a/pkg/cmd/history.go
+++ b/pkg/cmd/history.go
@@ -29,8 +29,8 @@ import (
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
 	release "helm.sh/helm/v4/pkg/release/v1"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go
index c93b5395b..aaf848c9e 100644
--- a/pkg/cmd/template.go
+++ b/pkg/cmd/template.go
@@ -38,7 +38,7 @@ import (
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/cmd/require"
-	releaseutil "helm.sh/helm/v4/pkg/release/util"
+	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 )
 
 const templateDesc = `
diff --git a/pkg/release/util/filter.go b/pkg/release/v1/util/filter.go
similarity index 97%
rename from pkg/release/util/filter.go
rename to pkg/release/v1/util/filter.go
index f0a082cfd..f818a6196 100644
--- a/pkg/release/util/filter.go
+++ b/pkg/release/v1/util/filter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util // import "helm.sh/helm/v4/pkg/release/util"
+package util // import "helm.sh/helm/v4/pkg/release/v1/util"
 
 import rspb "helm.sh/helm/v4/pkg/release/v1"
 
diff --git a/pkg/release/util/filter_test.go b/pkg/release/v1/util/filter_test.go
similarity index 96%
rename from pkg/release/util/filter_test.go
rename to pkg/release/v1/util/filter_test.go
index 5d2564619..c8b23d526 100644
--- a/pkg/release/util/filter_test.go
+++ b/pkg/release/v1/util/filter_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util // import "helm.sh/helm/v4/pkg/release/util"
+package util // import "helm.sh/helm/v4/pkg/release/v1/util"
 
 import (
 	"testing"
diff --git a/pkg/release/util/kind_sorter.go b/pkg/release/v1/util/kind_sorter.go
similarity index 100%
rename from pkg/release/util/kind_sorter.go
rename to pkg/release/v1/util/kind_sorter.go
diff --git a/pkg/release/util/kind_sorter_test.go b/pkg/release/v1/util/kind_sorter_test.go
similarity index 100%
rename from pkg/release/util/kind_sorter_test.go
rename to pkg/release/v1/util/kind_sorter_test.go
diff --git a/pkg/release/util/manifest.go b/pkg/release/v1/util/manifest.go
similarity index 100%
rename from pkg/release/util/manifest.go
rename to pkg/release/v1/util/manifest.go
diff --git a/pkg/release/util/manifest_sorter.go b/pkg/release/v1/util/manifest_sorter.go
similarity index 100%
rename from pkg/release/util/manifest_sorter.go
rename to pkg/release/v1/util/manifest_sorter.go
diff --git a/pkg/release/util/manifest_sorter_test.go b/pkg/release/v1/util/manifest_sorter_test.go
similarity index 100%
rename from pkg/release/util/manifest_sorter_test.go
rename to pkg/release/v1/util/manifest_sorter_test.go
diff --git a/pkg/release/util/manifest_test.go b/pkg/release/v1/util/manifest_test.go
similarity index 95%
rename from pkg/release/util/manifest_test.go
rename to pkg/release/v1/util/manifest_test.go
index cfc19563d..754ac1367 100644
--- a/pkg/release/util/manifest_test.go
+++ b/pkg/release/v1/util/manifest_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util // import "helm.sh/helm/v4/pkg/release/util"
+package util // import "helm.sh/helm/v4/pkg/release/v1/util"
 
 import (
 	"reflect"
diff --git a/pkg/release/util/sorter.go b/pkg/release/v1/util/sorter.go
similarity index 96%
rename from pkg/release/util/sorter.go
rename to pkg/release/v1/util/sorter.go
index 1b09d0f3b..3712a58ef 100644
--- a/pkg/release/util/sorter.go
+++ b/pkg/release/v1/util/sorter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util // import "helm.sh/helm/v4/pkg/release/util"
+package util // import "helm.sh/helm/v4/pkg/release/v1/util"
 
 import (
 	"sort"
diff --git a/pkg/release/util/sorter_test.go b/pkg/release/v1/util/sorter_test.go
similarity index 97%
rename from pkg/release/util/sorter_test.go
rename to pkg/release/v1/util/sorter_test.go
index 7ca540441..4628a5192 100644
--- a/pkg/release/util/sorter_test.go
+++ b/pkg/release/v1/util/sorter_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util // import "helm.sh/helm/v4/pkg/release/util"
+package util // import "helm.sh/helm/v4/pkg/release/v1/util"
 
 import (
 	"testing"
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index b43f7c0f2..f086309bb 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -22,8 +22,8 @@ import (
 	"log/slog"
 	"strings"
 
-	relutil "helm.sh/helm/v4/pkg/release/util"
 	rspb "helm.sh/helm/v4/pkg/release/v1"
+	relutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage/driver"
 )
 

From 52267ee74bf642ac3ea84f40ae6796ef9b391aaf Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Sun, 31 Aug 2025 09:04:48 -0400
Subject: [PATCH 183/211] Move repo package to versioned directory

The repo package is internally versioned at v1. Repos were designed
to be versioned. This change moves it to a versioned directory the
same way other packages are now being handled.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 internal/resolver/resolver.go                       |   2 +-
 pkg/action/install.go                               |   2 +-
 pkg/action/pull.go                                  |   2 +-
 pkg/cmd/dependency_build_test.go                    |   4 ++--
 pkg/cmd/dependency_update_test.go                   |   4 ++--
 pkg/cmd/flags.go                                    |   2 +-
 pkg/cmd/install_test.go                             |   2 +-
 pkg/cmd/pull_test.go                                |   2 +-
 pkg/cmd/repo_add.go                                 |   2 +-
 pkg/cmd/repo_add_test.go                            |   4 ++--
 pkg/cmd/repo_index.go                               |   2 +-
 pkg/cmd/repo_index_test.go                          |   2 +-
 pkg/cmd/repo_list.go                                |   2 +-
 pkg/cmd/repo_remove.go                              |   2 +-
 pkg/cmd/repo_remove_test.go                         |   4 ++--
 pkg/cmd/repo_update.go                              |   2 +-
 pkg/cmd/repo_update_test.go                         |   4 ++--
 pkg/cmd/root.go                                     |   2 +-
 pkg/cmd/search/search.go                            |   2 +-
 pkg/cmd/search/search_test.go                       |   2 +-
 pkg/cmd/search_repo.go                              |   2 +-
 pkg/cmd/show_test.go                                |   2 +-
 pkg/downloader/chart_downloader.go                  |   2 +-
 pkg/downloader/chart_downloader_test.go             |   4 ++--
 pkg/downloader/manager.go                           |   2 +-
 pkg/downloader/manager_test.go                      |   4 ++--
 pkg/registry/utils_test.go                          |   2 +-
 pkg/repo/{ => v1}/chartrepo.go                      |   2 +-
 pkg/repo/{ => v1}/chartrepo_test.go                 |   0
 pkg/repo/{ => v1}/doc.go                            |   0
 pkg/repo/{ => v1}/error.go                          |   0
 pkg/repo/{ => v1}/index.go                          |   0
 pkg/repo/{ => v1}/index_test.go                     |   0
 pkg/repo/{ => v1}/repo.go                           |   2 +-
 pkg/repo/{ => v1}/repo_test.go                      |   0
 pkg/repo/{ => v1}/repotest/doc.go                   |   0
 pkg/repo/{ => v1}/repotest/server.go                |   2 +-
 pkg/repo/{ => v1}/repotest/server_test.go           |   6 +++---
 .../repotest/testdata/examplechart-0.1.0.tgz        | Bin
 .../repotest/testdata/examplechart/.helmignore      |   0
 .../repotest/testdata/examplechart/Chart.yaml       |   0
 .../repotest/testdata/examplechart/values.yaml      |   0
 pkg/repo/{ => v1}/repotest/tlsconfig.go             |   0
 pkg/repo/{ => v1}/testdata/chartmuseum-index.yaml   |   0
 .../{ => v1}/testdata/local-index-annotations.yaml  |   0
 .../{ => v1}/testdata/local-index-unordered.yaml    |   0
 pkg/repo/{ => v1}/testdata/local-index.json         |   0
 pkg/repo/{ => v1}/testdata/local-index.yaml         |   0
 pkg/repo/{ => v1}/testdata/old-repositories.yaml    |   0
 pkg/repo/{ => v1}/testdata/repositories.yaml        |   0
 .../{ => v1}/testdata/repository/frobnitz-1.2.3.tgz | Bin
 .../{ => v1}/testdata/repository/sprocket-1.1.0.tgz | Bin
 .../{ => v1}/testdata/repository/sprocket-1.2.0.tgz | Bin
 .../testdata/repository/universe/zarthal-1.0.0.tgz  | Bin
 pkg/repo/{ => v1}/testdata/server/index.yaml        |   0
 pkg/repo/{ => v1}/testdata/server/test.txt          |   0
 56 files changed, 40 insertions(+), 40 deletions(-)
 rename pkg/repo/{ => v1}/chartrepo.go (99%)
 rename pkg/repo/{ => v1}/chartrepo_test.go (100%)
 rename pkg/repo/{ => v1}/doc.go (100%)
 rename pkg/repo/{ => v1}/error.go (100%)
 rename pkg/repo/{ => v1}/index.go (100%)
 rename pkg/repo/{ => v1}/index_test.go (100%)
 rename pkg/repo/{ => v1}/repo.go (98%)
 rename pkg/repo/{ => v1}/repo_test.go (100%)
 rename pkg/repo/{ => v1}/repotest/doc.go (100%)
 rename pkg/repo/{ => v1}/repotest/server.go (99%)
 rename pkg/repo/{ => v1}/repotest/server_test.go (96%)
 rename pkg/repo/{ => v1}/repotest/testdata/examplechart-0.1.0.tgz (100%)
 rename pkg/repo/{ => v1}/repotest/testdata/examplechart/.helmignore (100%)
 rename pkg/repo/{ => v1}/repotest/testdata/examplechart/Chart.yaml (100%)
 rename pkg/repo/{ => v1}/repotest/testdata/examplechart/values.yaml (100%)
 rename pkg/repo/{ => v1}/repotest/tlsconfig.go (100%)
 rename pkg/repo/{ => v1}/testdata/chartmuseum-index.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/local-index-annotations.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/local-index-unordered.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/local-index.json (100%)
 rename pkg/repo/{ => v1}/testdata/local-index.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/old-repositories.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/repositories.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/repository/frobnitz-1.2.3.tgz (100%)
 rename pkg/repo/{ => v1}/testdata/repository/sprocket-1.1.0.tgz (100%)
 rename pkg/repo/{ => v1}/testdata/repository/sprocket-1.2.0.tgz (100%)
 rename pkg/repo/{ => v1}/testdata/repository/universe/zarthal-1.0.0.tgz (100%)
 rename pkg/repo/{ => v1}/testdata/server/index.yaml (100%)
 rename pkg/repo/{ => v1}/testdata/server/test.txt (100%)

diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go
index 13dcd2ce9..3efe94f10 100644
--- a/internal/resolver/resolver.go
+++ b/internal/resolver/resolver.go
@@ -33,7 +33,7 @@ import (
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // Resolver resolves dependencies from semantic version ranges to a particular version.
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 484cdbf8c..b2330d551 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -52,7 +52,7 @@ import (
 	"helm.sh/helm/v4/pkg/registry"
 	release "helm.sh/helm/v4/pkg/release/v1"
 	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
 )
diff --git a/pkg/action/pull.go b/pkg/action/pull.go
index c1f77e44c..be71d0ed0 100644
--- a/pkg/action/pull.go
+++ b/pkg/action/pull.go
@@ -27,7 +27,7 @@ import (
 	"helm.sh/helm/v4/pkg/downloader"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // Pull is the action for checking a given release's information.
diff --git a/pkg/cmd/dependency_build_test.go b/pkg/cmd/dependency_build_test.go
index a4a89b7a9..a3473301d 100644
--- a/pkg/cmd/dependency_build_test.go
+++ b/pkg/cmd/dependency_build_test.go
@@ -24,8 +24,8 @@ import (
 
 	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"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestDependencyBuildCmd(t *testing.T) {
diff --git a/pkg/cmd/dependency_update_test.go b/pkg/cmd/dependency_update_test.go
index f1b39c4b7..3eaa51df1 100644
--- a/pkg/cmd/dependency_update_test.go
+++ b/pkg/cmd/dependency_update_test.go
@@ -29,8 +29,8 @@ import (
 	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"
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestDependencyUpdateCmd(t *testing.T) {
diff --git a/pkg/cmd/flags.go b/pkg/cmd/flags.go
index 98881c795..b20772ef9 100644
--- a/pkg/cmd/flags.go
+++ b/pkg/cmd/flags.go
@@ -37,7 +37,7 @@ import (
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/kube"
 	"helm.sh/helm/v4/pkg/postrenderer"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 const (
diff --git a/pkg/cmd/install_test.go b/pkg/cmd/install_test.go
index 9cd244e84..f0f12e4f7 100644
--- a/pkg/cmd/install_test.go
+++ b/pkg/cmd/install_test.go
@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestInstall(t *testing.T) {
diff --git a/pkg/cmd/pull_test.go b/pkg/cmd/pull_test.go
index c3156c394..c24bf33b7 100644
--- a/pkg/cmd/pull_test.go
+++ b/pkg/cmd/pull_test.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestPullCmd(t *testing.T) {
diff --git a/pkg/cmd/repo_add.go b/pkg/cmd/repo_add.go
index 187234486..00e698daf 100644
--- a/pkg/cmd/repo_add.go
+++ b/pkg/cmd/repo_add.go
@@ -34,7 +34,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/cmd/require"
 	"helm.sh/helm/v4/pkg/getter"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // Repositories that have been permanently deleted and no longer work
diff --git a/pkg/cmd/repo_add_test.go b/pkg/cmd/repo_add_test.go
index aa6c4eaad..6d3696f52 100644
--- a/pkg/cmd/repo_add_test.go
+++ b/pkg/cmd/repo_add_test.go
@@ -31,8 +31,8 @@ import (
 
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/helmpath/xdg"
-	"helm.sh/helm/v4/pkg/repo"
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestRepoAddCmd(t *testing.T) {
diff --git a/pkg/cmd/repo_index.go b/pkg/cmd/repo_index.go
index c17fd9391..ece0ce811 100644
--- a/pkg/cmd/repo_index.go
+++ b/pkg/cmd/repo_index.go
@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/pkg/cmd/require"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 const repoIndexDesc = `
diff --git a/pkg/cmd/repo_index_test.go b/pkg/cmd/repo_index_test.go
index c865c8a5d..c8959f21e 100644
--- a/pkg/cmd/repo_index_test.go
+++ b/pkg/cmd/repo_index_test.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 func TestRepoIndexCmd(t *testing.T) {
diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go
index 70f57992e..10b4442a0 100644
--- a/pkg/cmd/repo_list.go
+++ b/pkg/cmd/repo_list.go
@@ -25,7 +25,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 func newRepoListCmd(out io.Writer) *cobra.Command {
diff --git a/pkg/cmd/repo_remove.go b/pkg/cmd/repo_remove.go
index d0a3aa205..330e69d3a 100644
--- a/pkg/cmd/repo_remove.go
+++ b/pkg/cmd/repo_remove.go
@@ -28,7 +28,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/cmd/require"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 type repoRemoveOptions struct {
diff --git a/pkg/cmd/repo_remove_test.go b/pkg/cmd/repo_remove_test.go
index bd8757812..fce15bb73 100644
--- a/pkg/cmd/repo_remove_test.go
+++ b/pkg/cmd/repo_remove_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/repo"
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestRepoRemove(t *testing.T) {
diff --git a/pkg/cmd/repo_update.go b/pkg/cmd/repo_update.go
index 54318bf29..f2e7c0e0f 100644
--- a/pkg/cmd/repo_update.go
+++ b/pkg/cmd/repo_update.go
@@ -28,7 +28,7 @@ import (
 
 	"helm.sh/helm/v4/pkg/cmd/require"
 	"helm.sh/helm/v4/pkg/getter"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 const updateDesc = `
diff --git a/pkg/cmd/repo_update_test.go b/pkg/cmd/repo_update_test.go
index b0deff1ae..7aa4d414f 100644
--- a/pkg/cmd/repo_update_test.go
+++ b/pkg/cmd/repo_update_test.go
@@ -26,8 +26,8 @@ import (
 
 	"helm.sh/helm/v4/internal/test/ensure"
 	"helm.sh/helm/v4/pkg/getter"
-	"helm.sh/helm/v4/pkg/repo"
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestUpdateCmd(t *testing.T) {
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 836df834d..2c3a2f944 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -40,7 +40,7 @@ import (
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/registry"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 	"helm.sh/helm/v4/pkg/storage/driver"
 )
 
diff --git a/pkg/cmd/search/search.go b/pkg/cmd/search/search.go
index f9e229154..1c7bb1d06 100644
--- a/pkg/cmd/search/search.go
+++ b/pkg/cmd/search/search.go
@@ -31,7 +31,7 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // Result is a search result.
diff --git a/pkg/cmd/search/search_test.go b/pkg/cmd/search/search_test.go
index 7a4ba786b..a24eb1f64 100644
--- a/pkg/cmd/search/search_test.go
+++ b/pkg/cmd/search/search_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 func TestSortScore(t *testing.T) {
diff --git a/pkg/cmd/search_repo.go b/pkg/cmd/search_repo.go
index dffa0d1c4..35608e22e 100644
--- a/pkg/cmd/search_repo.go
+++ b/pkg/cmd/search_repo.go
@@ -34,7 +34,7 @@ import (
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/search"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 const searchRepoDesc = `
diff --git a/pkg/cmd/show_test.go b/pkg/cmd/show_test.go
index 5ccb4bcad..ff3671dbc 100644
--- a/pkg/cmd/show_test.go
+++ b/pkg/cmd/show_test.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestShowPreReleaseChart(t *testing.T) {
diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go
index a24cad3fd..00c8c56e8 100644
--- a/pkg/downloader/chart_downloader.go
+++ b/pkg/downloader/chart_downloader.go
@@ -36,7 +36,7 @@ import (
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/provenance"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // VerificationStrategy describes a strategy for determining whether to verify a chart.
diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go
index 649448fef..4349ecef9 100644
--- a/pkg/downloader/chart_downloader_test.go
+++ b/pkg/downloader/chart_downloader_test.go
@@ -28,8 +28,8 @@ import (
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/repo"
-	"helm.sh/helm/v4/pkg/repo/repotest"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 const (
diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go
index 8b77a77c0..d41b8fdb4 100644
--- a/pkg/downloader/manager.go
+++ b/pkg/downloader/manager.go
@@ -42,7 +42,7 @@ import (
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // ErrRepoNotFound indicates that chart repositories can't be found in local repo cache.
diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index b7121a4ce..9e27f183f 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -32,8 +32,8 @@ import (
 	"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"
+	"helm.sh/helm/v4/pkg/repo/v1"
+	"helm.sh/helm/v4/pkg/repo/v1/repotest"
 )
 
 func TestVersionEquals(t *testing.T) {
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
index b46317fc6..de2f9024f 100644
--- a/pkg/registry/utils_test.go
+++ b/pkg/registry/utils_test.go
@@ -231,7 +231,7 @@ func testPush(suite *TestSuite) {
 	suite.NotNil(err, "error pushing non-chart bytes")
 
 	// Load a test chart
-	chartData, err := os.ReadFile("../repo/repotest/testdata/examplechart-0.1.0.tgz")
+	chartData, err := os.ReadFile("../repo/v1/repotest/testdata/examplechart-0.1.0.tgz")
 	suite.Nil(err, "no error loading test chart")
 	meta, err := extractChartMeta(chartData)
 	suite.Nil(err, "no error extracting chart meta")
diff --git a/pkg/repo/chartrepo.go b/pkg/repo/v1/chartrepo.go
similarity index 99%
rename from pkg/repo/chartrepo.go
rename to pkg/repo/v1/chartrepo.go
index c54197d60..95c04ccef 100644
--- a/pkg/repo/chartrepo.go
+++ b/pkg/repo/v1/chartrepo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repo // import "helm.sh/helm/v4/pkg/repo"
+package repo // import "helm.sh/helm/v4/pkg/repo/v1"
 
 import (
 	"crypto/rand"
diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/v1/chartrepo_test.go
similarity index 100%
rename from pkg/repo/chartrepo_test.go
rename to pkg/repo/v1/chartrepo_test.go
diff --git a/pkg/repo/doc.go b/pkg/repo/v1/doc.go
similarity index 100%
rename from pkg/repo/doc.go
rename to pkg/repo/v1/doc.go
diff --git a/pkg/repo/error.go b/pkg/repo/v1/error.go
similarity index 100%
rename from pkg/repo/error.go
rename to pkg/repo/v1/error.go
diff --git a/pkg/repo/index.go b/pkg/repo/v1/index.go
similarity index 100%
rename from pkg/repo/index.go
rename to pkg/repo/v1/index.go
diff --git a/pkg/repo/index_test.go b/pkg/repo/v1/index_test.go
similarity index 100%
rename from pkg/repo/index_test.go
rename to pkg/repo/v1/index_test.go
diff --git a/pkg/repo/repo.go b/pkg/repo/v1/repo.go
similarity index 98%
rename from pkg/repo/repo.go
rename to pkg/repo/v1/repo.go
index 48c0e0193..38d2b0ca1 100644
--- a/pkg/repo/repo.go
+++ b/pkg/repo/v1/repo.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package repo // import "helm.sh/helm/v4/pkg/repo"
+package repo // import "helm.sh/helm/v4/pkg/repo/v1"
 
 import (
 	"fmt"
diff --git a/pkg/repo/repo_test.go b/pkg/repo/v1/repo_test.go
similarity index 100%
rename from pkg/repo/repo_test.go
rename to pkg/repo/v1/repo_test.go
diff --git a/pkg/repo/repotest/doc.go b/pkg/repo/v1/repotest/doc.go
similarity index 100%
rename from pkg/repo/repotest/doc.go
rename to pkg/repo/v1/repotest/doc.go
diff --git a/pkg/repo/repotest/server.go b/pkg/repo/v1/repotest/server.go
similarity index 99%
rename from pkg/repo/repotest/server.go
rename to pkg/repo/v1/repotest/server.go
index 8f9f82281..12b96de5a 100644
--- a/pkg/repo/repotest/server.go
+++ b/pkg/repo/v1/repotest/server.go
@@ -37,7 +37,7 @@ import (
 	"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"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 func BasicAuthMiddleware(t *testing.T) http.HandlerFunc {
diff --git a/pkg/repo/repotest/server_test.go b/pkg/repo/v1/repotest/server_test.go
similarity index 96%
rename from pkg/repo/repotest/server_test.go
rename to pkg/repo/v1/repotest/server_test.go
index 4d62ef8ed..f0e374fc0 100644
--- a/pkg/repo/repotest/server_test.go
+++ b/pkg/repo/v1/repotest/server_test.go
@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v4/internal/test/ensure"
-	"helm.sh/helm/v4/pkg/repo"
+	"helm.sh/helm/v4/pkg/repo/v1"
 )
 
 // Young'n, in these here parts, we test our tests.
@@ -113,7 +113,7 @@ func TestNewTempServer(t *testing.T) {
 		"tls": {
 			options: []ServerOption{
 				WithChartSourceGlob("testdata/examplechart-0.1.0.tgz"),
-				WithTLSConfig(MakeTestTLSConfig(t, "../../../testdata")),
+				WithTLSConfig(MakeTestTLSConfig(t, "../../../../testdata")),
 			},
 		},
 	}
@@ -212,7 +212,7 @@ func TestNewTempServer_TLS(t *testing.T) {
 	srv := NewTempServer(
 		t,
 		WithChartSourceGlob("testdata/examplechart-0.1.0.tgz"),
-		WithTLSConfig(MakeTestTLSConfig(t, "../../../testdata")),
+		WithTLSConfig(MakeTestTLSConfig(t, "../../../../testdata")),
 	)
 	defer srv.Stop()
 
diff --git a/pkg/repo/repotest/testdata/examplechart-0.1.0.tgz b/pkg/repo/v1/repotest/testdata/examplechart-0.1.0.tgz
similarity index 100%
rename from pkg/repo/repotest/testdata/examplechart-0.1.0.tgz
rename to pkg/repo/v1/repotest/testdata/examplechart-0.1.0.tgz
diff --git a/pkg/repo/repotest/testdata/examplechart/.helmignore b/pkg/repo/v1/repotest/testdata/examplechart/.helmignore
similarity index 100%
rename from pkg/repo/repotest/testdata/examplechart/.helmignore
rename to pkg/repo/v1/repotest/testdata/examplechart/.helmignore
diff --git a/pkg/repo/repotest/testdata/examplechart/Chart.yaml b/pkg/repo/v1/repotest/testdata/examplechart/Chart.yaml
similarity index 100%
rename from pkg/repo/repotest/testdata/examplechart/Chart.yaml
rename to pkg/repo/v1/repotest/testdata/examplechart/Chart.yaml
diff --git a/pkg/repo/repotest/testdata/examplechart/values.yaml b/pkg/repo/v1/repotest/testdata/examplechart/values.yaml
similarity index 100%
rename from pkg/repo/repotest/testdata/examplechart/values.yaml
rename to pkg/repo/v1/repotest/testdata/examplechart/values.yaml
diff --git a/pkg/repo/repotest/tlsconfig.go b/pkg/repo/v1/repotest/tlsconfig.go
similarity index 100%
rename from pkg/repo/repotest/tlsconfig.go
rename to pkg/repo/v1/repotest/tlsconfig.go
diff --git a/pkg/repo/testdata/chartmuseum-index.yaml b/pkg/repo/v1/testdata/chartmuseum-index.yaml
similarity index 100%
rename from pkg/repo/testdata/chartmuseum-index.yaml
rename to pkg/repo/v1/testdata/chartmuseum-index.yaml
diff --git a/pkg/repo/testdata/local-index-annotations.yaml b/pkg/repo/v1/testdata/local-index-annotations.yaml
similarity index 100%
rename from pkg/repo/testdata/local-index-annotations.yaml
rename to pkg/repo/v1/testdata/local-index-annotations.yaml
diff --git a/pkg/repo/testdata/local-index-unordered.yaml b/pkg/repo/v1/testdata/local-index-unordered.yaml
similarity index 100%
rename from pkg/repo/testdata/local-index-unordered.yaml
rename to pkg/repo/v1/testdata/local-index-unordered.yaml
diff --git a/pkg/repo/testdata/local-index.json b/pkg/repo/v1/testdata/local-index.json
similarity index 100%
rename from pkg/repo/testdata/local-index.json
rename to pkg/repo/v1/testdata/local-index.json
diff --git a/pkg/repo/testdata/local-index.yaml b/pkg/repo/v1/testdata/local-index.yaml
similarity index 100%
rename from pkg/repo/testdata/local-index.yaml
rename to pkg/repo/v1/testdata/local-index.yaml
diff --git a/pkg/repo/testdata/old-repositories.yaml b/pkg/repo/v1/testdata/old-repositories.yaml
similarity index 100%
rename from pkg/repo/testdata/old-repositories.yaml
rename to pkg/repo/v1/testdata/old-repositories.yaml
diff --git a/pkg/repo/testdata/repositories.yaml b/pkg/repo/v1/testdata/repositories.yaml
similarity index 100%
rename from pkg/repo/testdata/repositories.yaml
rename to pkg/repo/v1/testdata/repositories.yaml
diff --git a/pkg/repo/testdata/repository/frobnitz-1.2.3.tgz b/pkg/repo/v1/testdata/repository/frobnitz-1.2.3.tgz
similarity index 100%
rename from pkg/repo/testdata/repository/frobnitz-1.2.3.tgz
rename to pkg/repo/v1/testdata/repository/frobnitz-1.2.3.tgz
diff --git a/pkg/repo/testdata/repository/sprocket-1.1.0.tgz b/pkg/repo/v1/testdata/repository/sprocket-1.1.0.tgz
similarity index 100%
rename from pkg/repo/testdata/repository/sprocket-1.1.0.tgz
rename to pkg/repo/v1/testdata/repository/sprocket-1.1.0.tgz
diff --git a/pkg/repo/testdata/repository/sprocket-1.2.0.tgz b/pkg/repo/v1/testdata/repository/sprocket-1.2.0.tgz
similarity index 100%
rename from pkg/repo/testdata/repository/sprocket-1.2.0.tgz
rename to pkg/repo/v1/testdata/repository/sprocket-1.2.0.tgz
diff --git a/pkg/repo/testdata/repository/universe/zarthal-1.0.0.tgz b/pkg/repo/v1/testdata/repository/universe/zarthal-1.0.0.tgz
similarity index 100%
rename from pkg/repo/testdata/repository/universe/zarthal-1.0.0.tgz
rename to pkg/repo/v1/testdata/repository/universe/zarthal-1.0.0.tgz
diff --git a/pkg/repo/testdata/server/index.yaml b/pkg/repo/v1/testdata/server/index.yaml
similarity index 100%
rename from pkg/repo/testdata/server/index.yaml
rename to pkg/repo/v1/testdata/server/index.yaml
diff --git a/pkg/repo/testdata/server/test.txt b/pkg/repo/v1/testdata/server/test.txt
similarity index 100%
rename from pkg/repo/testdata/server/test.txt
rename to pkg/repo/v1/testdata/server/test.txt

From 9dcc49cbd5e37cc916a23a4f375f7f4214dfd515 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Mon, 1 Sep 2025 17:46:14 -0400
Subject: [PATCH 184/211] Move lint pkg to be part of each chart version

Linting is specific to the chart versions. A v2 and v3 chart will
lint differently.

To accomplish this, packages like engine need to be able to handle
different chart versions. This was accomplished by some changes:

1. The introduction of a Charter interface for charts
2. The ChartAccessor which is able to accept a chart and then
   provide access to its data via an interface. There is an
   interface, factory, and implementation for each version of
   chart.
3. Common packages were moved to a common and util packages.
   Due to some package loops, there are 2 packages which may
   get some consolidation in the future.

The new interfaces provide the foundation to move the actions
and cmd packages to be able to handle multiple apiVersions of
charts.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 .golangci.yml                                 |   6 +-
 Makefile                                      |  13 +-
 internal/chart/v3/chart.go                    |  14 +-
 internal/chart/v3/chart_test.go               |  14 +-
 internal/chart/v3/lint/lint.go                |  66 ++
 internal/chart/v3/lint/lint_test.go           | 246 ++++++
 internal/chart/v3/lint/rules/chartfile.go     | 225 ++++++
 .../chart/v3/lint/rules/chartfile_test.go     | 276 +++++++
 internal/chart/v3/lint/rules/crds.go          | 113 +++
 internal/chart/v3/lint/rules/crds_test.go     |  36 +
 internal/chart/v3/lint/rules/dependencies.go  | 101 +++
 .../chart/v3/lint/rules/dependencies_test.go  | 157 ++++
 .../chart/v3}/lint/rules/deprecations.go      |   8 +-
 .../chart/v3/lint/rules/deprecations_test.go  |  41 +
 internal/chart/v3/lint/rules/template.go      | 348 +++++++++
 internal/chart/v3/lint/rules/template_test.go | 441 +++++++++++
 .../lint/rules/testdata/albatross/Chart.yaml  |   5 +
 .../testdata/albatross/templates/_helpers.tpl |   0
 .../testdata/albatross/templates/fail.yaml    |   0
 .../testdata/albatross/templates/svc.yaml     |   0
 .../lint/rules/testdata/albatross/values.yaml |   0
 .../testdata/anotherbadchartfile/Chart.yaml   |  15 +
 .../rules/testdata/badchartfile/Chart.yaml    |   0
 .../rules/testdata/badchartfile/values.yaml   |   0
 .../rules/testdata/badchartname/Chart.yaml    |   5 +
 .../rules/testdata/badchartname/values.yaml   |   0
 .../lint/rules/testdata/badcrdfile/Chart.yaml |   6 +
 .../badcrdfile/crds/bad-apiversion.yaml       |   0
 .../testdata/badcrdfile/crds/bad-crd.yaml     |   0
 .../testdata/badcrdfile/templates/.gitkeep    |   0
 .../rules/testdata/badcrdfile/values.yaml     |   0
 .../rules/testdata/badvaluesfile/Chart.yaml   |   6 +
 .../templates/badvaluesfile.yaml              |   0
 .../rules/testdata/badvaluesfile/values.yaml  |   0
 .../v3/lint/rules/testdata/goodone/Chart.yaml |   5 +
 .../rules/testdata/goodone/crds/test-crd.yaml |   0
 .../testdata/goodone/templates/goodone.yaml   |   0
 .../lint/rules/testdata/goodone/values.yaml   |   0
 .../testdata/invalidchartfile/Chart.yaml      |   0
 .../testdata/invalidchartfile/values.yaml     |   0
 .../rules/testdata/invalidcrdsdir/Chart.yaml  |   6 +
 .../lint/rules/testdata/invalidcrdsdir/crds   |   0
 .../rules/testdata/invalidcrdsdir/values.yaml |   0
 .../testdata/malformed-template/.helmignore   |   0
 .../testdata/malformed-template/Chart.yaml    |  25 +
 .../malformed-template/templates/bad.yaml     |   0
 .../testdata/malformed-template/values.yaml   |   0
 .../testdata/multi-template-fail/Chart.yaml   |  21 +
 .../templates/multi-fail.yaml                 |   0
 .../v3/lint/rules/testdata/v3-fail/Chart.yaml |  21 +
 .../testdata/v3-fail/templates/_helpers.tpl   |   0
 .../v3-fail/templates/deployment.yaml         |   0
 .../testdata/v3-fail/templates/ingress.yaml   |   0
 .../testdata/v3-fail/templates/service.yaml   |   0
 .../lint/rules/testdata/v3-fail/values.yaml   |   0
 .../rules/testdata/withsubchart/Chart.yaml    |  16 +
 .../withsubchart/charts/subchart/Chart.yaml   |   6 +
 .../charts/subchart/templates/subchart.yaml   |   0
 .../withsubchart/charts/subchart/values.yaml  |   0
 .../withsubchart/templates/mainchart.yaml     |   0
 .../rules/testdata/withsubchart/values.yaml   |   0
 internal/chart/v3/lint/rules/values.go        |  79 ++
 .../chart/v3}/lint/rules/values_test.go       |   0
 .../errors_test.go => lint/support/doc.go}    |  26 +-
 .../chart/v3}/lint/support/message.go         |   0
 .../chart/v3}/lint/support/message_test.go    |   0
 internal/chart/v3/loader/load.go              |   9 +-
 internal/chart/v3/loader/load_test.go         |   5 +-
 internal/chart/v3/util/capabilities.go        | 122 ---
 internal/chart/v3/util/capabilities_test.go   |  84 --
 internal/chart/v3/util/coalesce.go            | 308 --------
 internal/chart/v3/util/coalesce_test.go       | 723 ------------------
 internal/chart/v3/util/create.go              |   5 +-
 internal/chart/v3/util/dependencies.go        |  38 +-
 internal/chart/v3/util/dependencies_test.go   |  11 +-
 internal/chart/v3/util/errors.go              |  43 --
 internal/chart/v3/util/jsonschema.go          | 113 ---
 internal/chart/v3/util/jsonschema_test.go     | 247 ------
 internal/chart/v3/util/save.go                |   5 +-
 internal/chart/v3/util/save_test.go           |  11 +-
 internal/chart/v3/util/values.go              | 220 ------
 internal/chart/v3/util/values_test.go         | 293 -------
 pkg/action/action.go                          |  21 +-
 pkg/action/action_test.go                     |  20 +-
 pkg/action/get_values.go                      |   6 +-
 pkg/action/hooks_test.go                      |   9 +-
 pkg/action/install.go                         |  12 +-
 pkg/action/install_test.go                    |   7 +-
 pkg/action/lint.go                            |   9 +-
 pkg/action/show.go                            |   3 +-
 pkg/action/show_test.go                       |   9 +-
 pkg/action/upgrade.go                         |  12 +-
 pkg/chart/common.go                           | 219 ++++++
 pkg/chart/{v2/util => common}/capabilities.go |   2 +-
 .../{v2/util => common}/capabilities_test.go  |   2 +-
 pkg/chart/{v2/util => common}/errors.go       |   2 +-
 pkg/chart/{v2/util => common}/errors_test.go  |   2 +-
 .../chart/v3 => pkg/chart/common}/file.go     |   2 +-
 .../util => common}/testdata/coleridge.yaml   |   0
 pkg/chart/{v2 => common}/util/coalesce.go     |  80 +-
 .../{v2 => common}/util/coalesce_test.go      |  18 +-
 pkg/chart/{v2 => common}/util/jsonschema.go   |  21 +-
 .../{v2 => common}/util/jsonschema_test.go    |   7 +-
 .../testdata/test-values-invalid.schema.json  |   0
 .../util/testdata/test-values-negative.yaml   |   0
 .../util/testdata/test-values.schema.json     |   0
 .../util/testdata/test-values.yaml            |   0
 pkg/chart/common/util/values.go               |  70 ++
 pkg/chart/common/util/values_test.go          | 111 +++
 pkg/chart/{v2/util => common}/values.go       |  47 +-
 pkg/chart/{v2/util => common}/values_test.go  |  90 +--
 pkg/chart/{v2/file.go => interfaces.go}       |  28 +-
 pkg/chart/v2/chart.go                         |  14 +-
 pkg/chart/v2/chart_test.go                    |  14 +-
 pkg/{ => chart/v2}/lint/lint.go               |  12 +-
 pkg/{ => chart/v2}/lint/lint_test.go          |   2 +-
 pkg/{ => chart/v2}/lint/rules/chartfile.go    |   4 +-
 .../v2}/lint/rules/chartfile_test.go          |   2 +-
 pkg/{ => chart/v2}/lint/rules/crds.go         |   2 +-
 pkg/{ => chart/v2}/lint/rules/crds_test.go    |   2 +-
 pkg/{ => chart/v2}/lint/rules/dependencies.go |   4 +-
 .../v2}/lint/rules/dependencies_test.go       |   2 +-
 pkg/chart/v2/lint/rules/deprecations.go       | 106 +++
 .../v2}/lint/rules/deprecations_test.go       |   2 +-
 pkg/{ => chart/v2}/lint/rules/template.go     |  16 +-
 .../v2}/lint/rules/template_test.go           |   9 +-
 .../lint/rules/testdata/albatross/Chart.yaml  |   0
 .../testdata/albatross/templates/_helpers.tpl |  16 +
 .../testdata/albatross/templates/fail.yaml    |   1 +
 .../testdata/albatross/templates/svc.yaml     |  19 +
 .../lint/rules/testdata/albatross/values.yaml |   1 +
 .../testdata/anotherbadchartfile/Chart.yaml   |   0
 .../rules/testdata/badchartfile/Chart.yaml    |  11 +
 .../rules/testdata/badchartfile/values.yaml   |   1 +
 .../rules/testdata/badchartname/Chart.yaml    |   0
 .../rules/testdata/badchartname/values.yaml   |   1 +
 .../lint/rules/testdata/badcrdfile/Chart.yaml |   0
 .../badcrdfile/crds/bad-apiversion.yaml       |   2 +
 .../testdata/badcrdfile/crds/bad-crd.yaml     |   2 +
 .../testdata/badcrdfile/templates/.gitkeep    |   0
 .../rules/testdata/badcrdfile/values.yaml     |   1 +
 .../rules/testdata/badvaluesfile/Chart.yaml   |   0
 .../templates/badvaluesfile.yaml              |   2 +
 .../rules/testdata/badvaluesfile/values.yaml  |   2 +
 .../lint/rules/testdata/goodone/Chart.yaml    |   0
 .../rules/testdata/goodone/crds/test-crd.yaml |  19 +
 .../testdata/goodone/templates/goodone.yaml   |   2 +
 .../lint/rules/testdata/goodone/values.yaml   |   1 +
 .../testdata/invalidchartfile/Chart.yaml      |   6 +
 .../testdata/invalidchartfile/values.yaml     |   0
 .../rules/testdata/invalidcrdsdir/Chart.yaml  |   0
 .../lint/rules/testdata/invalidcrdsdir/crds   |   0
 .../rules/testdata/invalidcrdsdir/values.yaml |   1 +
 .../testdata/malformed-template/.helmignore   |  23 +
 .../testdata/malformed-template/Chart.yaml    |   0
 .../malformed-template/templates/bad.yaml     |   1 +
 .../testdata/malformed-template/values.yaml   |  82 ++
 .../testdata/multi-template-fail/Chart.yaml   |   0
 .../templates/multi-fail.yaml                 |  13 +
 .../lint/rules/testdata/v3-fail/Chart.yaml    |   0
 .../testdata/v3-fail/templates/_helpers.tpl   |  63 ++
 .../v3-fail/templates/deployment.yaml         |  56 ++
 .../testdata/v3-fail/templates/ingress.yaml   |  62 ++
 .../testdata/v3-fail/templates/service.yaml   |  17 +
 .../lint/rules/testdata/v3-fail/values.yaml   |  66 ++
 .../rules/testdata/withsubchart/Chart.yaml    |   0
 .../withsubchart/charts/subchart/Chart.yaml   |   0
 .../charts/subchart/templates/subchart.yaml   |   2 +
 .../withsubchart/charts/subchart/values.yaml  |   2 +
 .../withsubchart/templates/mainchart.yaml     |   2 +
 .../rules/testdata/withsubchart/values.yaml   |   0
 pkg/{ => chart/v2}/lint/rules/values.go       |  13 +-
 pkg/chart/v2/lint/rules/values_test.go        | 169 ++++
 pkg/{ => chart/v2}/lint/support/doc.go        |   2 +-
 pkg/chart/v2/lint/support/message.go          |  76 ++
 pkg/chart/v2/lint/support/message_test.go     |  79 ++
 pkg/chart/v2/loader/load.go                   |  13 +-
 pkg/chart/v2/loader/load_test.go              |   5 +-
 pkg/chart/v2/util/create.go                   |   5 +-
 pkg/chart/v2/util/dependencies.go             |  38 +-
 pkg/chart/v2/util/dependencies_test.go        |  11 +-
 pkg/chart/v2/util/save.go                     |   5 +-
 pkg/chart/v2/util/save_test.go                |  11 +-
 pkg/cli/values/options_test.go                |   2 +-
 pkg/cmd/helpers_test.go                       |   4 +-
 pkg/cmd/lint.go                               |   6 +-
 pkg/cmd/status.go                             |   4 +-
 pkg/cmd/template.go                           |   6 +-
 pkg/cmd/upgrade_test.go                       |   5 +-
 pkg/engine/engine.go                          |  61 +-
 pkg/engine/engine_test.go                     | 203 ++---
 pkg/engine/files.go                           |   4 +-
 pkg/engine/lookup_func.go                     |   2 +-
 pkg/release/v1/mock.go                        |   3 +-
 pkg/release/v1/util/manifest_sorter.go        |   4 +-
 195 files changed, 4090 insertions(+), 2702 deletions(-)
 create mode 100644 internal/chart/v3/lint/lint.go
 create mode 100644 internal/chart/v3/lint/lint_test.go
 create mode 100644 internal/chart/v3/lint/rules/chartfile.go
 create mode 100644 internal/chart/v3/lint/rules/chartfile_test.go
 create mode 100644 internal/chart/v3/lint/rules/crds.go
 create mode 100644 internal/chart/v3/lint/rules/crds_test.go
 create mode 100644 internal/chart/v3/lint/rules/dependencies.go
 create mode 100644 internal/chart/v3/lint/rules/dependencies_test.go
 rename {pkg => internal/chart/v3}/lint/rules/deprecations.go (95%)
 create mode 100644 internal/chart/v3/lint/rules/deprecations_test.go
 create mode 100644 internal/chart/v3/lint/rules/template.go
 create mode 100644 internal/chart/v3/lint/rules/template_test.go
 create mode 100644 internal/chart/v3/lint/rules/testdata/albatross/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/albatross/templates/_helpers.tpl (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/albatross/templates/fail.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/albatross/templates/svc.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/albatross/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/anotherbadchartfile/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badchartfile/Chart.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badchartfile/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/badchartname/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badchartname/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/badcrdfile/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badcrdfile/templates/.gitkeep (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badcrdfile/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/badvaluesfile/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/badvaluesfile/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/goodone/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/goodone/crds/test-crd.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/goodone/templates/goodone.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/goodone/values.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/invalidchartfile/Chart.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/invalidchartfile/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/invalidcrdsdir/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/invalidcrdsdir/crds (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/invalidcrdsdir/values.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/malformed-template/.helmignore (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/malformed-template/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/malformed-template/templates/bad.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/malformed-template/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/multi-template-fail/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/v3-fail/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/v3-fail/templates/_helpers.tpl (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/v3-fail/templates/deployment.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/v3-fail/templates/ingress.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/v3-fail/templates/service.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/v3-fail/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/testdata/withsubchart/Chart.yaml
 create mode 100644 internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
 rename {pkg => internal/chart/v3}/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/withsubchart/charts/subchart/values.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/withsubchart/templates/mainchart.yaml (100%)
 rename {pkg => internal/chart/v3}/lint/rules/testdata/withsubchart/values.yaml (100%)
 create mode 100644 internal/chart/v3/lint/rules/values.go
 rename {pkg => internal/chart/v3}/lint/rules/values_test.go (100%)
 rename internal/chart/v3/{util/errors_test.go => lint/support/doc.go} (67%)
 rename {pkg => internal/chart/v3}/lint/support/message.go (100%)
 rename {pkg => internal/chart/v3}/lint/support/message_test.go (100%)
 delete mode 100644 internal/chart/v3/util/capabilities.go
 delete mode 100644 internal/chart/v3/util/capabilities_test.go
 delete mode 100644 internal/chart/v3/util/coalesce.go
 delete mode 100644 internal/chart/v3/util/coalesce_test.go
 delete mode 100644 internal/chart/v3/util/errors.go
 delete mode 100644 internal/chart/v3/util/jsonschema.go
 delete mode 100644 internal/chart/v3/util/jsonschema_test.go
 delete mode 100644 internal/chart/v3/util/values.go
 delete mode 100644 internal/chart/v3/util/values_test.go
 create mode 100644 pkg/chart/common.go
 rename pkg/chart/{v2/util => common}/capabilities.go (99%)
 rename pkg/chart/{v2/util => common}/capabilities_test.go (99%)
 rename pkg/chart/{v2/util => common}/errors.go (98%)
 rename pkg/chart/{v2/util => common}/errors_test.go (98%)
 rename {internal/chart/v3 => pkg/chart/common}/file.go (98%)
 rename pkg/chart/{v2/util => common}/testdata/coleridge.yaml (100%)
 rename pkg/chart/{v2 => common}/util/coalesce.go (81%)
 rename pkg/chart/{v2 => common}/util/coalesce_test.go (97%)
 rename pkg/chart/{v2 => common}/util/jsonschema.go (89%)
 rename pkg/chart/{v2 => common}/util/jsonschema_test.go (96%)
 rename pkg/chart/{v2 => common}/util/testdata/test-values-invalid.schema.json (100%)
 rename pkg/chart/{v2 => common}/util/testdata/test-values-negative.yaml (100%)
 rename pkg/chart/{v2 => common}/util/testdata/test-values.schema.json (100%)
 rename pkg/chart/{v2 => common}/util/testdata/test-values.yaml (100%)
 create mode 100644 pkg/chart/common/util/values.go
 create mode 100644 pkg/chart/common/util/values_test.go
 rename pkg/chart/{v2/util => common}/values.go (74%)
 rename pkg/chart/{v2/util => common}/values_test.go (66%)
 rename pkg/chart/{v2/file.go => interfaces.go} (60%)
 rename pkg/{ => chart/v2}/lint/lint.go (83%)
 rename pkg/{ => chart/v2}/lint/lint_test.go (99%)
 rename pkg/{ => chart/v2}/lint/rules/chartfile.go (98%)
 rename pkg/{ => chart/v2}/lint/rules/chartfile_test.go (99%)
 rename pkg/{ => chart/v2}/lint/rules/crds.go (98%)
 rename pkg/{ => chart/v2}/lint/rules/crds_test.go (95%)
 rename pkg/{ => chart/v2}/lint/rules/dependencies.go (96%)
 rename pkg/{ => chart/v2}/lint/rules/dependencies_test.go (98%)
 create mode 100644 pkg/chart/v2/lint/rules/deprecations.go
 rename pkg/{ => chart/v2}/lint/rules/deprecations_test.go (94%)
 rename pkg/{ => chart/v2}/lint/rules/template.go (95%)
 rename pkg/{ => chart/v2}/lint/rules/template_test.go (98%)
 rename pkg/{ => chart/v2}/lint/rules/testdata/albatross/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/albatross/templates/_helpers.tpl
 create mode 100644 pkg/chart/v2/lint/rules/testdata/albatross/templates/fail.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/albatross/templates/svc.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/albatross/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/anotherbadchartfile/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badchartfile/Chart.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badchartfile/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/badchartname/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badchartname/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/badcrdfile/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badcrdfile/templates/.gitkeep
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badcrdfile/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/badvaluesfile/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/badvaluesfile/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/goodone/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/goodone/crds/test-crd.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/goodone/templates/goodone.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/goodone/values.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/invalidchartfile/Chart.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/invalidchartfile/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/invalidcrdsdir/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/crds
 create mode 100644 pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/values.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/malformed-template/.helmignore
 rename pkg/{ => chart/v2}/lint/rules/testdata/malformed-template/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/malformed-template/templates/bad.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/multi-template-fail/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/v3-fail/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/v3-fail/templates/_helpers.tpl
 create mode 100644 pkg/chart/v2/lint/rules/testdata/v3-fail/templates/deployment.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/v3-fail/templates/ingress.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/v3-fail/templates/service.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/testdata/withsubchart/Chart.yaml (100%)
 rename pkg/{ => chart/v2}/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml (100%)
 create mode 100644 pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/withsubchart/templates/mainchart.yaml
 create mode 100644 pkg/chart/v2/lint/rules/testdata/withsubchart/values.yaml
 rename pkg/{ => chart/v2}/lint/rules/values.go (84%)
 create mode 100644 pkg/chart/v2/lint/rules/values_test.go
 rename pkg/{ => chart/v2}/lint/support/doc.go (91%)
 create mode 100644 pkg/chart/v2/lint/support/message.go
 create mode 100644 pkg/chart/v2/lint/support/message_test.go

diff --git a/.golangci.yml b/.golangci.yml
index a9b13c35f..3df31b997 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -33,6 +33,7 @@ linters:
     - usetesting
 
   exclusions:
+  
     generated: lax
 
     presets:
@@ -41,7 +42,10 @@ linters:
       - legacy
       - std-error-handling
 
-    rules: []
+    rules:
+      - linters:
+          - revive
+        text: 'var-naming: avoid meaningless package names'
 
     warn-unused: true
 
diff --git a/Makefile b/Makefile
index 5e424bf05..5e1bfc6c2 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,12 @@ K8S_MODULES_VER=$(subst ., ,$(subst v,,$(shell go list -f '{{.Version}}' -m k8s.
 K8S_MODULES_MAJOR_VER=$(shell echo $$(($(firstword $(K8S_MODULES_VER)) + 1)))
 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/v2/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
-LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
+LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
 
 .PHONY: all
 all: build
@@ -112,7 +114,8 @@ test-unit:
 # based on older versions, this is run separately. When run without the ldflags in the unit test (above) or coverage
 # test, it still passes with a false-positive result as the resources shouldn’t be deprecated in the older Kubernetes
 # version if it only starts failing with the latest.
-	go test $(GOFLAGS) -run ^TestHelmCreateChart_CheckDeprecatedWarnings$$ ./pkg/lint/ $(TESTFLAGS) -ldflags '$(LDFLAGS)'
+	go test $(GOFLAGS) -run ^TestHelmCreateChart_CheckDeprecatedWarnings$$ ./pkg/chart/v2/lint/ $(TESTFLAGS) -ldflags '$(LDFLAGS)'
+	go test $(GOFLAGS) -run ^TestHelmCreateChart_CheckDeprecatedWarnings$$ ./internal/chart/v3/lint/ $(TESTFLAGS) -ldflags '$(LDFLAGS)'
 
 
 .PHONY: test-coverage
diff --git a/internal/chart/v3/chart.go b/internal/chart/v3/chart.go
index 4d59fa5ec..2edc6c339 100644
--- a/internal/chart/v3/chart.go
+++ b/internal/chart/v3/chart.go
@@ -19,6 +19,8 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // APIVersionV3 is the API version number for version 3.
@@ -34,20 +36,20 @@ type Chart struct {
 	//
 	// This should not be used except in special cases like `helm show values`,
 	// where we want to display the raw values, comments and all.
-	Raw []*File `json:"-"`
+	Raw []*common.File `json:"-"`
 	// Metadata is the contents of the Chartfile.
 	Metadata *Metadata `json:"metadata"`
 	// Lock is the contents of Chart.lock.
 	Lock *Lock `json:"lock"`
 	// Templates for this chart.
-	Templates []*File `json:"templates"`
+	Templates []*common.File `json:"templates"`
 	// Values are default config for this chart.
 	Values map[string]interface{} `json:"values"`
 	// Schema is an optional JSON schema for imposing structure on Values
 	Schema []byte `json:"schema"`
 	// Files are miscellaneous files in a chart archive,
 	// e.g. README, LICENSE, etc.
-	Files []*File `json:"files"`
+	Files []*common.File `json:"files"`
 
 	parent       *Chart
 	dependencies []*Chart
@@ -59,7 +61,7 @@ type CRD struct {
 	// Filename is the File obj Name including (sub-)chart.ChartFullPath
 	Filename string
 	// File is the File obj for the crd
-	File *File
+	File *common.File
 }
 
 // SetDependencies replaces the chart dependencies.
@@ -134,8 +136,8 @@ func (ch *Chart) AppVersion() string {
 
 // CRDs returns a list of File objects in the 'crds/' directory of a Helm chart.
 // Deprecated: use CRDObjects()
-func (ch *Chart) CRDs() []*File {
-	files := []*File{}
+func (ch *Chart) CRDs() []*common.File {
+	files := []*common.File{}
 	// Find all resources in the crds/ directory
 	for _, f := range ch.Files {
 		if strings.HasPrefix(f.Name, "crds/") && hasManifestExtension(f.Name) {
diff --git a/internal/chart/v3/chart_test.go b/internal/chart/v3/chart_test.go
index f93b3356b..b1820ac0a 100644
--- a/internal/chart/v3/chart_test.go
+++ b/internal/chart/v3/chart_test.go
@@ -20,11 +20,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func TestCRDs(t *testing.T) {
 	chrt := Chart{
-		Files: []*File{
+		Files: []*common.File{
 			{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
@@ -57,7 +59,7 @@ func TestCRDs(t *testing.T) {
 
 func TestSaveChartNoRawData(t *testing.T) {
 	chrt := Chart{
-		Raw: []*File{
+		Raw: []*common.File{
 			{
 				Name: "fhqwhgads.yaml",
 				Data: []byte("Everybody to the Limit"),
@@ -76,7 +78,7 @@ func TestSaveChartNoRawData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	is.Equal([]*File(nil), res.Raw)
+	is.Equal([]*common.File(nil), res.Raw)
 }
 
 func TestMetadata(t *testing.T) {
@@ -162,7 +164,7 @@ func TestChartFullPath(t *testing.T) {
 
 func TestCRDObjects(t *testing.T) {
 	chrt := Chart{
-		Files: []*File{
+		Files: []*common.File{
 			{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
@@ -190,7 +192,7 @@ func TestCRDObjects(t *testing.T) {
 		{
 			Name:     "crds/foo.yaml",
 			Filename: "crds/foo.yaml",
-			File: &File{
+			File: &common.File{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
 			},
@@ -198,7 +200,7 @@ func TestCRDObjects(t *testing.T) {
 		{
 			Name:     "crds/foo/bar/baz.yaml",
 			Filename: "crds/foo/bar/baz.yaml",
-			File: &File{
+			File: &common.File{
 				Name: "crds/foo/bar/baz.yaml",
 				Data: []byte("hello"),
 			},
diff --git a/internal/chart/v3/lint/lint.go b/internal/chart/v3/lint/lint.go
new file mode 100644
index 000000000..231bb6803
--- /dev/null
+++ b/internal/chart/v3/lint/lint.go
@@ -0,0 +1,66 @@
+/*
+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 lint // import "helm.sh/helm/v4/internal/chart/v3/lint"
+
+import (
+	"path/filepath"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/rules"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	"helm.sh/helm/v4/pkg/chart/common"
+)
+
+type linterOptions struct {
+	KubeVersion          *common.KubeVersion
+	SkipSchemaValidation bool
+}
+
+type LinterOption func(lo *linterOptions)
+
+func WithKubeVersion(kubeVersion *common.KubeVersion) LinterOption {
+	return func(lo *linterOptions) {
+		lo.KubeVersion = kubeVersion
+	}
+}
+
+func WithSkipSchemaValidation(skipSchemaValidation bool) LinterOption {
+	return func(lo *linterOptions) {
+		lo.SkipSchemaValidation = skipSchemaValidation
+	}
+}
+
+func RunAll(baseDir string, values map[string]interface{}, namespace string, options ...LinterOption) support.Linter {
+
+	chartDir, _ := filepath.Abs(baseDir)
+
+	lo := linterOptions{}
+	for _, option := range options {
+		option(&lo)
+	}
+
+	result := support.Linter{
+		ChartDir: chartDir,
+	}
+
+	rules.Chartfile(&result)
+	rules.ValuesWithOverrides(&result, values)
+	rules.TemplatesWithSkipSchemaValidation(&result, values, namespace, lo.KubeVersion, lo.SkipSchemaValidation)
+	rules.Dependencies(&result)
+	rules.Crds(&result)
+
+	return result
+}
diff --git a/internal/chart/v3/lint/lint_test.go b/internal/chart/v3/lint/lint_test.go
new file mode 100644
index 000000000..af44cc58d
--- /dev/null
+++ b/internal/chart/v3/lint/lint_test.go
@@ -0,0 +1,246 @@
+/*
+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 lint
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+)
+
+var values map[string]interface{}
+
+const namespace = "testNamespace"
+
+const badChartDir = "rules/testdata/badchartfile"
+const badValuesFileDir = "rules/testdata/badvaluesfile"
+const badYamlFileDir = "rules/testdata/albatross"
+const badCrdFileDir = "rules/testdata/badcrdfile"
+const goodChartDir = "rules/testdata/goodone"
+const subChartValuesDir = "rules/testdata/withsubchart"
+const malformedTemplate = "rules/testdata/malformed-template"
+const invalidChartFileDir = "rules/testdata/invalidchartfile"
+
+func TestBadChartV3(t *testing.T) {
+	m := RunAll(badChartDir, values, namespace).Messages
+	if len(m) != 8 {
+		t.Errorf("Number of errors %v", len(m))
+		t.Errorf("All didn't fail with expected errors, got %#v", m)
+	}
+	// There should be one INFO, one WARNING, and 2 ERROR messages, check for them
+	var i, w, e, e2, e3, e4, e5, e6 bool
+	for _, msg := range m {
+		if msg.Severity == support.InfoSev {
+			if strings.Contains(msg.Err.Error(), "icon is recommended") {
+				i = true
+			}
+		}
+		if msg.Severity == support.WarningSev {
+			if strings.Contains(msg.Err.Error(), "does not exist") {
+				w = true
+			}
+		}
+		if msg.Severity == support.ErrorSev {
+			if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVer") {
+				e = true
+			}
+			if strings.Contains(msg.Err.Error(), "name is required") {
+				e2 = true
+			}
+
+			if strings.Contains(msg.Err.Error(), "apiVersion is required. The value must be \"v3\"") {
+				e3 = true
+			}
+
+			if strings.Contains(msg.Err.Error(), "chart type is not valid in apiVersion") {
+				e4 = true
+			}
+
+			if strings.Contains(msg.Err.Error(), "dependencies are not valid in the Chart file with apiVersion") {
+				e5 = true
+			}
+			// This comes from the dependency check, which loads dependency info from the Chart.yaml
+			if strings.Contains(msg.Err.Error(), "unable to load chart") {
+				e6 = true
+			}
+		}
+	}
+	if !e || !e2 || !e3 || !e4 || !e5 || !i || !e6 || !w {
+		t.Errorf("Didn't find all the expected errors, got %#v", m)
+	}
+}
+
+func TestInvalidYaml(t *testing.T) {
+	m := RunAll(badYamlFileDir, values, namespace).Messages
+	if len(m) != 1 {
+		t.Fatalf("All didn't fail with expected errors, got %#v", m)
+	}
+	if !strings.Contains(m[0].Err.Error(), "deliberateSyntaxError") {
+		t.Errorf("All didn't have the error for deliberateSyntaxError")
+	}
+}
+
+func TestInvalidChartYamlV3(t *testing.T) {
+	m := RunAll(invalidChartFileDir, values, namespace).Messages
+	t.Log(m)
+	if len(m) != 3 {
+		t.Fatalf("All didn't fail with expected errors, got %#v", m)
+	}
+	if !strings.Contains(m[0].Err.Error(), "failed to strictly parse chart metadata file") {
+		t.Errorf("All didn't have the error for duplicate YAML keys")
+	}
+}
+
+func TestBadValuesV3(t *testing.T) {
+	m := RunAll(badValuesFileDir, values, namespace).Messages
+	if len(m) < 1 {
+		t.Fatalf("All didn't fail with expected errors, got %#v", m)
+	}
+	if !strings.Contains(m[0].Err.Error(), "unable to parse YAML") {
+		t.Errorf("All didn't have the error for invalid key format: %s", m[0].Err)
+	}
+}
+
+func TestBadCrdFileV3(t *testing.T) {
+	m := RunAll(badCrdFileDir, values, namespace).Messages
+	assert.Lenf(t, m, 2, "All didn't fail with expected errors, got %#v", m)
+	assert.ErrorContains(t, m[0].Err, "apiVersion is not in 'apiextensions.k8s.io'")
+	assert.ErrorContains(t, m[1].Err, "object kind is not 'CustomResourceDefinition'")
+}
+
+func TestGoodChart(t *testing.T) {
+	m := RunAll(goodChartDir, values, namespace).Messages
+	if len(m) != 0 {
+		t.Error("All returned linter messages when it shouldn't have")
+		for i, msg := range m {
+			t.Logf("Message %d: %s", i, msg)
+		}
+	}
+}
+
+// TestHelmCreateChart tests that a `helm create` always passes a `helm lint` test.
+//
+// See https://github.com/helm/helm/issues/7923
+func TestHelmCreateChart(t *testing.T) {
+	dir := t.TempDir()
+
+	createdChart, err := chartutil.Create("testhelmcreatepasseslint", dir)
+	if err != nil {
+		t.Error(err)
+		// Fatal is bad because of the defer.
+		return
+	}
+
+	// Note: we test with strict=true here, even though others have
+	// strict = false.
+	m := RunAll(createdChart, values, namespace, WithSkipSchemaValidation(true)).Messages
+	if ll := len(m); ll != 1 {
+		t.Errorf("All should have had exactly 1 error. Got %d", ll)
+		for i, msg := range m {
+			t.Logf("Message %d: %s", i, msg.Error())
+		}
+	} else if msg := m[0].Err.Error(); !strings.Contains(msg, "icon is recommended") {
+		t.Errorf("Unexpected lint error: %s", msg)
+	}
+}
+
+// TestHelmCreateChart_CheckDeprecatedWarnings checks if any default template created by `helm create` throws
+// deprecated warnings in the linter check against the current Kubernetes version (provided using ldflags).
+//
+// See https://github.com/helm/helm/issues/11495
+//
+// Resources like hpa and ingress, which are disabled by default in values.yaml are enabled here using the equivalent
+// of the `--set` flag.
+//
+// Note: This test requires the following ldflags to be set per the current Kubernetes version to avoid false-positive
+// results.
+// 1. -X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMajor=<k8s-major-version>
+// 2. -X helm.sh/helm/v4/pkg/lint/rules.k8sVersionMinor=<k8s-minor-version>
+// or directly use '$(LDFLAGS)' in Makefile.
+//
+// When run without ldflags, the test passes giving a false-positive result. This is because the variables
+// `k8sVersionMajor` and `k8sVersionMinor` by default are set to an older version of Kubernetes, with which, there
+// might not be the deprecation warning.
+func TestHelmCreateChart_CheckDeprecatedWarnings(t *testing.T) {
+	createdChart, err := chartutil.Create("checkdeprecatedwarnings", t.TempDir())
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	// Add values to enable hpa, and ingress which are disabled by default.
+	// This is the equivalent of:
+	//   helm lint checkdeprecatedwarnings --set 'autoscaling.enabled=true,ingress.enabled=true'
+	updatedValues := map[string]interface{}{
+		"autoscaling": map[string]interface{}{
+			"enabled": true,
+		},
+		"ingress": map[string]interface{}{
+			"enabled": true,
+		},
+	}
+
+	linterRunDetails := RunAll(createdChart, updatedValues, namespace, WithSkipSchemaValidation(true))
+	for _, msg := range linterRunDetails.Messages {
+		if strings.HasPrefix(msg.Error(), "[WARNING]") &&
+			strings.Contains(msg.Error(), "deprecated") {
+			// When there is a deprecation warning for an object created
+			// by `helm create` for the current Kubernetes version, fail.
+			t.Errorf("Unexpected deprecation warning for %q: %s", msg.Path, msg.Error())
+		}
+	}
+}
+
+// lint ignores import-values
+// See https://github.com/helm/helm/issues/9658
+func TestSubChartValuesChart(t *testing.T) {
+	m := RunAll(subChartValuesDir, values, namespace).Messages
+	if len(m) != 0 {
+		t.Error("All returned linter messages when it shouldn't have")
+		for i, msg := range m {
+			t.Logf("Message %d: %s", i, msg)
+		}
+	}
+}
+
+// lint stuck with malformed template object
+// See https://github.com/helm/helm/issues/11391
+func TestMalformedTemplate(t *testing.T) {
+	c := time.After(3 * time.Second)
+	ch := make(chan int, 1)
+	var m []support.Message
+	go func() {
+		m = RunAll(malformedTemplate, values, namespace).Messages
+		ch <- 1
+	}()
+	select {
+	case <-c:
+		t.Fatalf("lint malformed template timeout")
+	case <-ch:
+		if len(m) != 1 {
+			t.Fatalf("All didn't fail with expected errors, got %#v", m)
+		}
+		if !strings.Contains(m[0].Err.Error(), "invalid character '{'") {
+			t.Errorf("All didn't have the error for invalid character '{'")
+		}
+	}
+}
diff --git a/internal/chart/v3/lint/rules/chartfile.go b/internal/chart/v3/lint/rules/chartfile.go
new file mode 100644
index 000000000..e72a0d3b2
--- /dev/null
+++ b/internal/chart/v3/lint/rules/chartfile.go
@@ -0,0 +1,225 @@
+/*
+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 rules // import "helm.sh/helm/v4/internal/chart/v3/lint/rules"
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/Masterminds/semver/v3"
+	"github.com/asaskevich/govalidator"
+	"sigs.k8s.io/yaml"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+)
+
+// Chartfile runs a set of linter rules related to Chart.yaml file
+func Chartfile(linter *support.Linter) {
+	chartFileName := "Chart.yaml"
+	chartPath := filepath.Join(linter.ChartDir, chartFileName)
+
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartYamlNotDirectory(chartPath))
+
+	chartFile, err := chartutil.LoadChartfile(chartPath)
+	validChartFile := linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartYamlFormat(err))
+
+	// Guard clause. Following linter rules require a parsable ChartFile
+	if !validChartFile {
+		return
+	}
+
+	_, err = chartutil.StrictLoadChartfile(chartPath)
+	linter.RunLinterRule(support.WarningSev, chartFileName, validateChartYamlStrictFormat(err))
+
+	// type check for Chart.yaml . ignoring error as any parse
+	// errors would already be caught in the above load function
+	chartFileForTypeCheck, _ := loadChartFileForTypeCheck(chartPath)
+
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartName(chartFile))
+
+	// Chart metadata
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartAPIVersion(chartFile))
+
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartVersionType(chartFileForTypeCheck))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartVersion(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartAppVersionType(chartFileForTypeCheck))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartMaintainer(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartSources(chartFile))
+	linter.RunLinterRule(support.InfoSev, chartFileName, validateChartIconPresence(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartIconURL(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartType(chartFile))
+	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartDependencies(chartFile))
+}
+
+func validateChartVersionType(data map[string]interface{}) error {
+	return isStringValue(data, "version")
+}
+
+func validateChartAppVersionType(data map[string]interface{}) error {
+	return isStringValue(data, "appVersion")
+}
+
+func isStringValue(data map[string]interface{}, key string) error {
+	value, ok := data[key]
+	if !ok {
+		return nil
+	}
+	valueType := fmt.Sprintf("%T", value)
+	if valueType != "string" {
+		return fmt.Errorf("%s should be of type string but it's of type %s", key, valueType)
+	}
+	return nil
+}
+
+func validateChartYamlNotDirectory(chartPath string) error {
+	fi, err := os.Stat(chartPath)
+
+	if err == nil && fi.IsDir() {
+		return errors.New("should be a file, not a directory")
+	}
+	return nil
+}
+
+func validateChartYamlFormat(chartFileError error) error {
+	if chartFileError != nil {
+		return fmt.Errorf("unable to parse YAML\n\t%w", chartFileError)
+	}
+	return nil
+}
+
+func validateChartYamlStrictFormat(chartFileError error) error {
+	if chartFileError != nil {
+		return fmt.Errorf("failed to strictly parse chart metadata file\n\t%w", chartFileError)
+	}
+	return nil
+}
+
+func validateChartName(cf *chart.Metadata) error {
+	if cf.Name == "" {
+		return errors.New("name is required")
+	}
+	name := filepath.Base(cf.Name)
+	if name != cf.Name {
+		return fmt.Errorf("chart name %q is invalid", cf.Name)
+	}
+	return nil
+}
+
+func validateChartAPIVersion(cf *chart.Metadata) error {
+	if cf.APIVersion == "" {
+		return errors.New("apiVersion is required. The value must be \"v3\"")
+	}
+
+	if cf.APIVersion != chart.APIVersionV3 {
+		return fmt.Errorf("apiVersion '%s' is not valid. The value must be \"v3\"", cf.APIVersion)
+	}
+
+	return nil
+}
+
+func validateChartVersion(cf *chart.Metadata) error {
+	if cf.Version == "" {
+		return errors.New("version is required")
+	}
+
+	version, err := semver.NewVersion(cf.Version)
+	if err != nil {
+		return fmt.Errorf("version '%s' is not a valid SemVer", cf.Version)
+	}
+
+	c, err := semver.NewConstraint(">0.0.0-0")
+	if err != nil {
+		return err
+	}
+	valid, msg := c.Validate(version)
+
+	if !valid && len(msg) > 0 {
+		return fmt.Errorf("version %v", msg[0])
+	}
+
+	return nil
+}
+
+func validateChartMaintainer(cf *chart.Metadata) error {
+	for _, maintainer := range cf.Maintainers {
+		if maintainer == nil {
+			return errors.New("a maintainer entry is empty")
+		}
+		if maintainer.Name == "" {
+			return errors.New("each maintainer requires a name")
+		} else if maintainer.Email != "" && !govalidator.IsEmail(maintainer.Email) {
+			return fmt.Errorf("invalid email '%s' for maintainer '%s'", maintainer.Email, maintainer.Name)
+		} else if maintainer.URL != "" && !govalidator.IsURL(maintainer.URL) {
+			return fmt.Errorf("invalid url '%s' for maintainer '%s'", maintainer.URL, maintainer.Name)
+		}
+	}
+	return nil
+}
+
+func validateChartSources(cf *chart.Metadata) error {
+	for _, source := range cf.Sources {
+		if source == "" || !govalidator.IsRequestURL(source) {
+			return fmt.Errorf("invalid source URL '%s'", source)
+		}
+	}
+	return nil
+}
+
+func validateChartIconPresence(cf *chart.Metadata) error {
+	if cf.Icon == "" {
+		return errors.New("icon is recommended")
+	}
+	return nil
+}
+
+func validateChartIconURL(cf *chart.Metadata) error {
+	if cf.Icon != "" && !govalidator.IsRequestURL(cf.Icon) {
+		return fmt.Errorf("invalid icon URL '%s'", cf.Icon)
+	}
+	return nil
+}
+
+func validateChartDependencies(cf *chart.Metadata) error {
+	if len(cf.Dependencies) > 0 && cf.APIVersion != chart.APIVersionV3 {
+		return fmt.Errorf("dependencies are not valid in the Chart file with apiVersion '%s'. They are valid in apiVersion '%s'", cf.APIVersion, chart.APIVersionV3)
+	}
+	return nil
+}
+
+func validateChartType(cf *chart.Metadata) error {
+	if len(cf.Type) > 0 && cf.APIVersion != chart.APIVersionV3 {
+		return fmt.Errorf("chart type is not valid in apiVersion '%s'. It is valid in apiVersion '%s'", cf.APIVersion, chart.APIVersionV3)
+	}
+	return nil
+}
+
+// loadChartFileForTypeCheck loads the Chart.yaml
+// in a generic form of a map[string]interface{}, so that the type
+// of the values can be checked
+func loadChartFileForTypeCheck(filename string) (map[string]interface{}, error) {
+	b, err := os.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	y := make(map[string]interface{})
+	err = yaml.Unmarshal(b, &y)
+	return y, err
+}
diff --git a/internal/chart/v3/lint/rules/chartfile_test.go b/internal/chart/v3/lint/rules/chartfile_test.go
new file mode 100644
index 000000000..070cc244d
--- /dev/null
+++ b/internal/chart/v3/lint/rules/chartfile_test.go
@@ -0,0 +1,276 @@
+/*
+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 rules
+
+import (
+	"errors"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+)
+
+const (
+	badChartNameDir    = "testdata/badchartname"
+	badChartDir        = "testdata/badchartfile"
+	anotherBadChartDir = "testdata/anotherbadchartfile"
+)
+
+var (
+	badChartNamePath         = filepath.Join(badChartNameDir, "Chart.yaml")
+	badChartFilePath         = filepath.Join(badChartDir, "Chart.yaml")
+	nonExistingChartFilePath = filepath.Join(os.TempDir(), "Chart.yaml")
+)
+
+var badChart, _ = chartutil.LoadChartfile(badChartFilePath)
+var badChartName, _ = chartutil.LoadChartfile(badChartNamePath)
+
+// Validation functions Test
+func TestValidateChartYamlNotDirectory(t *testing.T) {
+	_ = os.Mkdir(nonExistingChartFilePath, os.ModePerm)
+	defer os.Remove(nonExistingChartFilePath)
+
+	err := validateChartYamlNotDirectory(nonExistingChartFilePath)
+	if err == nil {
+		t.Errorf("validateChartYamlNotDirectory to return a linter error, got no error")
+	}
+}
+
+func TestValidateChartYamlFormat(t *testing.T) {
+	err := validateChartYamlFormat(errors.New("Read error"))
+	if err == nil {
+		t.Errorf("validateChartYamlFormat to return a linter error, got no error")
+	}
+
+	err = validateChartYamlFormat(nil)
+	if err != nil {
+		t.Errorf("validateChartYamlFormat to return no error, got a linter error")
+	}
+}
+
+func TestValidateChartName(t *testing.T) {
+	err := validateChartName(badChart)
+	if err == nil {
+		t.Errorf("validateChartName to return a linter error, got no error")
+	}
+
+	err = validateChartName(badChartName)
+	if err == nil {
+		t.Error("expected validateChartName to return a linter error for an invalid name, got no error")
+	}
+}
+
+func TestValidateChartVersion(t *testing.T) {
+	var failTest = []struct {
+		Version  string
+		ErrorMsg string
+	}{
+		{"", "version is required"},
+		{"1.2.3.4", "version '1.2.3.4' is not a valid SemVer"},
+		{"waps", "'waps' is not a valid SemVer"},
+		{"-3", "'-3' is not a valid SemVer"},
+	}
+
+	var successTest = []string{"0.0.1", "0.0.1+build", "0.0.1-beta"}
+
+	for _, test := range failTest {
+		badChart.Version = test.Version
+		err := validateChartVersion(badChart)
+		if err == nil || !strings.Contains(err.Error(), test.ErrorMsg) {
+			t.Errorf("validateChartVersion(%s) to return \"%s\", got no error", test.Version, test.ErrorMsg)
+		}
+	}
+
+	for _, version := range successTest {
+		badChart.Version = version
+		err := validateChartVersion(badChart)
+		if err != nil {
+			t.Errorf("validateChartVersion(%s) to return no error, got a linter error", version)
+		}
+	}
+}
+
+func TestValidateChartMaintainer(t *testing.T) {
+	var failTest = []struct {
+		Name     string
+		Email    string
+		ErrorMsg string
+	}{
+		{"", "", "each maintainer requires a name"},
+		{"", "test@test.com", "each maintainer requires a name"},
+		{"John Snow", "wrongFormatEmail.com", "invalid email"},
+	}
+
+	var successTest = []struct {
+		Name  string
+		Email string
+	}{
+		{"John Snow", ""},
+		{"John Snow", "john@winterfell.com"},
+	}
+
+	for _, test := range failTest {
+		badChart.Maintainers = []*chart.Maintainer{{Name: test.Name, Email: test.Email}}
+		err := validateChartMaintainer(badChart)
+		if err == nil || !strings.Contains(err.Error(), test.ErrorMsg) {
+			t.Errorf("validateChartMaintainer(%s, %s) to return \"%s\", got no error", test.Name, test.Email, test.ErrorMsg)
+		}
+	}
+
+	for _, test := range successTest {
+		badChart.Maintainers = []*chart.Maintainer{{Name: test.Name, Email: test.Email}}
+		err := validateChartMaintainer(badChart)
+		if err != nil {
+			t.Errorf("validateChartMaintainer(%s, %s) to return no error, got %s", test.Name, test.Email, err.Error())
+		}
+	}
+
+	// Testing for an empty maintainer
+	badChart.Maintainers = []*chart.Maintainer{nil}
+	err := validateChartMaintainer(badChart)
+	if err == nil {
+		t.Errorf("validateChartMaintainer did not return error for nil maintainer as expected")
+	}
+	if err.Error() != "a maintainer entry is empty" {
+		t.Errorf("validateChartMaintainer returned unexpected error for nil maintainer: %s", err.Error())
+	}
+}
+
+func TestValidateChartSources(t *testing.T) {
+	var failTest = []string{"", "RiverRun", "john@winterfell", "riverrun.io"}
+	var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish"}
+	for _, test := range failTest {
+		badChart.Sources = []string{test}
+		err := validateChartSources(badChart)
+		if err == nil || !strings.Contains(err.Error(), "invalid source URL") {
+			t.Errorf("validateChartSources(%s) to return \"invalid source URL\", got no error", test)
+		}
+	}
+
+	for _, test := range successTest {
+		badChart.Sources = []string{test}
+		err := validateChartSources(badChart)
+		if err != nil {
+			t.Errorf("validateChartSources(%s) to return no error, got %s", test, err.Error())
+		}
+	}
+}
+
+func TestValidateChartIconPresence(t *testing.T) {
+	t.Run("Icon absent", func(t *testing.T) {
+		testChart := &chart.Metadata{
+			Icon: "",
+		}
+
+		err := validateChartIconPresence(testChart)
+
+		if err == nil {
+			t.Errorf("validateChartIconPresence to return a linter error, got no error")
+		} else if !strings.Contains(err.Error(), "icon is recommended") {
+			t.Errorf("expected %q, got %q", "icon is recommended", err.Error())
+		}
+	})
+	t.Run("Icon present", func(t *testing.T) {
+		testChart := &chart.Metadata{
+			Icon: "http://example.org/icon.png",
+		}
+
+		err := validateChartIconPresence(testChart)
+
+		if err != nil {
+			t.Errorf("Unexpected error: %q", err.Error())
+		}
+	})
+}
+
+func TestValidateChartIconURL(t *testing.T) {
+	var failTest = []string{"RiverRun", "john@winterfell", "riverrun.io"}
+	var successTest = []string{"http://riverrun.io", "https://riverrun.io", "https://riverrun.io/blackfish.png"}
+	for _, test := range failTest {
+		badChart.Icon = test
+		err := validateChartIconURL(badChart)
+		if err == nil || !strings.Contains(err.Error(), "invalid icon URL") {
+			t.Errorf("validateChartIconURL(%s) to return \"invalid icon URL\", got no error", test)
+		}
+	}
+
+	for _, test := range successTest {
+		badChart.Icon = test
+		err := validateChartSources(badChart)
+		if err != nil {
+			t.Errorf("validateChartIconURL(%s) to return no error, got %s", test, err.Error())
+		}
+	}
+}
+
+func TestV3Chartfile(t *testing.T) {
+	t.Run("Chart.yaml basic validity issues", func(t *testing.T) {
+		linter := support.Linter{ChartDir: badChartDir}
+		Chartfile(&linter)
+		msgs := linter.Messages
+		expectedNumberOfErrorMessages := 6
+
+		if len(msgs) != expectedNumberOfErrorMessages {
+			t.Errorf("Expected %d errors, got %d", expectedNumberOfErrorMessages, len(msgs))
+			return
+		}
+
+		if !strings.Contains(msgs[0].Err.Error(), "name is required") {
+			t.Errorf("Unexpected message 0: %s", msgs[0].Err)
+		}
+
+		if !strings.Contains(msgs[1].Err.Error(), "apiVersion is required. The value must be \"v3\"") {
+			t.Errorf("Unexpected message 1: %s", msgs[1].Err)
+		}
+
+		if !strings.Contains(msgs[2].Err.Error(), "version '0.0.0.0' is not a valid SemVer") {
+			t.Errorf("Unexpected message 2: %s", msgs[2].Err)
+		}
+
+		if !strings.Contains(msgs[3].Err.Error(), "icon is recommended") {
+			t.Errorf("Unexpected message 3: %s", msgs[3].Err)
+		}
+	})
+
+	t.Run("Chart.yaml validity issues due to type mismatch", func(t *testing.T) {
+		linter := support.Linter{ChartDir: anotherBadChartDir}
+		Chartfile(&linter)
+		msgs := linter.Messages
+		expectedNumberOfErrorMessages := 3
+
+		if len(msgs) != expectedNumberOfErrorMessages {
+			t.Errorf("Expected %d errors, got %d", expectedNumberOfErrorMessages, len(msgs))
+			return
+		}
+
+		if !strings.Contains(msgs[0].Err.Error(), "version should be of type string") {
+			t.Errorf("Unexpected message 0: %s", msgs[0].Err)
+		}
+
+		if !strings.Contains(msgs[1].Err.Error(), "version '7.2445e+06' is not a valid SemVer") {
+			t.Errorf("Unexpected message 1: %s", msgs[1].Err)
+		}
+
+		if !strings.Contains(msgs[2].Err.Error(), "appVersion should be of type string") {
+			t.Errorf("Unexpected message 2: %s", msgs[2].Err)
+		}
+	})
+}
diff --git a/internal/chart/v3/lint/rules/crds.go b/internal/chart/v3/lint/rules/crds.go
new file mode 100644
index 000000000..6bafb52eb
--- /dev/null
+++ b/internal/chart/v3/lint/rules/crds.go
@@ -0,0 +1,113 @@
+/*
+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 rules
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/util/yaml"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+// Crds lints the CRDs in the Linter.
+func Crds(linter *support.Linter) {
+	fpath := "crds/"
+	crdsPath := filepath.Join(linter.ChartDir, fpath)
+
+	// crds directory is optional
+	if _, err := os.Stat(crdsPath); errors.Is(err, fs.ErrNotExist) {
+		return
+	}
+
+	crdsDirValid := linter.RunLinterRule(support.ErrorSev, fpath, validateCrdsDir(crdsPath))
+	if !crdsDirValid {
+		return
+	}
+
+	// Load chart and parse CRDs
+	chart, err := loader.Load(linter.ChartDir)
+
+	chartLoaded := linter.RunLinterRule(support.ErrorSev, fpath, err)
+
+	if !chartLoaded {
+		return
+	}
+
+	/* Iterate over all the CRDs to check:
+	1. It is a YAML file and not a template
+	2. The API version is apiextensions.k8s.io
+	3. The kind is CustomResourceDefinition
+	*/
+	for _, crd := range chart.CRDObjects() {
+		fileName := crd.Name
+		fpath = fileName
+
+		decoder := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(crd.File.Data), 4096)
+		for {
+			var yamlStruct *k8sYamlStruct
+
+			err := decoder.Decode(&yamlStruct)
+			if err == io.EOF {
+				break
+			}
+
+			// If YAML parsing fails here, it will always fail in the next block as well, so we should return here.
+			// This also confirms the YAML is not a template, since templates can't be decoded into a K8sYamlStruct.
+			if !linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err)) {
+				return
+			}
+
+			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdAPIVersion(yamlStruct))
+			linter.RunLinterRule(support.ErrorSev, fpath, validateCrdKind(yamlStruct))
+		}
+	}
+}
+
+// Validation functions
+func validateCrdsDir(crdsPath string) error {
+	fi, err := os.Stat(crdsPath)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New("not a directory")
+	}
+	return nil
+}
+
+func validateCrdAPIVersion(obj *k8sYamlStruct) error {
+	if !strings.HasPrefix(obj.APIVersion, "apiextensions.k8s.io") {
+		return fmt.Errorf("apiVersion is not in 'apiextensions.k8s.io'")
+	}
+	return nil
+}
+
+func validateCrdKind(obj *k8sYamlStruct) error {
+	if obj.Kind != "CustomResourceDefinition" {
+		return fmt.Errorf("object kind is not 'CustomResourceDefinition'")
+	}
+	return nil
+}
diff --git a/internal/chart/v3/lint/rules/crds_test.go b/internal/chart/v3/lint/rules/crds_test.go
new file mode 100644
index 000000000..d93e3d978
--- /dev/null
+++ b/internal/chart/v3/lint/rules/crds_test.go
@@ -0,0 +1,36 @@
+/*
+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 rules
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+)
+
+const invalidCrdsDir = "./testdata/invalidcrdsdir"
+
+func TestInvalidCrdsDir(t *testing.T) {
+	linter := support.Linter{ChartDir: invalidCrdsDir}
+	Crds(&linter)
+	res := linter.Messages
+
+	assert.Len(t, res, 1)
+	assert.ErrorContains(t, res[0].Err, "not a directory")
+}
diff --git a/internal/chart/v3/lint/rules/dependencies.go b/internal/chart/v3/lint/rules/dependencies.go
new file mode 100644
index 000000000..f45153728
--- /dev/null
+++ b/internal/chart/v3/lint/rules/dependencies.go
@@ -0,0 +1,101 @@
+/*
+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 rules // import "helm.sh/helm/v4/internal/chart/v3/lint/rules"
+
+import (
+	"fmt"
+	"strings"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+)
+
+// Dependencies runs lints against a chart's dependencies
+//
+// See https://github.com/helm/helm/issues/7910
+func Dependencies(linter *support.Linter) {
+	c, err := loader.LoadDir(linter.ChartDir)
+	if !linter.RunLinterRule(support.ErrorSev, "", validateChartFormat(err)) {
+		return
+	}
+
+	linter.RunLinterRule(support.ErrorSev, linter.ChartDir, validateDependencyInMetadata(c))
+	linter.RunLinterRule(support.ErrorSev, linter.ChartDir, validateDependenciesUnique(c))
+	linter.RunLinterRule(support.WarningSev, linter.ChartDir, validateDependencyInChartsDir(c))
+}
+
+func validateChartFormat(chartError error) error {
+	if chartError != nil {
+		return fmt.Errorf("unable to load chart\n\t%w", chartError)
+	}
+	return nil
+}
+
+func validateDependencyInChartsDir(c *chart.Chart) (err error) {
+	dependencies := map[string]struct{}{}
+	missing := []string{}
+	for _, dep := range c.Dependencies() {
+		dependencies[dep.Metadata.Name] = struct{}{}
+	}
+	for _, dep := range c.Metadata.Dependencies {
+		if _, ok := dependencies[dep.Name]; !ok {
+			missing = append(missing, dep.Name)
+		}
+	}
+	if len(missing) > 0 {
+		err = fmt.Errorf("chart directory is missing these dependencies: %s", strings.Join(missing, ","))
+	}
+	return err
+}
+
+func validateDependencyInMetadata(c *chart.Chart) (err error) {
+	dependencies := map[string]struct{}{}
+	missing := []string{}
+	for _, dep := range c.Metadata.Dependencies {
+		dependencies[dep.Name] = struct{}{}
+	}
+	for _, dep := range c.Dependencies() {
+		if _, ok := dependencies[dep.Metadata.Name]; !ok {
+			missing = append(missing, dep.Metadata.Name)
+		}
+	}
+	if len(missing) > 0 {
+		err = fmt.Errorf("chart metadata is missing these dependencies: %s", strings.Join(missing, ","))
+	}
+	return err
+}
+
+func validateDependenciesUnique(c *chart.Chart) (err error) {
+	dependencies := map[string]*chart.Dependency{}
+	shadowing := []string{}
+
+	for _, dep := range c.Metadata.Dependencies {
+		key := dep.Name
+		if dep.Alias != "" {
+			key = dep.Alias
+		}
+		if dependencies[key] != nil {
+			shadowing = append(shadowing, key)
+		}
+		dependencies[key] = dep
+	}
+	if len(shadowing) > 0 {
+		err = fmt.Errorf("multiple dependencies with name or alias: %s", strings.Join(shadowing, ","))
+	}
+	return err
+}
diff --git a/internal/chart/v3/lint/rules/dependencies_test.go b/internal/chart/v3/lint/rules/dependencies_test.go
new file mode 100644
index 000000000..b80e4b8a9
--- /dev/null
+++ b/internal/chart/v3/lint/rules/dependencies_test.go
@@ -0,0 +1,157 @@
+/*
+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 rules
+
+import (
+	"path/filepath"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+)
+
+func chartWithBadDependencies() chart.Chart {
+	badChartDeps := chart.Chart{
+		Metadata: &chart.Metadata{
+			Name:       "badchart",
+			Version:    "0.1.0",
+			APIVersion: "v2",
+			Dependencies: []*chart.Dependency{
+				{
+					Name: "sub2",
+				},
+				{
+					Name: "sub3",
+				},
+			},
+		},
+	}
+
+	badChartDeps.SetDependencies(
+		&chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "sub1",
+				Version:    "0.1.0",
+				APIVersion: "v2",
+			},
+		},
+		&chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "sub2",
+				Version:    "0.1.0",
+				APIVersion: "v2",
+			},
+		},
+	)
+	return badChartDeps
+}
+
+func TestValidateDependencyInChartsDir(t *testing.T) {
+	c := chartWithBadDependencies()
+
+	if err := validateDependencyInChartsDir(&c); err == nil {
+		t.Error("chart should have been flagged for missing deps in chart directory")
+	}
+}
+
+func TestValidateDependencyInMetadata(t *testing.T) {
+	c := chartWithBadDependencies()
+
+	if err := validateDependencyInMetadata(&c); err == nil {
+		t.Errorf("chart should have been flagged for missing deps in chart metadata")
+	}
+}
+
+func TestValidateDependenciesUnique(t *testing.T) {
+	tests := []struct {
+		chart chart.Chart
+	}{
+		{chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "badchart",
+				Version:    "0.1.0",
+				APIVersion: "v2",
+				Dependencies: []*chart.Dependency{
+					{
+						Name: "foo",
+					},
+					{
+						Name: "foo",
+					},
+				},
+			},
+		}},
+		{chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "badchart",
+				Version:    "0.1.0",
+				APIVersion: "v2",
+				Dependencies: []*chart.Dependency{
+					{
+						Name:  "foo",
+						Alias: "bar",
+					},
+					{
+						Name: "bar",
+					},
+				},
+			},
+		}},
+		{chart.Chart{
+			Metadata: &chart.Metadata{
+				Name:       "badchart",
+				Version:    "0.1.0",
+				APIVersion: "v2",
+				Dependencies: []*chart.Dependency{
+					{
+						Name:  "foo",
+						Alias: "baz",
+					},
+					{
+						Name:  "bar",
+						Alias: "baz",
+					},
+				},
+			},
+		}},
+	}
+
+	for _, tt := range tests {
+		if err := validateDependenciesUnique(&tt.chart); err == nil {
+			t.Errorf("chart should have been flagged for dependency shadowing")
+		}
+	}
+}
+
+func TestDependencies(t *testing.T) {
+	tmp := t.TempDir()
+
+	c := chartWithBadDependencies()
+	err := chartutil.SaveDir(&c, tmp)
+	if err != nil {
+		t.Fatal(err)
+	}
+	linter := support.Linter{ChartDir: filepath.Join(tmp, c.Metadata.Name)}
+
+	Dependencies(&linter)
+	if l := len(linter.Messages); l != 2 {
+		t.Errorf("expected 2 linter errors for bad chart dependencies. Got %d.", l)
+		for i, msg := range linter.Messages {
+			t.Logf("Message: %d, Error: %#v", i, msg)
+		}
+	}
+}
diff --git a/pkg/lint/rules/deprecations.go b/internal/chart/v3/lint/rules/deprecations.go
similarity index 95%
rename from pkg/lint/rules/deprecations.go
rename to internal/chart/v3/lint/rules/deprecations.go
index c6d635a5e..6f86bdbbd 100644
--- a/pkg/lint/rules/deprecations.go
+++ b/internal/chart/v3/lint/rules/deprecations.go
@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rules // import "helm.sh/helm/v4/pkg/lint/rules"
+package rules // import "helm.sh/helm/v4/internal/chart/v3/lint/rules"
 
 import (
 	"fmt"
 	"strconv"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/endpoints/deprecation"
 	kscheme "k8s.io/client-go/kubernetes/scheme"
-
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 var (
@@ -47,7 +47,7 @@ func (e deprecatedAPIError) Error() string {
 	return msg
 }
 
-func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *chartutil.KubeVersion) error {
+func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *common.KubeVersion) error {
 	// if `resource` does not have an APIVersion or Kind, we cannot test it for deprecation
 	if resource.APIVersion == "" {
 		return nil
diff --git a/internal/chart/v3/lint/rules/deprecations_test.go b/internal/chart/v3/lint/rules/deprecations_test.go
new file mode 100644
index 000000000..35e541e5c
--- /dev/null
+++ b/internal/chart/v3/lint/rules/deprecations_test.go
@@ -0,0 +1,41 @@
+/*
+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 rules // import "helm.sh/helm/v4/internal/chart/v3/lint/rules"
+
+import "testing"
+
+func TestValidateNoDeprecations(t *testing.T) {
+	deprecated := &k8sYamlStruct{
+		APIVersion: "extensions/v1beta1",
+		Kind:       "Deployment",
+	}
+	err := validateNoDeprecations(deprecated, nil)
+	if err == nil {
+		t.Fatal("Expected deprecated extension to be flagged")
+	}
+	depErr := err.(deprecatedAPIError)
+	if depErr.Message == "" {
+		t.Fatalf("Expected error message to be non-blank: %v", err)
+	}
+
+	if err := validateNoDeprecations(&k8sYamlStruct{
+		APIVersion: "v1",
+		Kind:       "Pod",
+	}, nil); err != nil {
+		t.Errorf("Expected a v1 Pod to not be deprecated")
+	}
+}
diff --git a/internal/chart/v3/lint/rules/template.go b/internal/chart/v3/lint/rules/template.go
new file mode 100644
index 000000000..d4c62839f
--- /dev/null
+++ b/internal/chart/v3/lint/rules/template.go
@@ -0,0 +1,348 @@
+/*
+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 rules
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path"
+	"path/filepath"
+	"slices"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/api/validation"
+	apipath "k8s.io/apimachinery/pkg/api/validation/path"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/apimachinery/pkg/util/yaml"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	"helm.sh/helm/v4/internal/chart/v3/loader"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
+	"helm.sh/helm/v4/pkg/engine"
+)
+
+// Templates lints the templates in the Linter.
+func Templates(linter *support.Linter, values map[string]interface{}, namespace string, _ bool) {
+	TemplatesWithKubeVersion(linter, values, namespace, nil)
+}
+
+// TemplatesWithKubeVersion lints the templates in the Linter, allowing to specify the kubernetes version.
+func TemplatesWithKubeVersion(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *common.KubeVersion) {
+	TemplatesWithSkipSchemaValidation(linter, values, namespace, kubeVersion, false)
+}
+
+// TemplatesWithSkipSchemaValidation lints the templates in the Linter, allowing to specify the kubernetes version and if schema validation is enabled or not.
+func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *common.KubeVersion, skipSchemaValidation bool) {
+	fpath := "templates/"
+	templatesPath := filepath.Join(linter.ChartDir, fpath)
+
+	// Templates directory is optional for now
+	templatesDirExists := linter.RunLinterRule(support.WarningSev, fpath, templatesDirExists(templatesPath))
+	if !templatesDirExists {
+		return
+	}
+
+	validTemplatesDir := linter.RunLinterRule(support.ErrorSev, fpath, validateTemplatesDir(templatesPath))
+	if !validTemplatesDir {
+		return
+	}
+
+	// Load chart and parse templates
+	chart, err := loader.Load(linter.ChartDir)
+
+	chartLoaded := linter.RunLinterRule(support.ErrorSev, fpath, err)
+
+	if !chartLoaded {
+		return
+	}
+
+	options := common.ReleaseOptions{
+		Name:      "test-release",
+		Namespace: namespace,
+	}
+
+	caps := common.DefaultCapabilities.Copy()
+	if kubeVersion != nil {
+		caps.KubeVersion = *kubeVersion
+	}
+
+	// lint ignores import-values
+	// See https://github.com/helm/helm/issues/9658
+	if err := chartutil.ProcessDependencies(chart, values); err != nil {
+		return
+	}
+
+	cvals, err := util.CoalesceValues(chart, values)
+	if err != nil {
+		return
+	}
+
+	valuesToRender, err := util.ToRenderValuesWithSchemaValidation(chart, cvals, options, caps, skipSchemaValidation)
+	if err != nil {
+		linter.RunLinterRule(support.ErrorSev, fpath, err)
+		return
+	}
+	var e engine.Engine
+	e.LintMode = true
+	renderedContentMap, err := e.Render(chart, valuesToRender)
+
+	renderOk := linter.RunLinterRule(support.ErrorSev, fpath, err)
+
+	if !renderOk {
+		return
+	}
+
+	/* Iterate over all the templates to check:
+	- It is a .yaml file
+	- All the values in the template file is defined
+	- {{}} include | quote
+	- Generated content is a valid Yaml file
+	- Metadata.Namespace is not set
+	*/
+	for _, template := range chart.Templates {
+		fileName := template.Name
+		fpath = fileName
+
+		linter.RunLinterRule(support.ErrorSev, fpath, validateAllowedExtension(fileName))
+
+		// We only apply the following lint rules to yaml files
+		if filepath.Ext(fileName) != ".yaml" || filepath.Ext(fileName) == ".yml" {
+			continue
+		}
+
+		// NOTE: disabled for now, Refs https://github.com/helm/helm/issues/1463
+		// Check that all the templates have a matching value
+		// linter.RunLinterRule(support.WarningSev, fpath, validateNoMissingValues(templatesPath, valuesToRender, preExecutedTemplate))
+
+		// NOTE: disabled for now, Refs https://github.com/helm/helm/issues/1037
+		// linter.RunLinterRule(support.WarningSev, fpath, validateQuotes(string(preExecutedTemplate)))
+
+		renderedContent := renderedContentMap[path.Join(chart.Name(), fileName)]
+		if strings.TrimSpace(renderedContent) != "" {
+			linter.RunLinterRule(support.WarningSev, fpath, validateTopIndentLevel(renderedContent))
+
+			decoder := yaml.NewYAMLOrJSONDecoder(strings.NewReader(renderedContent), 4096)
+
+			// Lint all resources if the file contains multiple documents separated by ---
+			for {
+				// Even though k8sYamlStruct only defines a few fields, an error in any other
+				// key will be raised as well
+				var yamlStruct *k8sYamlStruct
+
+				err := decoder.Decode(&yamlStruct)
+				if err == io.EOF {
+					break
+				}
+
+				//  If YAML linting fails here, it will always fail in the next block as well, so we should return here.
+				// fix https://github.com/helm/helm/issues/11391
+				if !linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err)) {
+					return
+				}
+				if yamlStruct != nil {
+					// NOTE: set to warnings to allow users to support out-of-date kubernetes
+					// Refs https://github.com/helm/helm/issues/8596
+					linter.RunLinterRule(support.WarningSev, fpath, validateMetadataName(yamlStruct))
+					linter.RunLinterRule(support.WarningSev, fpath, validateNoDeprecations(yamlStruct, kubeVersion))
+
+					linter.RunLinterRule(support.ErrorSev, fpath, validateMatchSelector(yamlStruct, renderedContent))
+					linter.RunLinterRule(support.ErrorSev, fpath, validateListAnnotations(yamlStruct, renderedContent))
+				}
+			}
+		}
+	}
+}
+
+// validateTopIndentLevel checks that the content does not start with an indent level > 0.
+//
+// This error can occur when a template accidentally inserts space. It can cause
+// unpredictable errors depending on whether the text is normalized before being passed
+// into the YAML parser. So we trap it here.
+//
+// See https://github.com/helm/helm/issues/8467
+func validateTopIndentLevel(content string) error {
+	// Read lines until we get to a non-empty one
+	scanner := bufio.NewScanner(bytes.NewBufferString(content))
+	for scanner.Scan() {
+		line := scanner.Text()
+		// If line is empty, skip
+		if strings.TrimSpace(line) == "" {
+			continue
+		}
+		// If it starts with one or more spaces, this is an error
+		if strings.HasPrefix(line, " ") || strings.HasPrefix(line, "\t") {
+			return fmt.Errorf("document starts with an illegal indent: %q, which may cause parsing problems", line)
+		}
+		// Any other condition passes.
+		return nil
+	}
+	return scanner.Err()
+}
+
+// Validation functions
+func templatesDirExists(templatesPath string) error {
+	_, err := os.Stat(templatesPath)
+	if errors.Is(err, os.ErrNotExist) {
+		return errors.New("directory does not exist")
+	}
+	return nil
+}
+
+func validateTemplatesDir(templatesPath string) error {
+	fi, err := os.Stat(templatesPath)
+	if err != nil {
+		return err
+	}
+	if !fi.IsDir() {
+		return errors.New("not a directory")
+	}
+	return nil
+}
+
+func validateAllowedExtension(fileName string) error {
+	ext := filepath.Ext(fileName)
+	validExtensions := []string{".yaml", ".yml", ".tpl", ".txt"}
+
+	if slices.Contains(validExtensions, ext) {
+		return nil
+	}
+
+	return fmt.Errorf("file extension '%s' not valid. Valid extensions are .yaml, .yml, .tpl, or .txt", ext)
+}
+
+func validateYamlContent(err error) error {
+	if err != nil {
+		return fmt.Errorf("unable to parse YAML: %w", err)
+	}
+	return nil
+}
+
+// validateMetadataName uses the correct validation function for the object
+// Kind, or if not set, defaults to the standard definition of a subdomain in
+// DNS (RFC 1123), used by most resources.
+func validateMetadataName(obj *k8sYamlStruct) error {
+	fn := validateMetadataNameFunc(obj)
+	allErrs := field.ErrorList{}
+	for _, msg := range fn(obj.Metadata.Name, false) {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("metadata").Child("name"), obj.Metadata.Name, msg))
+	}
+	if len(allErrs) > 0 {
+		return fmt.Errorf("object name does not conform to Kubernetes naming requirements: %q: %w", obj.Metadata.Name, allErrs.ToAggregate())
+	}
+	return nil
+}
+
+// validateMetadataNameFunc will return a name validation function for the
+// object kind, if defined below.
+//
+// Rules should match those set in the various api validations:
+// https://github.com/kubernetes/kubernetes/blob/v1.20.0/pkg/apis/core/validation/validation.go#L205-L274
+// https://github.com/kubernetes/kubernetes/blob/v1.20.0/pkg/apis/apps/validation/validation.go#L39
+// ...
+//
+// Implementing here to avoid importing k/k.
+//
+// If no mapping is defined, returns NameIsDNSSubdomain.  This is used by object
+// kinds that don't have special requirements, so is the most likely to work if
+// new kinds are added.
+func validateMetadataNameFunc(obj *k8sYamlStruct) validation.ValidateNameFunc {
+	switch strings.ToLower(obj.Kind) {
+	case "pod", "node", "secret", "endpoints", "resourcequota", // core
+		"controllerrevision", "daemonset", "deployment", "replicaset", "statefulset", // apps
+		"autoscaler",     // autoscaler
+		"cronjob", "job", // batch
+		"lease",                    // coordination
+		"endpointslice",            // discovery
+		"networkpolicy", "ingress", // networking
+		"podsecuritypolicy",                           // policy
+		"priorityclass",                               // scheduling
+		"podpreset",                                   // settings
+		"storageclass", "volumeattachment", "csinode": // storage
+		return validation.NameIsDNSSubdomain
+	case "service":
+		return validation.NameIsDNS1035Label
+	case "namespace":
+		return validation.ValidateNamespaceName
+	case "serviceaccount":
+		return validation.ValidateServiceAccountName
+	case "certificatesigningrequest":
+		// No validation.
+		// https://github.com/kubernetes/kubernetes/blob/v1.20.0/pkg/apis/certificates/validation/validation.go#L137-L140
+		return func(_ string, _ bool) []string { return nil }
+	case "role", "clusterrole", "rolebinding", "clusterrolebinding":
+		// https://github.com/kubernetes/kubernetes/blob/v1.20.0/pkg/apis/rbac/validation/validation.go#L32-L34
+		return func(name string, _ bool) []string {
+			return apipath.IsValidPathSegmentName(name)
+		}
+	default:
+		return validation.NameIsDNSSubdomain
+	}
+}
+
+// validateMatchSelector ensures that template specs have a selector declared.
+// See https://github.com/helm/helm/issues/1990
+func validateMatchSelector(yamlStruct *k8sYamlStruct, manifest string) error {
+	switch yamlStruct.Kind {
+	case "Deployment", "ReplicaSet", "DaemonSet", "StatefulSet":
+		// verify that matchLabels or matchExpressions is present
+		if !strings.Contains(manifest, "matchLabels") && !strings.Contains(manifest, "matchExpressions") {
+			return fmt.Errorf("a %s must contain matchLabels or matchExpressions, and %q does not", yamlStruct.Kind, yamlStruct.Metadata.Name)
+		}
+	}
+	return nil
+}
+
+func validateListAnnotations(yamlStruct *k8sYamlStruct, manifest string) error {
+	if yamlStruct.Kind == "List" {
+		m := struct {
+			Items []struct {
+				Metadata struct {
+					Annotations map[string]string
+				}
+			}
+		}{}
+
+		if err := yaml.Unmarshal([]byte(manifest), &m); err != nil {
+			return validateYamlContent(err)
+		}
+
+		for _, i := range m.Items {
+			if _, ok := i.Metadata.Annotations["helm.sh/resource-policy"]; ok {
+				return errors.New("annotation 'helm.sh/resource-policy' within List objects are ignored")
+			}
+		}
+	}
+	return nil
+}
+
+// k8sYamlStruct stubs a Kubernetes YAML file.
+type k8sYamlStruct struct {
+	APIVersion string `json:"apiVersion"`
+	Kind       string
+	Metadata   k8sYamlMetadata
+}
+
+type k8sYamlMetadata struct {
+	Namespace string
+	Name      string
+}
diff --git a/internal/chart/v3/lint/rules/template_test.go b/internal/chart/v3/lint/rules/template_test.go
new file mode 100644
index 000000000..40bcfa26b
--- /dev/null
+++ b/internal/chart/v3/lint/rules/template_test.go
@@ -0,0 +1,441 @@
+/*
+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 rules
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	chartutil "helm.sh/helm/v4/internal/chart/v3/util"
+	"helm.sh/helm/v4/pkg/chart/common"
+)
+
+const templateTestBasedir = "./testdata/albatross"
+
+func TestValidateAllowedExtension(t *testing.T) {
+	var failTest = []string{"/foo", "/test.toml"}
+	for _, test := range failTest {
+		err := validateAllowedExtension(test)
+		if err == nil || !strings.Contains(err.Error(), "Valid extensions are .yaml, .yml, .tpl, or .txt") {
+			t.Errorf("validateAllowedExtension('%s') to return \"Valid extensions are .yaml, .yml, .tpl, or .txt\", got no error", test)
+		}
+	}
+	var successTest = []string{"/foo.yaml", "foo.yaml", "foo.tpl", "/foo/bar/baz.yaml", "NOTES.txt"}
+	for _, test := range successTest {
+		err := validateAllowedExtension(test)
+		if err != nil {
+			t.Errorf("validateAllowedExtension('%s') to return no error but got \"%s\"", test, err.Error())
+		}
+	}
+}
+
+var values = map[string]interface{}{"nameOverride": "", "httpPort": 80}
+
+const namespace = "testNamespace"
+const strict = false
+
+func TestTemplateParsing(t *testing.T) {
+	linter := support.Linter{ChartDir: templateTestBasedir}
+	Templates(&linter, values, namespace, strict)
+	res := linter.Messages
+
+	if len(res) != 1 {
+		t.Fatalf("Expected one error, got %d, %v", len(res), res)
+	}
+
+	if !strings.Contains(res[0].Err.Error(), "deliberateSyntaxError") {
+		t.Errorf("Unexpected error: %s", res[0])
+	}
+}
+
+var wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml")
+var ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored")
+
+// Test a template with all the existing features:
+// namespaces, partial templates
+func TestTemplateIntegrationHappyPath(t *testing.T) {
+	// Rename file so it gets ignored by the linter
+	os.Rename(wrongTemplatePath, ignoredTemplatePath)
+	defer os.Rename(ignoredTemplatePath, wrongTemplatePath)
+
+	linter := support.Linter{ChartDir: templateTestBasedir}
+	Templates(&linter, values, namespace, strict)
+	res := linter.Messages
+
+	if len(res) != 0 {
+		t.Fatalf("Expected no error, got %d, %v", len(res), res)
+	}
+}
+
+func TestMultiTemplateFail(t *testing.T) {
+	linter := support.Linter{ChartDir: "./testdata/multi-template-fail"}
+	Templates(&linter, values, namespace, strict)
+	res := linter.Messages
+
+	if len(res) != 1 {
+		t.Fatalf("Expected 1 error, got %d, %v", len(res), res)
+	}
+
+	if !strings.Contains(res[0].Err.Error(), "object name does not conform to Kubernetes naming requirements") {
+		t.Errorf("Unexpected error: %s", res[0].Err)
+	}
+}
+
+func TestValidateMetadataName(t *testing.T) {
+	tests := []struct {
+		obj     *k8sYamlStruct
+		wantErr bool
+	}{
+		// Most kinds use IsDNS1123Subdomain.
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: ""}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
+		{&k8sYamlStruct{Kind: "Pod", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "ServiceAccount", Metadata: k8sYamlMetadata{Name: "operator:sa"}}, true},
+
+		// Service uses IsDNS1035Label.
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "123baz"}}, true},
+		{&k8sYamlStruct{Kind: "Service", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
+
+		// Namespace uses IsDNS1123Label.
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, true},
+		{&k8sYamlStruct{Kind: "Namespace", Metadata: k8sYamlMetadata{Name: "foo-bar"}}, false},
+
+		// CertificateSigningRequest has no validation.
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: ""}}, false},
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "CertificateSigningRequest", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, false},
+
+		// RBAC uses path validation.
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
+		{&k8sYamlStruct{Kind: "Role", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "foo.bar"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator/role"}}, true},
+		{&k8sYamlStruct{Kind: "ClusterRole", Metadata: k8sYamlMetadata{Name: "operator%role"}}, true},
+		{&k8sYamlStruct{Kind: "RoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+		{&k8sYamlStruct{Kind: "ClusterRoleBinding", Metadata: k8sYamlMetadata{Name: "operator:role"}}, false},
+
+		// Unknown Kind
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: ""}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.bar1234baz.seventyone"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "FOO"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "123baz"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "foo.BAR.baz"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one-two"}}, false},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "-two"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "one_two"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "a..b"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "%^&#$%*@^*@&#^"}}, true},
+		{&k8sYamlStruct{Kind: "FutureKind", Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+
+		// No kind
+		{&k8sYamlStruct{Metadata: k8sYamlMetadata{Name: "foo"}}, false},
+		{&k8sYamlStruct{Metadata: k8sYamlMetadata{Name: "operator:pod"}}, true},
+	}
+	for _, tt := range tests {
+		t.Run(fmt.Sprintf("%s/%s", tt.obj.Kind, tt.obj.Metadata.Name), func(t *testing.T) {
+			if err := validateMetadataName(tt.obj); (err != nil) != tt.wantErr {
+				t.Errorf("validateMetadataName() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestDeprecatedAPIFails(t *testing.T) {
+	mychart := chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: "v2",
+			Name:       "failapi",
+			Version:    "0.1.0",
+			Icon:       "satisfy-the-linting-gods.gif",
+		},
+		Templates: []*common.File{
+			{
+				Name: "templates/baddeployment.yaml",
+				Data: []byte("apiVersion: apps/v1beta1\nkind: Deployment\nmetadata:\n  name: baddep\nspec: {selector: {matchLabels: {foo: bar}}}"),
+			},
+			{
+				Name: "templates/goodsecret.yaml",
+				Data: []byte("apiVersion: v1\nkind: Secret\nmetadata:\n  name: goodsecret"),
+			},
+		},
+	}
+	tmpdir := t.TempDir()
+
+	if err := chartutil.SaveDir(&mychart, tmpdir); err != nil {
+		t.Fatal(err)
+	}
+
+	linter := support.Linter{ChartDir: filepath.Join(tmpdir, mychart.Name())}
+	Templates(&linter, values, namespace, strict)
+	if l := len(linter.Messages); l != 1 {
+		for i, msg := range linter.Messages {
+			t.Logf("Message %d: %s", i, msg)
+		}
+		t.Fatalf("Expected 1 lint error, got %d", l)
+	}
+
+	err := linter.Messages[0].Err.(deprecatedAPIError)
+	if err.Deprecated != "apps/v1beta1 Deployment" {
+		t.Errorf("Surprised to learn that %q is deprecated", err.Deprecated)
+	}
+}
+
+const manifest = `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: foo
+data:
+  myval1: {{default "val" .Values.mymap.key1 }}
+  myval2: {{default "val" .Values.mymap.key2 }}
+`
+
+// TestStrictTemplateParsingMapError is a regression test.
+//
+// The template engine should not produce an error when a map in values.yaml does
+// not contain all possible keys.
+//
+// See https://github.com/helm/helm/issues/7483
+func TestStrictTemplateParsingMapError(t *testing.T) {
+
+	ch := chart.Chart{
+		Metadata: &chart.Metadata{
+			Name:       "regression7483",
+			APIVersion: "v2",
+			Version:    "0.1.0",
+		},
+		Values: map[string]interface{}{
+			"mymap": map[string]string{
+				"key1": "val1",
+			},
+		},
+		Templates: []*common.File{
+			{
+				Name: "templates/configmap.yaml",
+				Data: []byte(manifest),
+			},
+		},
+	}
+	dir := t.TempDir()
+	if err := chartutil.SaveDir(&ch, dir); err != nil {
+		t.Fatal(err)
+	}
+	linter := &support.Linter{
+		ChartDir: filepath.Join(dir, ch.Metadata.Name),
+	}
+	Templates(linter, ch.Values, namespace, strict)
+	if len(linter.Messages) != 0 {
+		t.Errorf("expected zero messages, got %d", len(linter.Messages))
+		for i, msg := range linter.Messages {
+			t.Logf("Message %d: %q", i, msg)
+		}
+	}
+}
+
+func TestValidateMatchSelector(t *testing.T) {
+	md := &k8sYamlStruct{
+		APIVersion: "apps/v1",
+		Kind:       "Deployment",
+		Metadata: k8sYamlMetadata{
+			Name: "mydeployment",
+		},
+	}
+	manifest := `
+	apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    app: nginx
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.14.2
+	`
+	if err := validateMatchSelector(md, manifest); err != nil {
+		t.Error(err)
+	}
+	manifest = `
+	apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    app: nginx
+spec:
+  replicas: 3
+  selector:
+    matchExpressions:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.14.2
+	`
+	if err := validateMatchSelector(md, manifest); err != nil {
+		t.Error(err)
+	}
+	manifest = `
+	apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  labels:
+    app: nginx
+spec:
+  replicas: 3
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.14.2
+	`
+	if err := validateMatchSelector(md, manifest); err == nil {
+		t.Error("expected Deployment with no selector to fail")
+	}
+}
+
+func TestValidateTopIndentLevel(t *testing.T) {
+	for doc, shouldFail := range map[string]bool{
+		// Should not fail
+		"\n\n\n\t\n   \t\n":          false,
+		"apiVersion:foo\n  bar:baz":  false,
+		"\n\n\napiVersion:foo\n\n\n": false,
+		// Should fail
+		"  apiVersion:foo":         true,
+		"\n\n  apiVersion:foo\n\n": true,
+	} {
+		if err := validateTopIndentLevel(doc); (err == nil) == shouldFail {
+			t.Errorf("Expected %t for %q", shouldFail, doc)
+		}
+	}
+
+}
+
+// TestEmptyWithCommentsManifests checks the lint is not failing against empty manifests that contains only comments
+// See https://github.com/helm/helm/issues/8621
+func TestEmptyWithCommentsManifests(t *testing.T) {
+	mychart := chart.Chart{
+		Metadata: &chart.Metadata{
+			APIVersion: "v2",
+			Name:       "emptymanifests",
+			Version:    "0.1.0",
+			Icon:       "satisfy-the-linting-gods.gif",
+		},
+		Templates: []*common.File{
+			{
+				Name: "templates/empty-with-comments.yaml",
+				Data: []byte("#@formatter:off\n"),
+			},
+		},
+	}
+	tmpdir := t.TempDir()
+
+	if err := chartutil.SaveDir(&mychart, tmpdir); err != nil {
+		t.Fatal(err)
+	}
+
+	linter := support.Linter{ChartDir: filepath.Join(tmpdir, mychart.Name())}
+	Templates(&linter, values, namespace, strict)
+	if l := len(linter.Messages); l > 0 {
+		for i, msg := range linter.Messages {
+			t.Logf("Message %d: %s", i, msg)
+		}
+		t.Fatalf("Expected 0 lint errors, got %d", l)
+	}
+}
+func TestValidateListAnnotations(t *testing.T) {
+	md := &k8sYamlStruct{
+		APIVersion: "v1",
+		Kind:       "List",
+		Metadata: k8sYamlMetadata{
+			Name: "list",
+		},
+	}
+	manifest := `
+apiVersion: v1
+kind: List
+items:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      annotations:
+        helm.sh/resource-policy: keep
+`
+
+	if err := validateListAnnotations(md, manifest); err == nil {
+		t.Fatal("expected list with nested keep annotations to fail")
+	}
+
+	manifest = `
+apiVersion: v1
+kind: List
+metadata:
+  annotations:
+    helm.sh/resource-policy: keep
+items:
+  - apiVersion: v1
+    kind: ConfigMap
+`
+
+	if err := validateListAnnotations(md, manifest); err != nil {
+		t.Fatalf("List objects keep annotations should pass. got: %s", err)
+	}
+}
diff --git a/internal/chart/v3/lint/rules/testdata/albatross/Chart.yaml b/internal/chart/v3/lint/rules/testdata/albatross/Chart.yaml
new file mode 100644
index 000000000..5e1ed515c
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/albatross/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: albatross
+description: testing chart
+version: 199.44.12345-Alpha.1+cafe009
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/albatross/templates/_helpers.tpl b/internal/chart/v3/lint/rules/testdata/albatross/templates/_helpers.tpl
similarity index 100%
rename from pkg/lint/rules/testdata/albatross/templates/_helpers.tpl
rename to internal/chart/v3/lint/rules/testdata/albatross/templates/_helpers.tpl
diff --git a/pkg/lint/rules/testdata/albatross/templates/fail.yaml b/internal/chart/v3/lint/rules/testdata/albatross/templates/fail.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/albatross/templates/fail.yaml
rename to internal/chart/v3/lint/rules/testdata/albatross/templates/fail.yaml
diff --git a/pkg/lint/rules/testdata/albatross/templates/svc.yaml b/internal/chart/v3/lint/rules/testdata/albatross/templates/svc.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/albatross/templates/svc.yaml
rename to internal/chart/v3/lint/rules/testdata/albatross/templates/svc.yaml
diff --git a/pkg/lint/rules/testdata/albatross/values.yaml b/internal/chart/v3/lint/rules/testdata/albatross/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/albatross/values.yaml
rename to internal/chart/v3/lint/rules/testdata/albatross/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/anotherbadchartfile/Chart.yaml b/internal/chart/v3/lint/rules/testdata/anotherbadchartfile/Chart.yaml
new file mode 100644
index 000000000..8a598473b
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/anotherbadchartfile/Chart.yaml
@@ -0,0 +1,15 @@
+name: "some-chart"
+apiVersion: v3
+description: A Helm chart for Kubernetes
+version: 72445e2
+home: ""
+type: application
+appVersion: 72225e2
+icon: "https://some-url.com/icon.jpeg"
+dependencies:
+  - name: mariadb
+    version: 5.x.x
+    repository: https://charts.helm.sh/stable/
+    condition: mariadb.enabled
+    tags:
+      - database
diff --git a/pkg/lint/rules/testdata/badchartfile/Chart.yaml b/internal/chart/v3/lint/rules/testdata/badchartfile/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badchartfile/Chart.yaml
rename to internal/chart/v3/lint/rules/testdata/badchartfile/Chart.yaml
diff --git a/pkg/lint/rules/testdata/badchartfile/values.yaml b/internal/chart/v3/lint/rules/testdata/badchartfile/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badchartfile/values.yaml
rename to internal/chart/v3/lint/rules/testdata/badchartfile/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/badchartname/Chart.yaml b/internal/chart/v3/lint/rules/testdata/badchartname/Chart.yaml
new file mode 100644
index 000000000..41f452354
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/badchartname/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+version: 0.1.0
+name: "../badchartname"
+type: application
diff --git a/pkg/lint/rules/testdata/badchartname/values.yaml b/internal/chart/v3/lint/rules/testdata/badchartname/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badchartname/values.yaml
rename to internal/chart/v3/lint/rules/testdata/badchartname/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/badcrdfile/Chart.yaml b/internal/chart/v3/lint/rules/testdata/badcrdfile/Chart.yaml
new file mode 100644
index 000000000..3bf007393
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/badcrdfile/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+version: 0.1.0
+name: badcrdfile
+type: application
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml b/internal/chart/v3/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
rename to internal/chart/v3/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
diff --git a/pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml b/internal/chart/v3/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
rename to internal/chart/v3/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
diff --git a/pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep b/internal/chart/v3/lint/rules/testdata/badcrdfile/templates/.gitkeep
similarity index 100%
rename from pkg/lint/rules/testdata/badcrdfile/templates/.gitkeep
rename to internal/chart/v3/lint/rules/testdata/badcrdfile/templates/.gitkeep
diff --git a/pkg/lint/rules/testdata/badcrdfile/values.yaml b/internal/chart/v3/lint/rules/testdata/badcrdfile/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badcrdfile/values.yaml
rename to internal/chart/v3/lint/rules/testdata/badcrdfile/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/badvaluesfile/Chart.yaml b/internal/chart/v3/lint/rules/testdata/badvaluesfile/Chart.yaml
new file mode 100644
index 000000000..aace27e21
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/badvaluesfile/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+name: badvaluesfile
+description: A Helm chart for Kubernetes
+version: 0.0.1
+home: ""
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml b/internal/chart/v3/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
rename to internal/chart/v3/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
diff --git a/pkg/lint/rules/testdata/badvaluesfile/values.yaml b/internal/chart/v3/lint/rules/testdata/badvaluesfile/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badvaluesfile/values.yaml
rename to internal/chart/v3/lint/rules/testdata/badvaluesfile/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/goodone/Chart.yaml b/internal/chart/v3/lint/rules/testdata/goodone/Chart.yaml
new file mode 100644
index 000000000..bf8f5e309
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/goodone/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v3
+name: goodone
+description: good testing chart
+version: 199.44.12345-Alpha.1+cafe009
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/goodone/crds/test-crd.yaml b/internal/chart/v3/lint/rules/testdata/goodone/crds/test-crd.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/goodone/crds/test-crd.yaml
rename to internal/chart/v3/lint/rules/testdata/goodone/crds/test-crd.yaml
diff --git a/pkg/lint/rules/testdata/goodone/templates/goodone.yaml b/internal/chart/v3/lint/rules/testdata/goodone/templates/goodone.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/goodone/templates/goodone.yaml
rename to internal/chart/v3/lint/rules/testdata/goodone/templates/goodone.yaml
diff --git a/pkg/lint/rules/testdata/goodone/values.yaml b/internal/chart/v3/lint/rules/testdata/goodone/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/goodone/values.yaml
rename to internal/chart/v3/lint/rules/testdata/goodone/values.yaml
diff --git a/pkg/lint/rules/testdata/invalidchartfile/Chart.yaml b/internal/chart/v3/lint/rules/testdata/invalidchartfile/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/invalidchartfile/Chart.yaml
rename to internal/chart/v3/lint/rules/testdata/invalidchartfile/Chart.yaml
diff --git a/pkg/lint/rules/testdata/invalidchartfile/values.yaml b/internal/chart/v3/lint/rules/testdata/invalidchartfile/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/invalidchartfile/values.yaml
rename to internal/chart/v3/lint/rules/testdata/invalidchartfile/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/invalidcrdsdir/Chart.yaml b/internal/chart/v3/lint/rules/testdata/invalidcrdsdir/Chart.yaml
new file mode 100644
index 000000000..0f6d1ee98
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/invalidcrdsdir/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+description: A Helm chart for Kubernetes
+version: 0.1.0
+name: invalidcrdsdir
+type: application
+icon: http://riverrun.io
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/crds b/internal/chart/v3/lint/rules/testdata/invalidcrdsdir/crds
similarity index 100%
rename from pkg/lint/rules/testdata/invalidcrdsdir/crds
rename to internal/chart/v3/lint/rules/testdata/invalidcrdsdir/crds
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/values.yaml b/internal/chart/v3/lint/rules/testdata/invalidcrdsdir/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/invalidcrdsdir/values.yaml
rename to internal/chart/v3/lint/rules/testdata/invalidcrdsdir/values.yaml
diff --git a/pkg/lint/rules/testdata/malformed-template/.helmignore b/internal/chart/v3/lint/rules/testdata/malformed-template/.helmignore
similarity index 100%
rename from pkg/lint/rules/testdata/malformed-template/.helmignore
rename to internal/chart/v3/lint/rules/testdata/malformed-template/.helmignore
diff --git a/internal/chart/v3/lint/rules/testdata/malformed-template/Chart.yaml b/internal/chart/v3/lint/rules/testdata/malformed-template/Chart.yaml
new file mode 100644
index 000000000..d46b98cb5
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/malformed-template/Chart.yaml
@@ -0,0 +1,25 @@
+apiVersion: v3
+name: test
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+icon: https://riverrun.io
\ No newline at end of file
diff --git a/pkg/lint/rules/testdata/malformed-template/templates/bad.yaml b/internal/chart/v3/lint/rules/testdata/malformed-template/templates/bad.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/malformed-template/templates/bad.yaml
rename to internal/chart/v3/lint/rules/testdata/malformed-template/templates/bad.yaml
diff --git a/pkg/lint/rules/testdata/malformed-template/values.yaml b/internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/malformed-template/values.yaml
rename to internal/chart/v3/lint/rules/testdata/malformed-template/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/multi-template-fail/Chart.yaml b/internal/chart/v3/lint/rules/testdata/multi-template-fail/Chart.yaml
new file mode 100644
index 000000000..bfb580bea
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/multi-template-fail/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v3
+name: multi-template-fail
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application and it is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/pkg/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml b/internal/chart/v3/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
rename to internal/chart/v3/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/v3-fail/Chart.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/Chart.yaml
new file mode 100644
index 000000000..2a29c33fa
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/v3-fail/Chart.yaml
@@ -0,0 +1,21 @@
+apiVersion: v3
+name: v3-fail
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application and it is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/pkg/lint/rules/testdata/v3-fail/templates/_helpers.tpl b/internal/chart/v3/lint/rules/testdata/v3-fail/templates/_helpers.tpl
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/templates/_helpers.tpl
rename to internal/chart/v3/lint/rules/testdata/v3-fail/templates/_helpers.tpl
diff --git a/pkg/lint/rules/testdata/v3-fail/templates/deployment.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/templates/deployment.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/templates/deployment.yaml
rename to internal/chart/v3/lint/rules/testdata/v3-fail/templates/deployment.yaml
diff --git a/pkg/lint/rules/testdata/v3-fail/templates/ingress.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/templates/ingress.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/templates/ingress.yaml
rename to internal/chart/v3/lint/rules/testdata/v3-fail/templates/ingress.yaml
diff --git a/pkg/lint/rules/testdata/v3-fail/templates/service.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/templates/service.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/templates/service.yaml
rename to internal/chart/v3/lint/rules/testdata/v3-fail/templates/service.yaml
diff --git a/pkg/lint/rules/testdata/v3-fail/values.yaml b/internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/values.yaml
rename to internal/chart/v3/lint/rules/testdata/v3-fail/values.yaml
diff --git a/internal/chart/v3/lint/rules/testdata/withsubchart/Chart.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/Chart.yaml
new file mode 100644
index 000000000..fa15eabaf
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/withsubchart/Chart.yaml
@@ -0,0 +1,16 @@
+apiVersion: v3
+name: withsubchart
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
+icon: http://riverrun.io
+
+dependencies:
+  - name: subchart
+    version: 0.1.16
+    repository: "file://../subchart"
+    import-values:
+      - child: subchart
+        parent: subchart
+
diff --git a/internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
new file mode 100644
index 000000000..35b13e70d
--- /dev/null
+++ b/internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v3
+name: subchart
+description: A Helm chart for Kubernetes
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
diff --git a/pkg/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
rename to internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
diff --git a/pkg/lint/rules/testdata/withsubchart/charts/subchart/values.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
rename to internal/chart/v3/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
diff --git a/pkg/lint/rules/testdata/withsubchart/templates/mainchart.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/templates/mainchart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/templates/mainchart.yaml
rename to internal/chart/v3/lint/rules/testdata/withsubchart/templates/mainchart.yaml
diff --git a/pkg/lint/rules/testdata/withsubchart/values.yaml b/internal/chart/v3/lint/rules/testdata/withsubchart/values.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/values.yaml
rename to internal/chart/v3/lint/rules/testdata/withsubchart/values.yaml
diff --git a/internal/chart/v3/lint/rules/values.go b/internal/chart/v3/lint/rules/values.go
new file mode 100644
index 000000000..adf2e2c52
--- /dev/null
+++ b/internal/chart/v3/lint/rules/values.go
@@ -0,0 +1,79 @@
+/*
+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 rules
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"helm.sh/helm/v4/internal/chart/v3/lint/support"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
+)
+
+// ValuesWithOverrides tests the values.yaml file.
+//
+// If a schema is present in the chart, values are tested against that. Otherwise,
+// they are only tested for well-formedness.
+//
+// If additional values are supplied, they are coalesced into the values in values.yaml.
+func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]interface{}) {
+	file := "values.yaml"
+	vf := filepath.Join(linter.ChartDir, file)
+	fileExists := linter.RunLinterRule(support.InfoSev, file, validateValuesFileExistence(vf))
+
+	if !fileExists {
+		return
+	}
+
+	linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf, valueOverrides))
+}
+
+func validateValuesFileExistence(valuesPath string) error {
+	_, err := os.Stat(valuesPath)
+	if err != nil {
+		return fmt.Errorf("file does not exist")
+	}
+	return nil
+}
+
+func validateValuesFile(valuesPath string, overrides map[string]interface{}) error {
+	values, err := common.ReadValuesFile(valuesPath)
+	if err != nil {
+		return fmt.Errorf("unable to parse YAML: %w", err)
+	}
+
+	// Helm 3.0.0 carried over the values linting from Helm 2.x, which only tests the top
+	// level values against the top-level expectations. Subchart values are not linted.
+	// We could change that. For now, though, we retain that strategy, and thus can
+	// coalesce tables (like reuse-values does) instead of doing the full chart
+	// CoalesceValues
+	coalescedValues := util.CoalesceTables(make(map[string]interface{}, len(overrides)), overrides)
+	coalescedValues = util.CoalesceTables(coalescedValues, values)
+
+	ext := filepath.Ext(valuesPath)
+	schemaPath := valuesPath[:len(valuesPath)-len(ext)] + ".schema.json"
+	schema, err := os.ReadFile(schemaPath)
+	if len(schema) == 0 {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+	return util.ValidateAgainstSingleSchema(coalescedValues, schema)
+}
diff --git a/pkg/lint/rules/values_test.go b/internal/chart/v3/lint/rules/values_test.go
similarity index 100%
rename from pkg/lint/rules/values_test.go
rename to internal/chart/v3/lint/rules/values_test.go
diff --git a/internal/chart/v3/util/errors_test.go b/internal/chart/v3/lint/support/doc.go
similarity index 67%
rename from internal/chart/v3/util/errors_test.go
rename to internal/chart/v3/lint/support/doc.go
index b8ae86384..2d54a9b7d 100644
--- a/internal/chart/v3/util/errors_test.go
+++ b/internal/chart/v3/lint/support/doc.go
@@ -14,24 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
-
-import (
-	"testing"
-)
-
-func TestErrorNoTableDoesNotPanic(t *testing.T) {
-	x := "empty"
-
-	y := ErrNoTable{x}
-
-	t.Logf("error is: %s", y)
-}
-
-func TestErrorNoValueDoesNotPanic(t *testing.T) {
-	x := "empty"
-
-	y := ErrNoValue{x}
+/*
+Package support contains tools for linting charts.
 
-	t.Logf("error is: %s", y)
-}
+Linting is the process of testing charts for errors or warnings regarding
+formatting, compilation, or standards compliance.
+*/
+package support // import "helm.sh/helm/v4/internal/chart/v3/lint/support"
diff --git a/pkg/lint/support/message.go b/internal/chart/v3/lint/support/message.go
similarity index 100%
rename from pkg/lint/support/message.go
rename to internal/chart/v3/lint/support/message.go
diff --git a/pkg/lint/support/message_test.go b/internal/chart/v3/lint/support/message_test.go
similarity index 100%
rename from pkg/lint/support/message_test.go
rename to internal/chart/v3/lint/support/message_test.go
diff --git a/internal/chart/v3/loader/load.go b/internal/chart/v3/loader/load.go
index 30bafdad4..2959fc71d 100644
--- a/internal/chart/v3/loader/load.go
+++ b/internal/chart/v3/loader/load.go
@@ -31,6 +31,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // ChartLoader loads a chart.
@@ -79,7 +80,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 	// do not rely on assumed ordering of files in the chart and crash
 	// if Chart.yaml was not coming early enough to initialize metadata
 	for _, f := range files {
-		c.Raw = append(c.Raw, &chart.File{Name: f.Name, Data: f.Data})
+		c.Raw = append(c.Raw, &common.File{Name: f.Name, Data: f.Data})
 		if f.Name == "Chart.yaml" {
 			if c.Metadata == nil {
 				c.Metadata = new(chart.Metadata)
@@ -115,10 +116,10 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			c.Schema = f.Data
 
 		case strings.HasPrefix(f.Name, "templates/"):
-			c.Templates = append(c.Templates, &chart.File{Name: f.Name, Data: f.Data})
+			c.Templates = append(c.Templates, &common.File{Name: f.Name, Data: f.Data})
 		case strings.HasPrefix(f.Name, "charts/"):
 			if filepath.Ext(f.Name) == ".prov" {
-				c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+				c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 				continue
 			}
 
@@ -126,7 +127,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			cname := strings.SplitN(fname, "/", 2)[0]
 			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
 		default:
-			c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+			c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 		}
 	}
 
diff --git a/internal/chart/v3/loader/load_test.go b/internal/chart/v3/loader/load_test.go
index e770923ff..1d8ca836a 100644
--- a/internal/chart/v3/loader/load_test.go
+++ b/internal/chart/v3/loader/load_test.go
@@ -31,6 +31,7 @@ import (
 	"time"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func TestLoadDir(t *testing.T) {
@@ -491,7 +492,7 @@ foo:
 	}
 }
 
-func TestMergeValues(t *testing.T) {
+func TestMergeValuesV3(t *testing.T) {
 	nestedMap := map[string]interface{}{
 		"foo": "bar",
 		"baz": map[string]string{
@@ -701,7 +702,7 @@ func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
 	}
 }
 
-func verifyBomStripped(t *testing.T, files []*chart.File) {
+func verifyBomStripped(t *testing.T, files []*common.File) {
 	t.Helper()
 	for _, file := range files {
 		if bytes.HasPrefix(file.Data, utf8bom) {
diff --git a/internal/chart/v3/util/capabilities.go b/internal/chart/v3/util/capabilities.go
deleted file mode 100644
index 23b6d46fa..000000000
--- a/internal/chart/v3/util/capabilities.go
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-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 util
-
-import (
-	"fmt"
-	"slices"
-	"strconv"
-
-	"github.com/Masterminds/semver/v3"
-	"k8s.io/client-go/kubernetes/scheme"
-
-	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
-
-	helmversion "helm.sh/helm/v4/internal/version"
-)
-
-var (
-	// The Kubernetes version can be set by LDFLAGS. In order to do that the value
-	// must be a string.
-	k8sVersionMajor = "1"
-	k8sVersionMinor = "20"
-
-	// DefaultVersionSet is the default version set, which includes only Core V1 ("v1").
-	DefaultVersionSet = allKnownVersions()
-
-	// DefaultCapabilities is the default set of capabilities.
-	DefaultCapabilities = &Capabilities{
-		KubeVersion: KubeVersion{
-			Version: fmt.Sprintf("v%s.%s.0", k8sVersionMajor, k8sVersionMinor),
-			Major:   k8sVersionMajor,
-			Minor:   k8sVersionMinor,
-		},
-		APIVersions: DefaultVersionSet,
-		HelmVersion: helmversion.Get(),
-	}
-)
-
-// Capabilities describes the capabilities of the Kubernetes cluster.
-type Capabilities struct {
-	// KubeVersion is the Kubernetes version.
-	KubeVersion KubeVersion
-	// APIVersions are supported Kubernetes API versions.
-	APIVersions VersionSet
-	// HelmVersion is the build information for this helm version
-	HelmVersion helmversion.BuildInfo
-}
-
-func (capabilities *Capabilities) Copy() *Capabilities {
-	return &Capabilities{
-		KubeVersion: capabilities.KubeVersion,
-		APIVersions: capabilities.APIVersions,
-		HelmVersion: capabilities.HelmVersion,
-	}
-}
-
-// KubeVersion is the Kubernetes version.
-type KubeVersion struct {
-	Version string // Kubernetes version
-	Major   string // Kubernetes major version
-	Minor   string // Kubernetes minor version
-}
-
-// String implements fmt.Stringer
-func (kv *KubeVersion) String() string { return kv.Version }
-
-// GitVersion returns the Kubernetes version string.
-//
-// Deprecated: use KubeVersion.Version.
-func (kv *KubeVersion) GitVersion() string { return kv.Version }
-
-// ParseKubeVersion parses kubernetes version from string
-func ParseKubeVersion(version string) (*KubeVersion, error) {
-	sv, err := semver.NewVersion(version)
-	if err != nil {
-		return nil, err
-	}
-	return &KubeVersion{
-		Version: "v" + sv.String(),
-		Major:   strconv.FormatUint(sv.Major(), 10),
-		Minor:   strconv.FormatUint(sv.Minor(), 10),
-	}, nil
-}
-
-// VersionSet is a set of Kubernetes API versions.
-type VersionSet []string
-
-// Has returns true if the version string is in the set.
-//
-//	vs.Has("apps/v1")
-func (v VersionSet) Has(apiVersion string) bool {
-	return slices.Contains(v, apiVersion)
-}
-
-func allKnownVersions() VersionSet {
-	// We should register the built in extension APIs as well so CRDs are
-	// supported in the default version set. This has caused problems with `helm
-	// template` in the past, so let's be safe
-	apiextensionsv1beta1.AddToScheme(scheme.Scheme)
-	apiextensionsv1.AddToScheme(scheme.Scheme)
-
-	groups := scheme.Scheme.PrioritizedVersionsAllGroups()
-	vs := make(VersionSet, 0, len(groups))
-	for _, gv := range groups {
-		vs = append(vs, gv.String())
-	}
-	return vs
-}
diff --git a/internal/chart/v3/util/capabilities_test.go b/internal/chart/v3/util/capabilities_test.go
deleted file mode 100644
index aa9be9db8..000000000
--- a/internal/chart/v3/util/capabilities_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-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 util
-
-import (
-	"testing"
-)
-
-func TestVersionSet(t *testing.T) {
-	vs := VersionSet{"v1", "apps/v1"}
-	if d := len(vs); d != 2 {
-		t.Errorf("Expected 2 versions, got %d", d)
-	}
-
-	if !vs.Has("apps/v1") {
-		t.Error("Expected to find apps/v1")
-	}
-
-	if vs.Has("Spanish/inquisition") {
-		t.Error("No one expects the Spanish/inquisition")
-	}
-}
-
-func TestDefaultVersionSet(t *testing.T) {
-	if !DefaultVersionSet.Has("v1") {
-		t.Error("Expected core v1 version set")
-	}
-}
-
-func TestDefaultCapabilities(t *testing.T) {
-	kv := DefaultCapabilities.KubeVersion
-	if kv.String() != "v1.20.0" {
-		t.Errorf("Expected default KubeVersion.String() to be v1.20.0, got %q", kv.String())
-	}
-	if kv.Version != "v1.20.0" {
-		t.Errorf("Expected default KubeVersion.Version to be v1.20.0, got %q", kv.Version)
-	}
-	if kv.GitVersion() != "v1.20.0" {
-		t.Errorf("Expected default KubeVersion.GitVersion() to be v1.20.0, got %q", kv.Version)
-	}
-	if kv.Major != "1" {
-		t.Errorf("Expected default KubeVersion.Major to be 1, got %q", kv.Major)
-	}
-	if kv.Minor != "20" {
-		t.Errorf("Expected default KubeVersion.Minor to be 20, got %q", kv.Minor)
-	}
-}
-
-func TestDefaultCapabilitiesHelmVersion(t *testing.T) {
-	hv := DefaultCapabilities.HelmVersion
-
-	if hv.Version != "v4.0" {
-		t.Errorf("Expected default HelmVersion to be v4.0, got %q", hv.Version)
-	}
-}
-
-func TestParseKubeVersion(t *testing.T) {
-	kv, err := ParseKubeVersion("v1.16.0")
-	if err != nil {
-		t.Errorf("Expected v1.16.0 to parse successfully")
-	}
-	if kv.Version != "v1.16.0" {
-		t.Errorf("Expected parsed KubeVersion.Version to be v1.16.0, got %q", kv.String())
-	}
-	if kv.Major != "1" {
-		t.Errorf("Expected parsed KubeVersion.Major to be 1, got %q", kv.Major)
-	}
-	if kv.Minor != "16" {
-		t.Errorf("Expected parsed KubeVersion.Minor to be 16, got %q", kv.Minor)
-	}
-}
diff --git a/internal/chart/v3/util/coalesce.go b/internal/chart/v3/util/coalesce.go
deleted file mode 100644
index caea2e119..000000000
--- a/internal/chart/v3/util/coalesce.go
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-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 util
-
-import (
-	"fmt"
-	"log"
-	"maps"
-
-	"github.com/mitchellh/copystructure"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-func concatPrefix(a, b string) string {
-	if a == "" {
-		return b
-	}
-	return fmt.Sprintf("%s.%s", a, b)
-}
-
-// CoalesceValues coalesces all of the values in a chart (and its subcharts).
-//
-// Values are coalesced together using the following rules:
-//
-//   - Values in a higher level chart always override values in a lower-level
-//     dependency chart
-//   - Scalar values and arrays are replaced, maps are merged
-//   - A chart has access to all of the variables for it, as well as all of
-//     the values destined for its dependencies.
-func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
-	valsCopy, err := copyValues(vals)
-	if err != nil {
-		return vals, err
-	}
-	return coalesce(log.Printf, chrt, valsCopy, "", false)
-}
-
-// MergeValues is used to merge the values in a chart and its subcharts. This
-// is different from Coalescing as nil/null values are preserved.
-//
-// Values are coalesced together using the following rules:
-//
-//   - Values in a higher level chart always override values in a lower-level
-//     dependency chart
-//   - Scalar values and arrays are replaced, maps are merged
-//   - A chart has access to all of the variables for it, as well as all of
-//     the values destined for its dependencies.
-//
-// Retaining Nils is useful when processes early in a Helm action or business
-// logic need to retain them for when Coalescing will happen again later in the
-// business logic.
-func MergeValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
-	valsCopy, err := copyValues(vals)
-	if err != nil {
-		return vals, err
-	}
-	return coalesce(log.Printf, chrt, valsCopy, "", true)
-}
-
-func copyValues(vals map[string]interface{}) (Values, error) {
-	v, err := copystructure.Copy(vals)
-	if err != nil {
-		return vals, err
-	}
-
-	valsCopy := v.(map[string]interface{})
-	// if we have an empty map, make sure it is initialized
-	if valsCopy == nil {
-		valsCopy = make(map[string]interface{})
-	}
-
-	return valsCopy, nil
-}
-
-type printFn func(format string, v ...interface{})
-
-// coalesce coalesces the dest values and the chart values, giving priority to the dest values.
-//
-// This is a helper function for CoalesceValues and MergeValues.
-//
-// Note, the merge argument specifies whether this is being used by MergeValues
-// or CoalesceValues. Coalescing removes null values and their keys in some
-// situations while merging keeps the null values.
-func coalesce(printf printFn, ch *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
-	coalesceValues(printf, ch, dest, prefix, merge)
-	return coalesceDeps(printf, ch, dest, prefix, merge)
-}
-
-// coalesceDeps coalesces the dependencies of the given chart.
-func coalesceDeps(printf printFn, chrt *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
-	for _, subchart := range chrt.Dependencies() {
-		if c, ok := dest[subchart.Name()]; !ok {
-			// If dest doesn't already have the key, create it.
-			dest[subchart.Name()] = make(map[string]interface{})
-		} else if !istable(c) {
-			return dest, fmt.Errorf("type mismatch on %s: %t", subchart.Name(), c)
-		}
-		if dv, ok := dest[subchart.Name()]; ok {
-			dvmap := dv.(map[string]interface{})
-			subPrefix := concatPrefix(prefix, chrt.Metadata.Name)
-			// Get globals out of dest and merge them into dvmap.
-			coalesceGlobals(printf, dvmap, dest, subPrefix, merge)
-			// Now coalesce the rest of the values.
-			var err error
-			dest[subchart.Name()], err = coalesce(printf, subchart, dvmap, subPrefix, merge)
-			if err != nil {
-				return dest, err
-			}
-		}
-	}
-	return dest, nil
-}
-
-// coalesceGlobals copies the globals out of src and merges them into dest.
-//
-// For convenience, returns dest.
-func coalesceGlobals(printf printFn, dest, src map[string]interface{}, prefix string, _ bool) {
-	var dg, sg map[string]interface{}
-
-	if destglob, ok := dest[GlobalKey]; !ok {
-		dg = make(map[string]interface{})
-	} else if dg, ok = destglob.(map[string]interface{}); !ok {
-		printf("warning: skipping globals because destination %s is not a table.", GlobalKey)
-		return
-	}
-
-	if srcglob, ok := src[GlobalKey]; !ok {
-		sg = make(map[string]interface{})
-	} else if sg, ok = srcglob.(map[string]interface{}); !ok {
-		printf("warning: skipping globals because source %s is not a table.", GlobalKey)
-		return
-	}
-
-	// EXPERIMENTAL: In the past, we have disallowed globals to test tables. This
-	// reverses that decision. It may somehow be possible to introduce a loop
-	// here, but I haven't found a way. So for the time being, let's allow
-	// tables in globals.
-	for key, val := range sg {
-		if istable(val) {
-			vv := copyMap(val.(map[string]interface{}))
-			if destv, ok := dg[key]; !ok {
-				// Here there is no merge. We're just adding.
-				dg[key] = vv
-			} else {
-				if destvmap, ok := destv.(map[string]interface{}); !ok {
-					printf("Conflict: cannot merge map onto non-map for %q. Skipping.", key)
-				} else {
-					// Basically, we reverse order of coalesce here to merge
-					// top-down.
-					subPrefix := concatPrefix(prefix, key)
-					// In this location coalesceTablesFullKey should always have
-					// merge set to true. The output of coalesceGlobals is run
-					// through coalesce where any nils will be removed.
-					coalesceTablesFullKey(printf, vv, destvmap, subPrefix, true)
-					dg[key] = vv
-				}
-			}
-		} else if dv, ok := dg[key]; ok && istable(dv) {
-			// It's not clear if this condition can actually ever trigger.
-			printf("key %s is table. Skipping", key)
-		} else {
-			// TODO: Do we need to do any additional checking on the value?
-			dg[key] = val
-		}
-	}
-	dest[GlobalKey] = dg
-}
-
-func copyMap(src map[string]interface{}) map[string]interface{} {
-	m := make(map[string]interface{}, len(src))
-	maps.Copy(m, src)
-	return m
-}
-
-// coalesceValues builds up a values map for a particular chart.
-//
-// Values in v will override the values in the chart.
-func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, prefix string, merge bool) {
-	subPrefix := concatPrefix(prefix, c.Metadata.Name)
-
-	// Using c.Values directly when coalescing a table can cause problems where
-	// the original c.Values is altered. Creating a deep copy stops the problem.
-	// This section is fault-tolerant as there is no ability to return an error.
-	valuesCopy, err := copystructure.Copy(c.Values)
-	var vc map[string]interface{}
-	var ok bool
-	if err != nil {
-		// If there is an error something is wrong with copying c.Values it
-		// means there is a problem in the deep copying package or something
-		// wrong with c.Values. In this case we will use c.Values and report
-		// an error.
-		printf("warning: unable to copy values, err: %s", err)
-		vc = c.Values
-	} else {
-		vc, ok = valuesCopy.(map[string]interface{})
-		if !ok {
-			// c.Values has a map[string]interface{} structure. If the copy of
-			// it cannot be treated as map[string]interface{} there is something
-			// strangely wrong. Log it and use c.Values
-			printf("warning: unable to convert values copy to values type")
-			vc = c.Values
-		}
-	}
-
-	for key, val := range vc {
-		if value, ok := v[key]; ok {
-			if value == nil && !merge {
-				// When the YAML value is null and we are coalescing instead of
-				// merging, we remove the value's key.
-				// This allows Helm's various sources of values (value files or --set) to
-				// remove incompatible keys from any previous chart, file, or set values.
-				delete(v, key)
-			} else if dest, ok := value.(map[string]interface{}); ok {
-				// if v[key] is a table, merge nv's val table into v[key].
-				src, ok := val.(map[string]interface{})
-				if !ok {
-					// If the original value is nil, there is nothing to coalesce, so we don't print
-					// the warning
-					if val != nil {
-						printf("warning: skipped value for %s.%s: Not a table.", subPrefix, key)
-					}
-				} else {
-					// If the key is a child chart, coalesce tables with Merge set to true
-					merge := childChartMergeTrue(c, key, merge)
-
-					// Because v has higher precedence than nv, dest values override src
-					// values.
-					coalesceTablesFullKey(printf, dest, src, concatPrefix(subPrefix, key), merge)
-				}
-			}
-		} else {
-			// If the key is not in v, copy it from nv.
-			v[key] = val
-		}
-	}
-}
-
-func childChartMergeTrue(chrt *chart.Chart, key string, merge bool) bool {
-	for _, subchart := range chrt.Dependencies() {
-		if subchart.Name() == key {
-			return true
-		}
-	}
-	return merge
-}
-
-// CoalesceTables merges a source map into a destination map.
-//
-// dest is considered authoritative.
-func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} {
-	return coalesceTablesFullKey(log.Printf, dst, src, "", false)
-}
-
-func MergeTables(dst, src map[string]interface{}) map[string]interface{} {
-	return coalesceTablesFullKey(log.Printf, dst, src, "", true)
-}
-
-// coalesceTablesFullKey merges a source map into a destination map.
-//
-// dest is considered authoritative.
-func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, prefix string, merge bool) map[string]interface{} {
-	// When --reuse-values is set but there are no modifications yet, return new values
-	if src == nil {
-		return dst
-	}
-	if dst == nil {
-		return src
-	}
-	for key, val := range dst {
-		if val == nil {
-			src[key] = nil
-		}
-	}
-	// Because dest has higher precedence than src, dest values override src
-	// values.
-	for key, val := range src {
-		fullkey := concatPrefix(prefix, key)
-		if dv, ok := dst[key]; ok && !merge && dv == nil {
-			delete(dst, key)
-		} else if !ok {
-			dst[key] = val
-		} else if istable(val) {
-			if istable(dv) {
-				coalesceTablesFullKey(printf, dv.(map[string]interface{}), val.(map[string]interface{}), fullkey, merge)
-			} else {
-				printf("warning: cannot overwrite table with non table for %s (%v)", fullkey, val)
-			}
-		} else if istable(dv) && val != nil {
-			printf("warning: destination for %s is a table. Ignoring non-table value (%v)", fullkey, val)
-		}
-	}
-	return dst
-}
diff --git a/internal/chart/v3/util/coalesce_test.go b/internal/chart/v3/util/coalesce_test.go
deleted file mode 100644
index 4770b601d..000000000
--- a/internal/chart/v3/util/coalesce_test.go
+++ /dev/null
@@ -1,723 +0,0 @@
-/*
-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 util
-
-import (
-	"encoding/json"
-	"fmt"
-	"maps"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-// ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
-var testCoalesceValuesYaml = []byte(`
-top: yup
-bottom: null
-right: Null
-left: NULL
-front: ~
-back: ""
-nested:
-  boat: null
-
-global:
-  name: Ishmael
-  subject: Queequeg
-  nested:
-    boat: true
-
-pequod:
-  boat: null
-  global:
-    name: Stinky
-    harpooner: Tashtego
-    nested:
-      boat: false
-      sail: true
-      foo2: null
-  ahab:
-    scope: whale
-    boat: null
-    nested:
-      foo: true
-      boat: null
-    object: null
-`)
-
-func withDeps(c *chart.Chart, deps ...*chart.Chart) *chart.Chart {
-	c.AddDependency(deps...)
-	return c
-}
-
-func TestCoalesceValues(t *testing.T) {
-	is := assert.New(t)
-
-	c := withDeps(&chart.Chart{
-		Metadata: &chart.Metadata{Name: "moby"},
-		Values: map[string]interface{}{
-			"back":     "exists",
-			"bottom":   "exists",
-			"front":    "exists",
-			"left":     "exists",
-			"name":     "moby",
-			"nested":   map[string]interface{}{"boat": true},
-			"override": "bad",
-			"right":    "exists",
-			"scope":    "moby",
-			"top":      "nope",
-			"global": map[string]interface{}{
-				"nested2": map[string]interface{}{"l0": "moby"},
-			},
-			"pequod": map[string]interface{}{
-				"boat": "maybe",
-				"ahab": map[string]interface{}{
-					"boat":   "maybe",
-					"nested": map[string]interface{}{"boat": "maybe"},
-				},
-			},
-		},
-	},
-		withDeps(&chart.Chart{
-			Metadata: &chart.Metadata{Name: "pequod"},
-			Values: map[string]interface{}{
-				"name":  "pequod",
-				"scope": "pequod",
-				"global": map[string]interface{}{
-					"nested2": map[string]interface{}{"l1": "pequod"},
-				},
-				"boat": false,
-				"ahab": map[string]interface{}{
-					"boat":   false,
-					"nested": map[string]interface{}{"boat": false},
-				},
-			},
-		},
-			&chart.Chart{
-				Metadata: &chart.Metadata{Name: "ahab"},
-				Values: map[string]interface{}{
-					"global": map[string]interface{}{
-						"nested":  map[string]interface{}{"foo": "bar", "foo2": "bar2"},
-						"nested2": map[string]interface{}{"l2": "ahab"},
-					},
-					"scope":  "ahab",
-					"name":   "ahab",
-					"boat":   true,
-					"nested": map[string]interface{}{"foo": false, "boat": true},
-					"object": map[string]interface{}{"foo": "bar"},
-				},
-			},
-		),
-		&chart.Chart{
-			Metadata: &chart.Metadata{Name: "spouter"},
-			Values: map[string]interface{}{
-				"scope": "spouter",
-				"global": map[string]interface{}{
-					"nested2": map[string]interface{}{"l1": "spouter"},
-				},
-			},
-		},
-	)
-
-	vals, err := ReadValues(testCoalesceValuesYaml)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// taking a copy of the values before passing it
-	// to CoalesceValues as argument, so that we can
-	// use it for asserting later
-	valsCopy := make(Values, len(vals))
-	maps.Copy(valsCopy, vals)
-
-	v, err := CoalesceValues(c, vals)
-	if err != nil {
-		t.Fatal(err)
-	}
-	j, _ := json.MarshalIndent(v, "", "  ")
-	t.Logf("Coalesced Values: %s", string(j))
-
-	tests := []struct {
-		tpl    string
-		expect string
-	}{
-		{"{{.top}}", "yup"},
-		{"{{.back}}", ""},
-		{"{{.name}}", "moby"},
-		{"{{.global.name}}", "Ishmael"},
-		{"{{.global.subject}}", "Queequeg"},
-		{"{{.global.harpooner}}", "<no value>"},
-		{"{{.pequod.name}}", "pequod"},
-		{"{{.pequod.ahab.name}}", "ahab"},
-		{"{{.pequod.ahab.scope}}", "whale"},
-		{"{{.pequod.ahab.nested.foo}}", "true"},
-		{"{{.pequod.ahab.global.name}}", "Ishmael"},
-		{"{{.pequod.ahab.global.nested.foo}}", "bar"},
-		{"{{.pequod.ahab.global.nested.foo2}}", "<no value>"},
-		{"{{.pequod.ahab.global.subject}}", "Queequeg"},
-		{"{{.pequod.ahab.global.harpooner}}", "Tashtego"},
-		{"{{.pequod.global.name}}", "Ishmael"},
-		{"{{.pequod.global.nested.foo}}", "<no value>"},
-		{"{{.pequod.global.subject}}", "Queequeg"},
-		{"{{.spouter.global.name}}", "Ishmael"},
-		{"{{.spouter.global.harpooner}}", "<no value>"},
-
-		{"{{.global.nested.boat}}", "true"},
-		{"{{.pequod.global.nested.boat}}", "true"},
-		{"{{.spouter.global.nested.boat}}", "true"},
-		{"{{.pequod.global.nested.sail}}", "true"},
-		{"{{.spouter.global.nested.sail}}", "<no value>"},
-
-		{"{{.global.nested2.l0}}", "moby"},
-		{"{{.global.nested2.l1}}", "<no value>"},
-		{"{{.global.nested2.l2}}", "<no value>"},
-		{"{{.pequod.global.nested2.l0}}", "moby"},
-		{"{{.pequod.global.nested2.l1}}", "pequod"},
-		{"{{.pequod.global.nested2.l2}}", "<no value>"},
-		{"{{.pequod.ahab.global.nested2.l0}}", "moby"},
-		{"{{.pequod.ahab.global.nested2.l1}}", "pequod"},
-		{"{{.pequod.ahab.global.nested2.l2}}", "ahab"},
-		{"{{.spouter.global.nested2.l0}}", "moby"},
-		{"{{.spouter.global.nested2.l1}}", "spouter"},
-		{"{{.spouter.global.nested2.l2}}", "<no value>"},
-	}
-
-	for _, tt := range tests {
-		if o, err := ttpl(tt.tpl, v); err != nil || o != tt.expect {
-			t.Errorf("Expected %q to expand to %q, got %q", tt.tpl, tt.expect, o)
-		}
-	}
-
-	nullKeys := []string{"bottom", "right", "left", "front"}
-	for _, nullKey := range nullKeys {
-		if _, ok := v[nullKey]; ok {
-			t.Errorf("Expected key %q to be removed, still present", nullKey)
-		}
-	}
-
-	if _, ok := v["nested"].(map[string]interface{})["boat"]; ok {
-		t.Error("Expected nested boat key to be removed, still present")
-	}
-
-	subchart := v["pequod"].(map[string]interface{})
-	if _, ok := subchart["boat"]; ok {
-		t.Error("Expected subchart boat key to be removed, still present")
-	}
-
-	subsubchart := subchart["ahab"].(map[string]interface{})
-	if _, ok := subsubchart["boat"]; ok {
-		t.Error("Expected sub-subchart ahab boat key to be removed, still present")
-	}
-
-	if _, ok := subsubchart["nested"].(map[string]interface{})["boat"]; ok {
-		t.Error("Expected sub-subchart nested boat key to be removed, still present")
-	}
-
-	if _, ok := subsubchart["object"]; ok {
-		t.Error("Expected sub-subchart object map to be removed, still present")
-	}
-
-	// CoalesceValues should not mutate the passed arguments
-	is.Equal(valsCopy, vals)
-}
-
-func TestMergeValues(t *testing.T) {
-	is := assert.New(t)
-
-	c := withDeps(&chart.Chart{
-		Metadata: &chart.Metadata{Name: "moby"},
-		Values: map[string]interface{}{
-			"back":     "exists",
-			"bottom":   "exists",
-			"front":    "exists",
-			"left":     "exists",
-			"name":     "moby",
-			"nested":   map[string]interface{}{"boat": true},
-			"override": "bad",
-			"right":    "exists",
-			"scope":    "moby",
-			"top":      "nope",
-			"global": map[string]interface{}{
-				"nested2": map[string]interface{}{"l0": "moby"},
-			},
-		},
-	},
-		withDeps(&chart.Chart{
-			Metadata: &chart.Metadata{Name: "pequod"},
-			Values: map[string]interface{}{
-				"name":  "pequod",
-				"scope": "pequod",
-				"global": map[string]interface{}{
-					"nested2": map[string]interface{}{"l1": "pequod"},
-				},
-			},
-		},
-			&chart.Chart{
-				Metadata: &chart.Metadata{Name: "ahab"},
-				Values: map[string]interface{}{
-					"global": map[string]interface{}{
-						"nested":  map[string]interface{}{"foo": "bar"},
-						"nested2": map[string]interface{}{"l2": "ahab"},
-					},
-					"scope":  "ahab",
-					"name":   "ahab",
-					"boat":   true,
-					"nested": map[string]interface{}{"foo": false, "bar": true},
-				},
-			},
-		),
-		&chart.Chart{
-			Metadata: &chart.Metadata{Name: "spouter"},
-			Values: map[string]interface{}{
-				"scope": "spouter",
-				"global": map[string]interface{}{
-					"nested2": map[string]interface{}{"l1": "spouter"},
-				},
-			},
-		},
-	)
-
-	vals, err := ReadValues(testCoalesceValuesYaml)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// taking a copy of the values before passing it
-	// to MergeValues as argument, so that we can
-	// use it for asserting later
-	valsCopy := make(Values, len(vals))
-	maps.Copy(valsCopy, vals)
-
-	v, err := MergeValues(c, vals)
-	if err != nil {
-		t.Fatal(err)
-	}
-	j, _ := json.MarshalIndent(v, "", "  ")
-	t.Logf("Coalesced Values: %s", string(j))
-
-	tests := []struct {
-		tpl    string
-		expect string
-	}{
-		{"{{.top}}", "yup"},
-		{"{{.back}}", ""},
-		{"{{.name}}", "moby"},
-		{"{{.global.name}}", "Ishmael"},
-		{"{{.global.subject}}", "Queequeg"},
-		{"{{.global.harpooner}}", "<no value>"},
-		{"{{.pequod.name}}", "pequod"},
-		{"{{.pequod.ahab.name}}", "ahab"},
-		{"{{.pequod.ahab.scope}}", "whale"},
-		{"{{.pequod.ahab.nested.foo}}", "true"},
-		{"{{.pequod.ahab.global.name}}", "Ishmael"},
-		{"{{.pequod.ahab.global.nested.foo}}", "bar"},
-		{"{{.pequod.ahab.global.subject}}", "Queequeg"},
-		{"{{.pequod.ahab.global.harpooner}}", "Tashtego"},
-		{"{{.pequod.global.name}}", "Ishmael"},
-		{"{{.pequod.global.nested.foo}}", "<no value>"},
-		{"{{.pequod.global.subject}}", "Queequeg"},
-		{"{{.spouter.global.name}}", "Ishmael"},
-		{"{{.spouter.global.harpooner}}", "<no value>"},
-
-		{"{{.global.nested.boat}}", "true"},
-		{"{{.pequod.global.nested.boat}}", "true"},
-		{"{{.spouter.global.nested.boat}}", "true"},
-		{"{{.pequod.global.nested.sail}}", "true"},
-		{"{{.spouter.global.nested.sail}}", "<no value>"},
-
-		{"{{.global.nested2.l0}}", "moby"},
-		{"{{.global.nested2.l1}}", "<no value>"},
-		{"{{.global.nested2.l2}}", "<no value>"},
-		{"{{.pequod.global.nested2.l0}}", "moby"},
-		{"{{.pequod.global.nested2.l1}}", "pequod"},
-		{"{{.pequod.global.nested2.l2}}", "<no value>"},
-		{"{{.pequod.ahab.global.nested2.l0}}", "moby"},
-		{"{{.pequod.ahab.global.nested2.l1}}", "pequod"},
-		{"{{.pequod.ahab.global.nested2.l2}}", "ahab"},
-		{"{{.spouter.global.nested2.l0}}", "moby"},
-		{"{{.spouter.global.nested2.l1}}", "spouter"},
-		{"{{.spouter.global.nested2.l2}}", "<no value>"},
-	}
-
-	for _, tt := range tests {
-		if o, err := ttpl(tt.tpl, v); err != nil || o != tt.expect {
-			t.Errorf("Expected %q to expand to %q, got %q", tt.tpl, tt.expect, o)
-		}
-	}
-
-	// nullKeys is different from coalescing. Here the null/nil values are not
-	// removed.
-	nullKeys := []string{"bottom", "right", "left", "front"}
-	for _, nullKey := range nullKeys {
-		if vv, ok := v[nullKey]; !ok {
-			t.Errorf("Expected key %q to be present but it was removed", nullKey)
-		} else if vv != nil {
-			t.Errorf("Expected key %q to be null but it has a value of %v", nullKey, vv)
-		}
-	}
-
-	if _, ok := v["nested"].(map[string]interface{})["boat"]; !ok {
-		t.Error("Expected nested boat key to be present but it was removed")
-	}
-
-	subchart := v["pequod"].(map[string]interface{})["ahab"].(map[string]interface{})
-	if _, ok := subchart["boat"]; !ok {
-		t.Error("Expected subchart boat key to be present but it was removed")
-	}
-
-	if _, ok := subchart["nested"].(map[string]interface{})["bar"]; !ok {
-		t.Error("Expected subchart nested bar key to be present but it was removed")
-	}
-
-	// CoalesceValues should not mutate the passed arguments
-	is.Equal(valsCopy, vals)
-}
-
-func TestCoalesceTables(t *testing.T) {
-	dst := map[string]interface{}{
-		"name": "Ishmael",
-		"address": map[string]interface{}{
-			"street":  "123 Spouter Inn Ct.",
-			"city":    "Nantucket",
-			"country": nil,
-		},
-		"details": map[string]interface{}{
-			"friends": []string{"Tashtego"},
-		},
-		"boat": "pequod",
-		"hole": nil,
-	}
-	src := map[string]interface{}{
-		"occupation": "whaler",
-		"address": map[string]interface{}{
-			"state":   "MA",
-			"street":  "234 Spouter Inn Ct.",
-			"country": "US",
-		},
-		"details": "empty",
-		"boat": map[string]interface{}{
-			"mast": true,
-		},
-		"hole": "black",
-	}
-
-	// What we expect is that anything in dst overrides anything in src, but that
-	// otherwise the values are coalesced.
-	CoalesceTables(dst, src)
-
-	if dst["name"] != "Ishmael" {
-		t.Errorf("Unexpected name: %s", dst["name"])
-	}
-	if dst["occupation"] != "whaler" {
-		t.Errorf("Unexpected occupation: %s", dst["occupation"])
-	}
-
-	addr, ok := dst["address"].(map[string]interface{})
-	if !ok {
-		t.Fatal("Address went away.")
-	}
-
-	if addr["street"].(string) != "123 Spouter Inn Ct." {
-		t.Errorf("Unexpected address: %v", addr["street"])
-	}
-
-	if addr["city"].(string) != "Nantucket" {
-		t.Errorf("Unexpected city: %v", addr["city"])
-	}
-
-	if addr["state"].(string) != "MA" {
-		t.Errorf("Unexpected state: %v", addr["state"])
-	}
-
-	if _, ok = addr["country"]; ok {
-		t.Error("The country is not left out.")
-	}
-
-	if det, ok := dst["details"].(map[string]interface{}); !ok {
-		t.Fatalf("Details is the wrong type: %v", dst["details"])
-	} else if _, ok := det["friends"]; !ok {
-		t.Error("Could not find your friends. Maybe you don't have any. :-(")
-	}
-
-	if dst["boat"].(string) != "pequod" {
-		t.Errorf("Expected boat string, got %v", dst["boat"])
-	}
-
-	if _, ok = dst["hole"]; ok {
-		t.Error("The hole still exists.")
-	}
-
-	dst2 := map[string]interface{}{
-		"name": "Ishmael",
-		"address": map[string]interface{}{
-			"street":  "123 Spouter Inn Ct.",
-			"city":    "Nantucket",
-			"country": "US",
-		},
-		"details": map[string]interface{}{
-			"friends": []string{"Tashtego"},
-		},
-		"boat": "pequod",
-		"hole": "black",
-	}
-
-	// What we expect is that anything in dst should have all values set,
-	// this happens when the --reuse-values flag is set but the chart has no modifications yet
-	CoalesceTables(dst2, nil)
-
-	if dst2["name"] != "Ishmael" {
-		t.Errorf("Unexpected name: %s", dst2["name"])
-	}
-
-	addr2, ok := dst2["address"].(map[string]interface{})
-	if !ok {
-		t.Fatal("Address went away.")
-	}
-
-	if addr2["street"].(string) != "123 Spouter Inn Ct." {
-		t.Errorf("Unexpected address: %v", addr2["street"])
-	}
-
-	if addr2["city"].(string) != "Nantucket" {
-		t.Errorf("Unexpected city: %v", addr2["city"])
-	}
-
-	if addr2["country"].(string) != "US" {
-		t.Errorf("Unexpected Country: %v", addr2["country"])
-	}
-
-	if det2, ok := dst2["details"].(map[string]interface{}); !ok {
-		t.Fatalf("Details is the wrong type: %v", dst2["details"])
-	} else if _, ok := det2["friends"]; !ok {
-		t.Error("Could not find your friends. Maybe you don't have any. :-(")
-	}
-
-	if dst2["boat"].(string) != "pequod" {
-		t.Errorf("Expected boat string, got %v", dst2["boat"])
-	}
-
-	if dst2["hole"].(string) != "black" {
-		t.Errorf("Expected hole string, got %v", dst2["boat"])
-	}
-}
-
-func TestMergeTables(t *testing.T) {
-	dst := map[string]interface{}{
-		"name": "Ishmael",
-		"address": map[string]interface{}{
-			"street":  "123 Spouter Inn Ct.",
-			"city":    "Nantucket",
-			"country": nil,
-		},
-		"details": map[string]interface{}{
-			"friends": []string{"Tashtego"},
-		},
-		"boat": "pequod",
-		"hole": nil,
-	}
-	src := map[string]interface{}{
-		"occupation": "whaler",
-		"address": map[string]interface{}{
-			"state":   "MA",
-			"street":  "234 Spouter Inn Ct.",
-			"country": "US",
-		},
-		"details": "empty",
-		"boat": map[string]interface{}{
-			"mast": true,
-		},
-		"hole": "black",
-	}
-
-	// What we expect is that anything in dst overrides anything in src, but that
-	// otherwise the values are coalesced.
-	MergeTables(dst, src)
-
-	if dst["name"] != "Ishmael" {
-		t.Errorf("Unexpected name: %s", dst["name"])
-	}
-	if dst["occupation"] != "whaler" {
-		t.Errorf("Unexpected occupation: %s", dst["occupation"])
-	}
-
-	addr, ok := dst["address"].(map[string]interface{})
-	if !ok {
-		t.Fatal("Address went away.")
-	}
-
-	if addr["street"].(string) != "123 Spouter Inn Ct." {
-		t.Errorf("Unexpected address: %v", addr["street"])
-	}
-
-	if addr["city"].(string) != "Nantucket" {
-		t.Errorf("Unexpected city: %v", addr["city"])
-	}
-
-	if addr["state"].(string) != "MA" {
-		t.Errorf("Unexpected state: %v", addr["state"])
-	}
-
-	// This is one test that is different from CoalesceTables. Because country
-	// is a nil value and it's not removed it's still present.
-	if _, ok = addr["country"]; !ok {
-		t.Error("The country is left out.")
-	}
-
-	if det, ok := dst["details"].(map[string]interface{}); !ok {
-		t.Fatalf("Details is the wrong type: %v", dst["details"])
-	} else if _, ok := det["friends"]; !ok {
-		t.Error("Could not find your friends. Maybe you don't have any. :-(")
-	}
-
-	if dst["boat"].(string) != "pequod" {
-		t.Errorf("Expected boat string, got %v", dst["boat"])
-	}
-
-	// This is one test that is different from CoalesceTables. Because hole
-	// is a nil value and it's not removed it's still present.
-	if _, ok = dst["hole"]; !ok {
-		t.Error("The hole no longer exists.")
-	}
-
-	dst2 := map[string]interface{}{
-		"name": "Ishmael",
-		"address": map[string]interface{}{
-			"street":  "123 Spouter Inn Ct.",
-			"city":    "Nantucket",
-			"country": "US",
-		},
-		"details": map[string]interface{}{
-			"friends": []string{"Tashtego"},
-		},
-		"boat":   "pequod",
-		"hole":   "black",
-		"nilval": nil,
-	}
-
-	// What we expect is that anything in dst should have all values set,
-	// this happens when the --reuse-values flag is set but the chart has no modifications yet
-	MergeTables(dst2, nil)
-
-	if dst2["name"] != "Ishmael" {
-		t.Errorf("Unexpected name: %s", dst2["name"])
-	}
-
-	addr2, ok := dst2["address"].(map[string]interface{})
-	if !ok {
-		t.Fatal("Address went away.")
-	}
-
-	if addr2["street"].(string) != "123 Spouter Inn Ct." {
-		t.Errorf("Unexpected address: %v", addr2["street"])
-	}
-
-	if addr2["city"].(string) != "Nantucket" {
-		t.Errorf("Unexpected city: %v", addr2["city"])
-	}
-
-	if addr2["country"].(string) != "US" {
-		t.Errorf("Unexpected Country: %v", addr2["country"])
-	}
-
-	if det2, ok := dst2["details"].(map[string]interface{}); !ok {
-		t.Fatalf("Details is the wrong type: %v", dst2["details"])
-	} else if _, ok := det2["friends"]; !ok {
-		t.Error("Could not find your friends. Maybe you don't have any. :-(")
-	}
-
-	if dst2["boat"].(string) != "pequod" {
-		t.Errorf("Expected boat string, got %v", dst2["boat"])
-	}
-
-	if dst2["hole"].(string) != "black" {
-		t.Errorf("Expected hole string, got %v", dst2["boat"])
-	}
-
-	if dst2["nilval"] != nil {
-		t.Error("Expected nilvalue to have nil value but it does not")
-	}
-}
-
-func TestCoalesceValuesWarnings(t *testing.T) {
-
-	c := withDeps(&chart.Chart{
-		Metadata: &chart.Metadata{Name: "level1"},
-		Values: map[string]interface{}{
-			"name": "moby",
-		},
-	},
-		withDeps(&chart.Chart{
-			Metadata: &chart.Metadata{Name: "level2"},
-			Values: map[string]interface{}{
-				"name": "pequod",
-			},
-		},
-			&chart.Chart{
-				Metadata: &chart.Metadata{Name: "level3"},
-				Values: map[string]interface{}{
-					"name": "ahab",
-					"boat": true,
-					"spear": map[string]interface{}{
-						"tip": true,
-						"sail": map[string]interface{}{
-							"cotton": true,
-						},
-					},
-				},
-			},
-		),
-	)
-
-	vals := map[string]interface{}{
-		"level2": map[string]interface{}{
-			"level3": map[string]interface{}{
-				"boat": map[string]interface{}{"mast": true},
-				"spear": map[string]interface{}{
-					"tip": map[string]interface{}{
-						"sharp": true,
-					},
-					"sail": true,
-				},
-			},
-		},
-	}
-
-	warnings := make([]string, 0)
-	printf := func(format string, v ...interface{}) {
-		t.Logf(format, v...)
-		warnings = append(warnings, fmt.Sprintf(format, v...))
-	}
-
-	_, err := coalesce(printf, c, vals, "", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("vals: %v", vals)
-	assert.Contains(t, warnings, "warning: skipped value for level1.level2.level3.boat: Not a table.")
-	assert.Contains(t, warnings, "warning: destination for level1.level2.level3.spear.tip is a table. Ignoring non-table value (true)")
-	assert.Contains(t, warnings, "warning: cannot overwrite table with non table for level1.level2.level3.spear.sail (map[cotton:true])")
-
-}
-
-func TestConcatPrefix(t *testing.T) {
-	assert.Equal(t, "b", concatPrefix("", "b"))
-	assert.Equal(t, "a.b", concatPrefix("a", "b"))
-}
diff --git a/internal/chart/v3/util/create.go b/internal/chart/v3/util/create.go
index 6a28f99d4..9f742e646 100644
--- a/internal/chart/v3/util/create.go
+++ b/internal/chart/v3/util/create.go
@@ -28,6 +28,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/internal/chart/v3/loader"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // chartName is a regular expression for testing the supplied name of a chart.
@@ -655,11 +656,11 @@ func CreateFrom(chartfile *chart.Metadata, dest, src string) error {
 
 	schart.Metadata = chartfile
 
-	var updatedTemplates []*chart.File
+	var updatedTemplates []*common.File
 
 	for _, template := range schart.Templates {
 		newData := transform(string(template.Data), schart.Name())
-		updatedTemplates = append(updatedTemplates, &chart.File{Name: template.Name, Data: newData})
+		updatedTemplates = append(updatedTemplates, &common.File{Name: template.Name, Data: newData})
 	}
 
 	schart.Templates = updatedTemplates
diff --git a/internal/chart/v3/util/dependencies.go b/internal/chart/v3/util/dependencies.go
index 129c46372..489772115 100644
--- a/internal/chart/v3/util/dependencies.go
+++ b/internal/chart/v3/util/dependencies.go
@@ -23,10 +23,12 @@ import (
 	"github.com/mitchellh/copystructure"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 )
 
 // ProcessDependencies checks through this chart's dependencies, processing accordingly.
-func ProcessDependencies(c *chart.Chart, v Values) error {
+func ProcessDependencies(c *chart.Chart, v common.Values) error {
 	if err := processDependencyEnabled(c, v, ""); err != nil {
 		return err
 	}
@@ -34,7 +36,7 @@ func ProcessDependencies(c *chart.Chart, v Values) error {
 }
 
 // processDependencyConditions disables charts based on condition path value in values
-func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath string) {
+func processDependencyConditions(reqs []*chart.Dependency, cvals common.Values, cpath string) {
 	if reqs == nil {
 		return
 	}
@@ -50,7 +52,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
 						break
 					}
 					slog.Warn("returned non-bool value", "path", c, "chart", r.Name)
-				} else if _, ok := err.(ErrNoValue); !ok {
+				} else if _, ok := err.(common.ErrNoValue); !ok {
 					// this is a real error
 					slog.Warn("the method PathValue returned error", slog.Any("error", err))
 				}
@@ -60,7 +62,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
 }
 
 // processDependencyTags disables charts based on tags in values
-func processDependencyTags(reqs []*chart.Dependency, cvals Values) {
+func processDependencyTags(reqs []*chart.Dependency, cvals common.Values) {
 	if reqs == nil {
 		return
 	}
@@ -177,7 +179,7 @@ Loop:
 	for _, lr := range c.Metadata.Dependencies {
 		lr.Enabled = true
 	}
-	cvals, err := CoalesceValues(c, v)
+	cvals, err := util.CoalesceValues(c, v)
 	if err != nil {
 		return err
 	}
@@ -232,6 +234,8 @@ func pathToMap(path string, data map[string]interface{}) map[string]interface{}
 	return set(parsePath(path), data)
 }
 
+func parsePath(key string) []string { return strings.Split(key, ".") }
+
 func set(path []string, data map[string]interface{}) map[string]interface{} {
 	if len(path) == 0 {
 		return nil
@@ -249,12 +253,12 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		return nil
 	}
 	// combine chart values and empty config to get Values
-	var cvals Values
+	var cvals common.Values
 	var err error
 	if merge {
-		cvals, err = MergeValues(c, nil)
+		cvals, err = util.MergeValues(c, nil)
 	} else {
-		cvals, err = CoalesceValues(c, nil)
+		cvals, err = util.CoalesceValues(c, nil)
 	}
 	if err != nil {
 		return err
@@ -282,9 +286,9 @@ func processImportValues(c *chart.Chart, merge bool) error {
 				}
 				// create value map from child to be merged into parent
 				if merge {
-					b = MergeTables(b, pathToMap(parent, vv.AsMap()))
+					b = util.MergeTables(b, pathToMap(parent, vv.AsMap()))
 				} else {
-					b = CoalesceTables(b, pathToMap(parent, vv.AsMap()))
+					b = util.CoalesceTables(b, pathToMap(parent, vv.AsMap()))
 				}
 			case string:
 				child := "exports." + iv
@@ -298,9 +302,9 @@ func processImportValues(c *chart.Chart, merge bool) error {
 					continue
 				}
 				if merge {
-					b = MergeTables(b, vm.AsMap())
+					b = util.MergeTables(b, vm.AsMap())
 				} else {
-					b = CoalesceTables(b, vm.AsMap())
+					b = util.CoalesceTables(b, vm.AsMap())
 				}
 			}
 		}
@@ -315,14 +319,14 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		// deep copying the cvals as there are cases where pointers can end
 		// up in the cvals when they are copied onto b in ways that break things.
 		cvals = deepCopyMap(cvals)
-		c.Values = MergeTables(cvals, b)
+		c.Values = util.MergeTables(cvals, b)
 	} else {
 		// Trimming the nil values from cvals is needed for backwards compatibility.
 		// Previously, the b value had been populated with cvals along with some
 		// overrides. This caused the coalescing functionality to remove the
 		// nil/null values. This trimming is for backwards compat.
 		cvals = trimNilValues(cvals)
-		c.Values = CoalesceTables(cvals, b)
+		c.Values = util.CoalesceTables(cvals, b)
 	}
 
 	return nil
@@ -355,6 +359,12 @@ func trimNilValues(vals map[string]interface{}) map[string]interface{} {
 	return valsCopyMap
 }
 
+// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
+func istable(v interface{}) bool {
+	_, ok := v.(map[string]interface{})
+	return ok
+}
+
 // processDependencyImportValues imports specified chart values from child to parent.
 func processDependencyImportValues(c *chart.Chart, merge bool) error {
 	for _, d := range c.Dependencies() {
diff --git a/internal/chart/v3/util/dependencies_test.go b/internal/chart/v3/util/dependencies_test.go
index 55839fe65..3c5bb96f7 100644
--- a/internal/chart/v3/util/dependencies_test.go
+++ b/internal/chart/v3/util/dependencies_test.go
@@ -23,6 +23,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/internal/chart/v3/loader"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func loadChart(t *testing.T, path string) *chart.Chart {
@@ -221,7 +222,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	if err := processDependencyImportValues(c, false); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc := Values(c.Values)
+	cc := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cc.PathValue(kk)
 		if err != nil {
@@ -251,7 +252,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 		t.Error("expect nil value not found but found it")
 	}
 	switch xerr := err.(type) {
-	case ErrNoValue:
+	case common.ErrNoValue:
 		// We found what we expected
 	default:
 		t.Errorf("expected an ErrNoValue but got %q instead", xerr)
@@ -261,7 +262,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	if err := processDependencyImportValues(c, true); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc = Values(c.Values)
+	cc = common.Values(c.Values)
 	val, err := cc.PathValue("ensurenull")
 	if err != nil {
 		t.Error("expect value but ensurenull was not found")
@@ -291,7 +292,7 @@ func TestProcessDependencyImportValuesFromSharedDependencyToAliases(t *testing.T
 	e["foo.grandchild.defaults.defaultValue"] = "42"
 	e["bar.grandchild.defaults.defaultValue"] = "42"
 
-	cValues := Values(c.Values)
+	cValues := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cValues.PathValue(kk)
 		if err != nil {
@@ -329,7 +330,7 @@ func TestProcessDependencyImportValuesMultiLevelPrecedence(t *testing.T) {
 	if err := processDependencyImportValues(c, true); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc := Values(c.Values)
+	cc := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cc.PathValue(kk)
 		if err != nil {
diff --git a/internal/chart/v3/util/errors.go b/internal/chart/v3/util/errors.go
deleted file mode 100644
index a175b9758..000000000
--- a/internal/chart/v3/util/errors.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-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 util
-
-import (
-	"fmt"
-)
-
-// ErrNoTable indicates that a chart does not have a matching table.
-type ErrNoTable struct {
-	Key string
-}
-
-func (e ErrNoTable) Error() string { return fmt.Sprintf("%q is not a table", e.Key) }
-
-// ErrNoValue indicates that Values does not contain a key with a value
-type ErrNoValue struct {
-	Key string
-}
-
-func (e ErrNoValue) Error() string { return fmt.Sprintf("%q is not a value", e.Key) }
-
-type ErrInvalidChartName struct {
-	Name string
-}
-
-func (e ErrInvalidChartName) Error() string {
-	return fmt.Sprintf("%q is not a valid chart name", e.Name)
-}
diff --git a/internal/chart/v3/util/jsonschema.go b/internal/chart/v3/util/jsonschema.go
deleted file mode 100644
index 9fe35904e..000000000
--- a/internal/chart/v3/util/jsonschema.go
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-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 util
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"log/slog"
-	"strings"
-
-	"github.com/santhosh-tekuri/jsonschema/v6"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-// ValidateAgainstSchema checks that values does not violate the structure laid out in schema
-func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
-	var sb strings.Builder
-	if chrt.Schema != nil {
-		slog.Debug("chart name", "chart-name", chrt.Name())
-		err := ValidateAgainstSingleSchema(values, chrt.Schema)
-		if err != nil {
-			sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name()))
-			sb.WriteString(err.Error())
-		}
-	}
-	slog.Debug("number of dependencies in the chart", "dependencies", len(chrt.Dependencies()))
-	// For each dependency, recursively call this function with the coalesced values
-	for _, subchart := range chrt.Dependencies() {
-		subchartValues := values[subchart.Name()].(map[string]interface{})
-		if err := ValidateAgainstSchema(subchart, subchartValues); err != nil {
-			sb.WriteString(err.Error())
-		}
-	}
-
-	if sb.Len() > 0 {
-		return errors.New(sb.String())
-	}
-
-	return nil
-}
-
-// ValidateAgainstSingleSchema checks that values does not violate the structure laid out in this schema
-func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error) {
-	defer func() {
-		if r := recover(); r != nil {
-			reterr = fmt.Errorf("unable to validate schema: %s", r)
-		}
-	}()
-
-	// This unmarshal function leverages UseNumber() for number precision. The parser
-	// used for values does this as well.
-	schema, err := jsonschema.UnmarshalJSON(bytes.NewReader(schemaJSON))
-	if err != nil {
-		return err
-	}
-	slog.Debug("unmarshalled JSON schema", "schema", schemaJSON)
-
-	compiler := jsonschema.NewCompiler()
-	err = compiler.AddResource("file:///values.schema.json", schema)
-	if err != nil {
-		return err
-	}
-
-	validator, err := compiler.Compile("file:///values.schema.json")
-	if err != nil {
-		return err
-	}
-
-	err = validator.Validate(values.AsMap())
-	if err != nil {
-		return JSONSchemaValidationError{err}
-	}
-
-	return nil
-}
-
-// Note, JSONSchemaValidationError is used to wrap the error from the underlying
-// validation package so that Helm has a clean interface and the validation package
-// could be replaced without changing the Helm SDK API.
-
-// JSONSchemaValidationError is the error returned when there is a schema validation
-// error.
-type JSONSchemaValidationError struct {
-	embeddedErr error
-}
-
-// Error prints the error message
-func (e JSONSchemaValidationError) Error() string {
-	errStr := e.embeddedErr.Error()
-
-	// This string prefixes all of our error details. Further up the stack of helm error message
-	// building more detail is provided to users. This is removed.
-	errStr = strings.TrimPrefix(errStr, "jsonschema validation failed with 'file:///values.schema.json#'\n")
-
-	// The extra new line is needed for when there are sub-charts.
-	return errStr + "\n"
-}
diff --git a/internal/chart/v3/util/jsonschema_test.go b/internal/chart/v3/util/jsonschema_test.go
deleted file mode 100644
index 0a3820377..000000000
--- a/internal/chart/v3/util/jsonschema_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-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 util
-
-import (
-	"os"
-	"testing"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-func TestValidateAgainstSingleSchema(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values.yaml")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-	schema, err := os.ReadFile("./testdata/test-values.schema.json")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-
-	if err := ValidateAgainstSingleSchema(values, schema); err != nil {
-		t.Errorf("Error validating Values against Schema: %s", err)
-	}
-}
-
-func TestValidateAgainstInvalidSingleSchema(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values.yaml")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-	schema, err := os.ReadFile("./testdata/test-values-invalid.schema.json")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-
-	var errString string
-	if err := ValidateAgainstSingleSchema(values, schema); err == nil {
-		t.Fatalf("Expected an error, but got nil")
-	} else {
-		errString = err.Error()
-	}
-
-	expectedErrString := `"file:///values.schema.json#" is not valid against metaschema: jsonschema validation failed with 'https://json-schema.org/draft/2020-12/schema#'
-- at '': got number, want boolean or object`
-	if errString != expectedErrString {
-		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
-	}
-}
-
-func TestValidateAgainstSingleSchemaNegative(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values-negative.yaml")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-	schema, err := os.ReadFile("./testdata/test-values.schema.json")
-	if err != nil {
-		t.Fatalf("Error reading JSON file: %s", err)
-	}
-
-	var errString string
-	if err := ValidateAgainstSingleSchema(values, schema); err == nil {
-		t.Fatalf("Expected an error, but got nil")
-	} else {
-		errString = err.Error()
-	}
-
-	expectedErrString := `- at '': missing property 'employmentInfo'
-- at '/age': minimum: got -5, want 0
-`
-	if errString != expectedErrString {
-		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
-	}
-}
-
-const subchartSchema = `{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "Values",
-  "type": "object",
-  "properties": {
-    "age": {
-      "description": "Age",
-      "minimum": 0,
-      "type": "integer"
-    }
-  },
-  "required": [
-    "age"
-  ]
-}
-`
-
-const subchartSchema2020 = `{
-	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"title": "Values",
-	"type": "object",
-	"properties": {
-		"data": {
-			"type": "array",
-			"contains": { "type": "string" },
-			"unevaluatedItems": { "type": "number" }
-		}
-	},
-	"required": ["data"]
-}
-`
-
-func TestValidateAgainstSchema(t *testing.T) {
-	subchartJSON := []byte(subchartSchema)
-	subchart := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "subchart",
-		},
-		Schema: subchartJSON,
-	}
-	chrt := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "chrt",
-		},
-	}
-	chrt.AddDependency(subchart)
-
-	vals := map[string]interface{}{
-		"name": "John",
-		"subchart": map[string]interface{}{
-			"age": 25,
-		},
-	}
-
-	if err := ValidateAgainstSchema(chrt, vals); err != nil {
-		t.Errorf("Error validating Values against Schema: %s", err)
-	}
-}
-
-func TestValidateAgainstSchemaNegative(t *testing.T) {
-	subchartJSON := []byte(subchartSchema)
-	subchart := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "subchart",
-		},
-		Schema: subchartJSON,
-	}
-	chrt := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "chrt",
-		},
-	}
-	chrt.AddDependency(subchart)
-
-	vals := map[string]interface{}{
-		"name":     "John",
-		"subchart": map[string]interface{}{},
-	}
-
-	var errString string
-	if err := ValidateAgainstSchema(chrt, vals); err == nil {
-		t.Fatalf("Expected an error, but got nil")
-	} else {
-		errString = err.Error()
-	}
-
-	expectedErrString := `subchart:
-- at '': missing property 'age'
-`
-	if errString != expectedErrString {
-		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
-	}
-}
-
-func TestValidateAgainstSchema2020(t *testing.T) {
-	subchartJSON := []byte(subchartSchema2020)
-	subchart := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "subchart",
-		},
-		Schema: subchartJSON,
-	}
-	chrt := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "chrt",
-		},
-	}
-	chrt.AddDependency(subchart)
-
-	vals := map[string]interface{}{
-		"name": "John",
-		"subchart": map[string]interface{}{
-			"data": []any{"hello", 12},
-		},
-	}
-
-	if err := ValidateAgainstSchema(chrt, vals); err != nil {
-		t.Errorf("Error validating Values against Schema: %s", err)
-	}
-}
-
-func TestValidateAgainstSchema2020Negative(t *testing.T) {
-	subchartJSON := []byte(subchartSchema2020)
-	subchart := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "subchart",
-		},
-		Schema: subchartJSON,
-	}
-	chrt := &chart.Chart{
-		Metadata: &chart.Metadata{
-			Name: "chrt",
-		},
-	}
-	chrt.AddDependency(subchart)
-
-	vals := map[string]interface{}{
-		"name": "John",
-		"subchart": map[string]interface{}{
-			"data": []any{12},
-		},
-	}
-
-	var errString string
-	if err := ValidateAgainstSchema(chrt, vals); err == nil {
-		t.Fatalf("Expected an error, but got nil")
-	} else {
-		errString = err.Error()
-	}
-
-	expectedErrString := `subchart:
-- at '/data': no items match contains schema
-  - at '/data/0': got number, want string
-`
-	if errString != expectedErrString {
-		t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString)
-	}
-}
diff --git a/internal/chart/v3/util/save.go b/internal/chart/v3/util/save.go
index 3125cc3c9..49d93bf40 100644
--- a/internal/chart/v3/util/save.go
+++ b/internal/chart/v3/util/save.go
@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=")
@@ -76,7 +77,7 @@ func SaveDir(c *chart.Chart, dest string) error {
 	}
 
 	// Save templates and files
-	for _, o := range [][]*chart.File{c.Templates, c.Files} {
+	for _, o := range [][]*common.File{c.Templates, c.Files} {
 		for _, f := range o {
 			n := filepath.Join(outdir, f.Name)
 			if err := writeFile(n, f.Data); err != nil {
@@ -246,7 +247,7 @@ func validateName(name string) error {
 	nname := filepath.Base(name)
 
 	if nname != name {
-		return ErrInvalidChartName{name}
+		return common.ErrInvalidChartName{Name: name}
 	}
 
 	return nil
diff --git a/internal/chart/v3/util/save_test.go b/internal/chart/v3/util/save_test.go
index 852675bb0..9b1b14a4c 100644
--- a/internal/chart/v3/util/save_test.go
+++ b/internal/chart/v3/util/save_test.go
@@ -31,6 +31,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/internal/chart/v3/loader"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func TestSave(t *testing.T) {
@@ -47,7 +48,7 @@ func TestSave(t *testing.T) {
 				Lock: &chart.Lock{
 					Digest: "testdigest",
 				},
-				Files: []*chart.File{
+				Files: []*common.File{
 					{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 				},
 				Schema: []byte("{\n  \"title\": \"Values\"\n}"),
@@ -113,7 +114,7 @@ func TestSave(t *testing.T) {
 		Lock: &chart.Lock{
 			Digest: "testdigest",
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
 	}
@@ -153,7 +154,7 @@ func TestSavePreservesTimestamps(t *testing.T) {
 			"imageName": "testimage",
 			"imageId":   42,
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
 		Schema: []byte("{\n  \"title\": \"Values\"\n}"),
@@ -219,10 +220,10 @@ func TestSaveDir(t *testing.T) {
 			Name:       "ahab",
 			Version:    "1.2.3",
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: path.Join(TemplatesDir, "nested", "dir", "thing.yaml"), Data: []byte("abc: {{ .Values.abc }}")},
 		},
 	}
diff --git a/internal/chart/v3/util/values.go b/internal/chart/v3/util/values.go
deleted file mode 100644
index 8e1a14b45..000000000
--- a/internal/chart/v3/util/values.go
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-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 util
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"sigs.k8s.io/yaml"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-// GlobalKey is the name of the Values key that is used for storing global vars.
-const GlobalKey = "global"
-
-// Values represents a collection of chart values.
-type Values map[string]interface{}
-
-// YAML encodes the Values into a YAML string.
-func (v Values) YAML() (string, error) {
-	b, err := yaml.Marshal(v)
-	return string(b), err
-}
-
-// Table gets a table (YAML subsection) from a Values object.
-//
-// The table is returned as a Values.
-//
-// Compound table names may be specified with dots:
-//
-//	foo.bar
-//
-// The above will be evaluated as "The table bar inside the table
-// foo".
-//
-// An ErrNoTable is returned if the table does not exist.
-func (v Values) Table(name string) (Values, error) {
-	table := v
-	var err error
-
-	for _, n := range parsePath(name) {
-		if table, err = tableLookup(table, n); err != nil {
-			break
-		}
-	}
-	return table, err
-}
-
-// AsMap is a utility function for converting Values to a map[string]interface{}.
-//
-// It protects against nil map panics.
-func (v Values) AsMap() map[string]interface{} {
-	if len(v) == 0 {
-		return map[string]interface{}{}
-	}
-	return v
-}
-
-// Encode writes serialized Values information to the given io.Writer.
-func (v Values) Encode(w io.Writer) error {
-	out, err := yaml.Marshal(v)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(out)
-	return err
-}
-
-func tableLookup(v Values, simple string) (Values, error) {
-	v2, ok := v[simple]
-	if !ok {
-		return v, ErrNoTable{simple}
-	}
-	if vv, ok := v2.(map[string]interface{}); ok {
-		return vv, nil
-	}
-
-	// This catches a case where a value is of type Values, but doesn't (for some
-	// reason) match the map[string]interface{}. This has been observed in the
-	// wild, and might be a result of a nil map of type Values.
-	if vv, ok := v2.(Values); ok {
-		return vv, nil
-	}
-
-	return Values{}, ErrNoTable{simple}
-}
-
-// ReadValues will parse YAML byte data into a Values.
-func ReadValues(data []byte) (vals Values, err error) {
-	err = yaml.Unmarshal(data, &vals)
-	if len(vals) == 0 {
-		vals = Values{}
-	}
-	return vals, err
-}
-
-// ReadValuesFile will parse a YAML file into a map of values.
-func ReadValuesFile(filename string) (Values, error) {
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return map[string]interface{}{}, err
-	}
-	return ReadValues(data)
-}
-
-// ReleaseOptions represents the additional release options needed
-// for the composition of the final values struct
-type ReleaseOptions struct {
-	Name      string
-	Namespace string
-	Revision  int
-	IsUpgrade bool
-	IsInstall bool
-}
-
-// ToRenderValues composes the struct from the data coming from the Releases, Charts and Values files
-//
-// This takes both ReleaseOptions and Capabilities to merge into the render values.
-func ToRenderValues(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities) (Values, error) {
-	return ToRenderValuesWithSchemaValidation(chrt, chrtVals, options, caps, false)
-}
-
-// ToRenderValuesWithSchemaValidation composes the struct from the data coming from the Releases, Charts and Values files
-//
-// This takes both ReleaseOptions and Capabilities to merge into the render values.
-func ToRenderValuesWithSchemaValidation(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities, skipSchemaValidation bool) (Values, error) {
-	if caps == nil {
-		caps = DefaultCapabilities
-	}
-	top := map[string]interface{}{
-		"Chart":        chrt.Metadata,
-		"Capabilities": caps,
-		"Release": map[string]interface{}{
-			"Name":      options.Name,
-			"Namespace": options.Namespace,
-			"IsUpgrade": options.IsUpgrade,
-			"IsInstall": options.IsInstall,
-			"Revision":  options.Revision,
-			"Service":   "Helm",
-		},
-	}
-
-	vals, err := CoalesceValues(chrt, chrtVals)
-	if err != nil {
-		return top, err
-	}
-
-	if !skipSchemaValidation {
-		if err := ValidateAgainstSchema(chrt, vals); err != nil {
-			return top, fmt.Errorf("values don't meet the specifications of the schema(s) in the following chart(s):\n%w", err)
-		}
-	}
-
-	top["Values"] = vals
-	return top, nil
-}
-
-// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
-func istable(v interface{}) bool {
-	_, ok := v.(map[string]interface{})
-	return ok
-}
-
-// PathValue takes a path that traverses a YAML structure and returns the value at the end of that path.
-// The path starts at the root of the YAML structure and is comprised of YAML keys separated by periods.
-// Given the following YAML data the value at path "chapter.one.title" is "Loomings".
-//
-//	chapter:
-//	  one:
-//	    title: "Loomings"
-func (v Values) PathValue(path string) (interface{}, error) {
-	if path == "" {
-		return nil, errors.New("YAML path cannot be empty")
-	}
-	return v.pathValue(parsePath(path))
-}
-
-func (v Values) pathValue(path []string) (interface{}, error) {
-	if len(path) == 1 {
-		// if exists must be root key not table
-		if _, ok := v[path[0]]; ok && !istable(v[path[0]]) {
-			return v[path[0]], nil
-		}
-		return nil, ErrNoValue{path[0]}
-	}
-
-	key, path := path[len(path)-1], path[:len(path)-1]
-	// get our table for table path
-	t, err := v.Table(joinPath(path...))
-	if err != nil {
-		return nil, ErrNoValue{key}
-	}
-	// check table for key and ensure value is not a table
-	if k, ok := t[key]; ok && !istable(k) {
-		return k, nil
-	}
-	return nil, ErrNoValue{key}
-}
-
-func parsePath(key string) []string { return strings.Split(key, ".") }
-
-func joinPath(path ...string) string { return strings.Join(path, ".") }
diff --git a/internal/chart/v3/util/values_test.go b/internal/chart/v3/util/values_test.go
deleted file mode 100644
index 34c664581..000000000
--- a/internal/chart/v3/util/values_test.go
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-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 util
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-	"text/template"
-
-	chart "helm.sh/helm/v4/internal/chart/v3"
-)
-
-func TestReadValues(t *testing.T) {
-	doc := `# Test YAML parse
-poet: "Coleridge"
-title: "Rime of the Ancient Mariner"
-stanza:
-  - "at"
-  - "length"
-  - "did"
-  - cross
-  - an
-  - Albatross
-
-mariner:
-  with: "crossbow"
-  shot: "ALBATROSS"
-
-water:
-  water:
-    where: "everywhere"
-    nor: "any drop to drink"
-`
-
-	data, err := ReadValues([]byte(doc))
-	if err != nil {
-		t.Fatalf("Error parsing bytes: %s", err)
-	}
-	matchValues(t, data)
-
-	tests := []string{`poet: "Coleridge"`, "# Just a comment", ""}
-
-	for _, tt := range tests {
-		data, err = ReadValues([]byte(tt))
-		if err != nil {
-			t.Fatalf("Error parsing bytes (%s): %s", tt, err)
-		}
-		if data == nil {
-			t.Errorf(`YAML string "%s" gave a nil map`, tt)
-		}
-	}
-}
-
-func TestToRenderValues(t *testing.T) {
-
-	chartValues := map[string]interface{}{
-		"name": "al Rashid",
-		"where": map[string]interface{}{
-			"city":  "Basrah",
-			"title": "caliph",
-		},
-	}
-
-	overrideValues := map[string]interface{}{
-		"name": "Haroun",
-		"where": map[string]interface{}{
-			"city": "Baghdad",
-			"date": "809 CE",
-		},
-	}
-
-	c := &chart.Chart{
-		Metadata:  &chart.Metadata{Name: "test"},
-		Templates: []*chart.File{},
-		Values:    chartValues,
-		Files: []*chart.File{
-			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
-		},
-	}
-	c.AddDependency(&chart.Chart{
-		Metadata: &chart.Metadata{Name: "where"},
-	})
-
-	o := ReleaseOptions{
-		Name:      "Seven Voyages",
-		Namespace: "default",
-		Revision:  1,
-		IsInstall: true,
-	}
-
-	res, err := ToRenderValuesWithSchemaValidation(c, overrideValues, o, nil, false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure that the top-level values are all set.
-	if name := res["Chart"].(*chart.Metadata).Name; name != "test" {
-		t.Errorf("Expected chart name 'test', got %q", name)
-	}
-	relmap := res["Release"].(map[string]interface{})
-	if name := relmap["Name"]; name.(string) != "Seven Voyages" {
-		t.Errorf("Expected release name 'Seven Voyages', got %q", name)
-	}
-	if namespace := relmap["Namespace"]; namespace.(string) != "default" {
-		t.Errorf("Expected namespace 'default', got %q", namespace)
-	}
-	if revision := relmap["Revision"]; revision.(int) != 1 {
-		t.Errorf("Expected revision '1', got %d", revision)
-	}
-	if relmap["IsUpgrade"].(bool) {
-		t.Error("Expected upgrade to be false.")
-	}
-	if !relmap["IsInstall"].(bool) {
-		t.Errorf("Expected install to be true.")
-	}
-	if !res["Capabilities"].(*Capabilities).APIVersions.Has("v1") {
-		t.Error("Expected Capabilities to have v1 as an API")
-	}
-	if res["Capabilities"].(*Capabilities).KubeVersion.Major != "1" {
-		t.Error("Expected Capabilities to have a Kube version")
-	}
-
-	vals := res["Values"].(Values)
-	if vals["name"] != "Haroun" {
-		t.Errorf("Expected 'Haroun', got %q (%v)", vals["name"], vals)
-	}
-	where := vals["where"].(map[string]interface{})
-	expects := map[string]string{
-		"city":  "Baghdad",
-		"date":  "809 CE",
-		"title": "caliph",
-	}
-	for field, expect := range expects {
-		if got := where[field]; got != expect {
-			t.Errorf("Expected %q, got %q (%v)", expect, got, where)
-		}
-	}
-}
-
-func TestReadValuesFile(t *testing.T) {
-	data, err := ReadValuesFile("./testdata/coleridge.yaml")
-	if err != nil {
-		t.Fatalf("Error reading YAML file: %s", err)
-	}
-	matchValues(t, data)
-}
-
-func ExampleValues() {
-	doc := `
-title: "Moby Dick"
-chapter:
-  one:
-    title: "Loomings"
-  two:
-    title: "The Carpet-Bag"
-  three:
-    title: "The Spouter Inn"
-`
-	d, err := ReadValues([]byte(doc))
-	if err != nil {
-		panic(err)
-	}
-	ch1, err := d.Table("chapter.one")
-	if err != nil {
-		panic("could not find chapter one")
-	}
-	fmt.Print(ch1["title"])
-	// Output:
-	// Loomings
-}
-
-func TestTable(t *testing.T) {
-	doc := `
-title: "Moby Dick"
-chapter:
-  one:
-    title: "Loomings"
-  two:
-    title: "The Carpet-Bag"
-  three:
-    title: "The Spouter Inn"
-`
-	d, err := ReadValues([]byte(doc))
-	if err != nil {
-		t.Fatalf("Failed to parse the White Whale: %s", err)
-	}
-
-	if _, err := d.Table("title"); err == nil {
-		t.Fatalf("Title is not a table.")
-	}
-
-	if _, err := d.Table("chapter"); err != nil {
-		t.Fatalf("Failed to get the chapter table: %s\n%v", err, d)
-	}
-
-	if v, err := d.Table("chapter.one"); err != nil {
-		t.Errorf("Failed to get chapter.one: %s", err)
-	} else if v["title"] != "Loomings" {
-		t.Errorf("Unexpected title: %s", v["title"])
-	}
-
-	if _, err := d.Table("chapter.three"); err != nil {
-		t.Errorf("Chapter three is missing: %s\n%v", err, d)
-	}
-
-	if _, err := d.Table("chapter.OneHundredThirtySix"); err == nil {
-		t.Errorf("I think you mean 'Epilogue'")
-	}
-}
-
-func matchValues(t *testing.T, data map[string]interface{}) {
-	t.Helper()
-	if data["poet"] != "Coleridge" {
-		t.Errorf("Unexpected poet: %s", data["poet"])
-	}
-
-	if o, err := ttpl("{{len .stanza}}", data); err != nil {
-		t.Errorf("len stanza: %s", err)
-	} else if o != "6" {
-		t.Errorf("Expected 6, got %s", o)
-	}
-
-	if o, err := ttpl("{{.mariner.shot}}", data); err != nil {
-		t.Errorf(".mariner.shot: %s", err)
-	} else if o != "ALBATROSS" {
-		t.Errorf("Expected that mariner shot ALBATROSS")
-	}
-
-	if o, err := ttpl("{{.water.water.where}}", data); err != nil {
-		t.Errorf(".water.water.where: %s", err)
-	} else if o != "everywhere" {
-		t.Errorf("Expected water water everywhere")
-	}
-}
-
-func ttpl(tpl string, v map[string]interface{}) (string, error) {
-	var b bytes.Buffer
-	tt := template.Must(template.New("t").Parse(tpl))
-	err := tt.Execute(&b, v)
-	return b.String(), err
-}
-
-func TestPathValue(t *testing.T) {
-	doc := `
-title: "Moby Dick"
-chapter:
-  one:
-    title: "Loomings"
-  two:
-    title: "The Carpet-Bag"
-  three:
-    title: "The Spouter Inn"
-`
-	d, err := ReadValues([]byte(doc))
-	if err != nil {
-		t.Fatalf("Failed to parse the White Whale: %s", err)
-	}
-
-	if v, err := d.PathValue("chapter.one.title"); err != nil {
-		t.Errorf("Got error instead of title: %s\n%v", err, d)
-	} else if v != "Loomings" {
-		t.Errorf("No error but got wrong value for title: %s\n%v", err, d)
-	}
-	if _, err := d.PathValue("chapter.one.doesnotexist"); err == nil {
-		t.Errorf("Non-existent key should return error: %s\n%v", err, d)
-	}
-	if _, err := d.PathValue("chapter.doesnotexist.one"); err == nil {
-		t.Errorf("Non-existent key in middle of path should return error: %s\n%v", err, d)
-	}
-	if _, err := d.PathValue(""); err == nil {
-		t.Error("Asking for the value from an empty path should yield an error")
-	}
-	if v, err := d.PathValue("title"); err == nil {
-		if v != "Moby Dick" {
-			t.Errorf("Failed to return values for root key title")
-		}
-	}
-}
diff --git a/pkg/action/action.go b/pkg/action/action.go
index 522226a1a..bcf6ca8ef 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -39,6 +39,7 @@ import (
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/engine"
@@ -84,7 +85,7 @@ type Configuration struct {
 	RegistryClient *registry.Client
 
 	// Capabilities describes the capabilities of the Kubernetes cluster.
-	Capabilities *chartutil.Capabilities
+	Capabilities *common.Capabilities
 
 	// CustomTemplateFuncs is defined by users to provide custom template funcs
 	CustomTemplateFuncs template.FuncMap
@@ -176,7 +177,7 @@ func splitAndDeannotate(postrendered string) (map[string]string, error) {
 // TODO: As part of the refactor the duplicate code in cmd/helm/template.go should be removed
 //
 //	This code has to do with writing files to disk.
-func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrenderer.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) {
+func (cfg *Configuration) renderResources(ch *chart.Chart, values common.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrenderer.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) {
 	var hs []*release.Hook
 	b := bytes.NewBuffer(nil)
 
@@ -337,7 +338,7 @@ type RESTClientGetter interface {
 }
 
 // capabilities builds a Capabilities from discovery information.
-func (cfg *Configuration) getCapabilities() (*chartutil.Capabilities, error) {
+func (cfg *Configuration) getCapabilities() (*common.Capabilities, error) {
 	if cfg.Capabilities != nil {
 		return cfg.Capabilities, nil
 	}
@@ -366,14 +367,14 @@ func (cfg *Configuration) getCapabilities() (*chartutil.Capabilities, error) {
 		}
 	}
 
-	cfg.Capabilities = &chartutil.Capabilities{
+	cfg.Capabilities = &common.Capabilities{
 		APIVersions: apiVersions,
-		KubeVersion: chartutil.KubeVersion{
+		KubeVersion: common.KubeVersion{
 			Version: kubeVersion.GitVersion,
 			Major:   kubeVersion.Major,
 			Minor:   kubeVersion.Minor,
 		},
-		HelmVersion: chartutil.DefaultCapabilities.HelmVersion,
+		HelmVersion: common.DefaultCapabilities.HelmVersion,
 	}
 	return cfg.Capabilities, nil
 }
@@ -409,10 +410,10 @@ func (cfg *Configuration) releaseContent(name string, version int) (*release.Rel
 }
 
 // GetVersionSet retrieves a set of available k8s API versions
-func GetVersionSet(client discovery.ServerResourcesInterface) (chartutil.VersionSet, error) {
+func GetVersionSet(client discovery.ServerResourcesInterface) (common.VersionSet, error) {
 	groups, resources, err := client.ServerGroupsAndResources()
 	if err != nil && !discovery.IsGroupDiscoveryFailedError(err) {
-		return chartutil.DefaultVersionSet, fmt.Errorf("could not get apiVersions from Kubernetes: %w", err)
+		return common.DefaultVersionSet, fmt.Errorf("could not get apiVersions from Kubernetes: %w", err)
 	}
 
 	// FIXME: The Kubernetes test fixture for cli appears to always return nil
@@ -420,7 +421,7 @@ func GetVersionSet(client discovery.ServerResourcesInterface) (chartutil.Version
 	// return the default API list. This is also a safe value to return in any
 	// other odd-ball case.
 	if len(groups) == 0 && len(resources) == 0 {
-		return chartutil.DefaultVersionSet, nil
+		return common.DefaultVersionSet, nil
 	}
 
 	versionMap := make(map[string]interface{})
@@ -453,7 +454,7 @@ func GetVersionSet(client discovery.ServerResourcesInterface) (chartutil.Version
 		versions = append(versions, k)
 	}
 
-	return chartutil.VersionSet(versions), nil
+	return common.VersionSet(versions), nil
 }
 
 // recordRelease with an update operation in case reuse has been set.
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index 7a510ace6..b65e40024 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -30,8 +30,8 @@ import (
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 
 	"helm.sh/helm/v4/internal/logging"
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	"helm.sh/helm/v4/pkg/registry"
@@ -64,7 +64,7 @@ func actionConfigFixtureWithDummyResources(t *testing.T, dummyResources kube.Res
 	return &Configuration{
 		Releases:       storage.Init(driver.NewMemory()),
 		KubeClient:     &kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: dummyResources},
-		Capabilities:   chartutil.DefaultCapabilities,
+		Capabilities:   common.DefaultCapabilities,
 		RegistryClient: registryClient,
 	}
 }
@@ -122,14 +122,14 @@ type chartOptions struct {
 type chartOption func(*chartOptions)
 
 func buildChart(opts ...chartOption) *chart.Chart {
-	defaultTemplates := []*chart.File{
+	defaultTemplates := []*common.File{
 		{Name: "templates/hello", Data: []byte("hello: world")},
 		{Name: "templates/hooks", Data: []byte(manifestWithHook)},
 	}
 	return buildChartWithTemplates(defaultTemplates, opts...)
 }
 
-func buildChartWithTemplates(templates []*chart.File, opts ...chartOption) *chart.Chart {
+func buildChartWithTemplates(templates []*common.File, opts ...chartOption) *chart.Chart {
 	c := &chartOptions{
 		Chart: &chart.Chart{
 			// TODO: This should be more complete.
@@ -179,7 +179,7 @@ func withValues(values map[string]interface{}) chartOption {
 
 func withNotes(notes string) chartOption {
 	return func(opts *chartOptions) {
-		opts.Templates = append(opts.Templates, &chart.File{
+		opts.Templates = append(opts.Templates, &common.File{
 			Name: "templates/NOTES.txt",
 			Data: []byte(notes),
 		})
@@ -200,7 +200,7 @@ func withMetadataDependency(dependency chart.Dependency) chartOption {
 
 func withSampleTemplates() chartOption {
 	return func(opts *chartOptions) {
-		sampleTemplates := []*chart.File{
+		sampleTemplates := []*common.File{
 			// This adds basic templates and partials.
 			{Name: "templates/goodbye", Data: []byte("goodbye: world")},
 			{Name: "templates/empty", Data: []byte("")},
@@ -213,14 +213,14 @@ func withSampleTemplates() chartOption {
 
 func withSampleSecret() chartOption {
 	return func(opts *chartOptions) {
-		sampleSecret := &chart.File{Name: "templates/secret.yaml", Data: []byte("apiVersion: v1\nkind: Secret\n")}
+		sampleSecret := &common.File{Name: "templates/secret.yaml", Data: []byte("apiVersion: v1\nkind: Secret\n")}
 		opts.Templates = append(opts.Templates, sampleSecret)
 	}
 }
 
 func withSampleIncludingIncorrectTemplates() chartOption {
 	return func(opts *chartOptions) {
-		sampleTemplates := []*chart.File{
+		sampleTemplates := []*common.File{
 			// This adds basic templates and partials.
 			{Name: "templates/goodbye", Data: []byte("goodbye: world")},
 			{Name: "templates/empty", Data: []byte("")},
@@ -234,7 +234,7 @@ func withSampleIncludingIncorrectTemplates() chartOption {
 
 func withMultipleManifestTemplate() chartOption {
 	return func(opts *chartOptions) {
-		sampleTemplates := []*chart.File{
+		sampleTemplates := []*common.File{
 			{Name: "templates/rbac", Data: []byte(rbacManifests)},
 		}
 		opts.Templates = append(opts.Templates, sampleTemplates...)
@@ -851,7 +851,7 @@ func TestRenderResources_PostRenderer_MergeError(t *testing.T) {
 			Name:       "test-chart",
 			Version:    "0.1.0",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/invalid", Data: []byte("invalid: yaml: content:")},
 		},
 	}
diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go
index 18b8b4838..a0b5d92c1 100644
--- a/pkg/action/get_values.go
+++ b/pkg/action/get_values.go
@@ -16,9 +16,7 @@ limitations under the License.
 
 package action
 
-import (
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-)
+import "helm.sh/helm/v4/pkg/chart/common/util"
 
 // GetValues is the action for checking a given release's values.
 //
@@ -50,7 +48,7 @@ func (g *GetValues) Run(name string) (map[string]interface{}, error) {
 
 	// If the user wants all values, compute the values and return.
 	if g.AllValues {
-		cfg, err := chartutil.CoalesceValues(rel.Chart, rel.Config)
+		cfg, err := util.CoalesceValues(rel.Chart, rel.Config)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/action/hooks_test.go b/pkg/action/hooks_test.go
index e3a2c0808..091155bc2 100644
--- a/pkg/action/hooks_test.go
+++ b/pkg/action/hooks_test.go
@@ -29,8 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	chart "helm.sh/helm/v4/pkg/chart/v2"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/kube"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -178,7 +177,7 @@ func runInstallForHooksWithSuccess(t *testing.T, manifest, expectedNamespace str
 	outBuffer := &bytes.Buffer{}
 	instAction.cfg.KubeClient = &kubefake.PrintingKubeClient{Out: io.Discard, LogOutput: outBuffer}
 
-	templates := []*chart.File{
+	templates := []*common.File{
 		{Name: "templates/hello", Data: []byte("hello: world")},
 		{Name: "templates/hooks", Data: []byte(manifest)},
 	}
@@ -205,7 +204,7 @@ func runInstallForHooksWithFailure(t *testing.T, manifest, expectedNamespace str
 	outBuffer := &bytes.Buffer{}
 	failingClient.PrintingKubeClient = kubefake.PrintingKubeClient{Out: io.Discard, LogOutput: outBuffer}
 
-	templates := []*chart.File{
+	templates := []*common.File{
 		{Name: "templates/hello", Data: []byte("hello: world")},
 		{Name: "templates/hooks", Data: []byte(manifest)},
 	}
@@ -382,7 +381,7 @@ data:
 			configuration := &Configuration{
 				Releases:     storage.Init(driver.NewMemory()),
 				KubeClient:   kubeClient,
-				Capabilities: chartutil.DefaultCapabilities,
+				Capabilities: common.DefaultCapabilities,
 			}
 
 			serverSideApply := true
diff --git a/pkg/action/install.go b/pkg/action/install.go
index b2330d551..0fe3ebc4b 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -41,6 +41,8 @@ import (
 	"k8s.io/cli-runtime/pkg/resource"
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/cli"
@@ -113,8 +115,8 @@ type Install struct {
 	// KubeVersion allows specifying a custom kubernetes version to use and
 	// APIVersions allows a manual set of supported API Versions to be passed
 	// (for things like templating). These are ignored if ClientOnly is false
-	KubeVersion *chartutil.KubeVersion
-	APIVersions chartutil.VersionSet
+	KubeVersion *common.KubeVersion
+	APIVersions common.VersionSet
 	// Used by helm template to render charts with .Release.IsUpgrade. Ignored if Dry-Run is false
 	IsUpgrade bool
 	// Enable DNS lookups when rendering templates
@@ -292,7 +294,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 	if i.ClientOnly {
 		// Add mock objects in here so it doesn't use Kube API server
 		// NOTE(bacongobbler): used for `helm template`
-		i.cfg.Capabilities = chartutil.DefaultCapabilities.Copy()
+		i.cfg.Capabilities = common.DefaultCapabilities.Copy()
 		if i.KubeVersion != nil {
 			i.cfg.Capabilities.KubeVersion = *i.KubeVersion
 		}
@@ -319,14 +321,14 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma
 
 	// special case for helm template --is-upgrade
 	isUpgrade := i.IsUpgrade && i.isDryRun()
-	options := chartutil.ReleaseOptions{
+	options := common.ReleaseOptions{
 		Name:      i.ReleaseName,
 		Namespace: i.Namespace,
 		Revision:  1,
 		IsInstall: !isUpgrade,
 		IsUpgrade: isUpgrade,
 	}
-	valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chrt, vals, options, caps, i.SkipSchemaValidation)
+	valuesToRender, err := util.ToRenderValuesWithSchemaValidation(chrt, vals, options, caps, i.SkipSchemaValidation)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index f567b3df4..92bb64b4d 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -45,8 +45,7 @@ import (
 	"k8s.io/client-go/rest/fake"
 
 	"helm.sh/helm/v4/internal/test"
-	chart "helm.sh/helm/v4/pkg/chart/v2"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/kube"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -258,7 +257,7 @@ func TestInstallReleaseClientOnly(t *testing.T) {
 	instAction.ClientOnly = true
 	instAction.Run(buildChart(), nil) // disregard output
 
-	is.Equal(instAction.cfg.Capabilities, chartutil.DefaultCapabilities)
+	is.Equal(instAction.cfg.Capabilities, common.DefaultCapabilities)
 	is.Equal(instAction.cfg.KubeClient, &kubefake.PrintingKubeClient{Out: io.Discard})
 }
 
@@ -429,7 +428,7 @@ func TestInstallRelease_DryRun_Lookup(t *testing.T) {
 	vals := map[string]interface{}{}
 
 	mockChart := buildChart(withSampleTemplates())
-	mockChart.Templates = append(mockChart.Templates, &chart.File{
+	mockChart.Templates = append(mockChart.Templates, &common.File{
 		Name: "templates/lookup",
 		Data: []byte(`goodbye: {{ lookup "v1" "Namespace" "" "___" }}`),
 	})
diff --git a/pkg/action/lint.go b/pkg/action/lint.go
index 7b3c00ad2..208fd4637 100644
--- a/pkg/action/lint.go
+++ b/pkg/action/lint.go
@@ -22,9 +22,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/v2/lint"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 // Lint is the action for checking that the semantics of a chart are well-formed.
@@ -36,7 +37,7 @@ type Lint struct {
 	WithSubcharts        bool
 	Quiet                bool
 	SkipSchemaValidation bool
-	KubeVersion          *chartutil.KubeVersion
+	KubeVersion          *common.KubeVersion
 }
 
 // LintResult is the result of Lint
@@ -86,7 +87,7 @@ func HasWarningsOrErrors(result *LintResult) bool {
 	return len(result.Errors) > 0
 }
 
-func lintChart(path string, vals map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, skipSchemaValidation bool) (support.Linter, error) {
+func lintChart(path string, vals map[string]interface{}, namespace string, kubeVersion *common.KubeVersion, skipSchemaValidation bool) (support.Linter, error) {
 	var chartPath string
 	linter := support.Linter{}
 
diff --git a/pkg/action/show.go b/pkg/action/show.go
index 6d6e10d24..4195d69a5 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/cli-runtime/pkg/printers"
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	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"
@@ -140,7 +141,7 @@ func (s *Show) Run(chartpath string) (string, error) {
 	return out.String(), nil
 }
 
-func findReadme(files []*chart.File) (file *chart.File) {
+func findReadme(files []*common.File) (file *common.File) {
 	for _, file := range files {
 		for _, n := range readmeFileNames {
 			if file == nil {
diff --git a/pkg/action/show_test.go b/pkg/action/show_test.go
index 67eba2338..faf306f2a 100644
--- a/pkg/action/show_test.go
+++ b/pkg/action/show_test.go
@@ -19,6 +19,7 @@ package action
 import (
 	"testing"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -27,14 +28,14 @@ func TestShow(t *testing.T) {
 	client := NewShow(ShowAll, config)
 	client.chart = &chart.Chart{
 		Metadata: &chart.Metadata{Name: "alpine"},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "README.md", Data: []byte("README\n")},
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
 			{Name: "crds/baz.yaml", Data: []byte("baz\n")},
 		},
-		Raw: []*chart.File{
+		Raw: []*common.File{
 			{Name: "values.yaml", Data: []byte("VALUES\n")},
 		},
 		Values: map[string]interface{}{},
@@ -105,7 +106,7 @@ func TestShowCRDs(t *testing.T) {
 	client := NewShow(ShowCRDs, config)
 	client.chart = &chart.Chart{
 		Metadata: &chart.Metadata{Name: "alpine"},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
@@ -138,7 +139,7 @@ func TestShowNoReadme(t *testing.T) {
 	client := NewShow(ShowAll, config)
 	client.chart = &chart.Chart{
 		Metadata: &chart.Metadata{Name: "alpine"},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index c00a59079..3688adf0e 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -28,6 +28,8 @@ import (
 
 	"k8s.io/cli-runtime/pkg/resource"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
@@ -260,7 +262,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 	// the release object.
 	revision := lastRelease.Version + 1
 
-	options := chartutil.ReleaseOptions{
+	options := common.ReleaseOptions{
 		Name:      name,
 		Namespace: currentRelease.Namespace,
 		Revision:  revision,
@@ -271,7 +273,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin
 	if err != nil {
 		return nil, nil, false, err
 	}
-	valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chart, vals, options, caps, u.SkipSchemaValidation)
+	valuesToRender, err := util.ToRenderValuesWithSchemaValidation(chart, vals, options, caps, u.SkipSchemaValidation)
 	if err != nil {
 		return nil, nil, false, err
 	}
@@ -588,12 +590,12 @@ func (u *Upgrade) reuseValues(chart *chart.Chart, current *release.Release, newV
 		slog.Debug("reusing the old release's values")
 
 		// We have to regenerate the old coalesced values:
-		oldVals, err := chartutil.CoalesceValues(current.Chart, current.Config)
+		oldVals, err := util.CoalesceValues(current.Chart, current.Config)
 		if err != nil {
 			return nil, fmt.Errorf("failed to rebuild old values: %w", err)
 		}
 
-		newVals = chartutil.CoalesceTables(newVals, current.Config)
+		newVals = util.CoalesceTables(newVals, current.Config)
 
 		chart.Values = oldVals
 
@@ -604,7 +606,7 @@ func (u *Upgrade) reuseValues(chart *chart.Chart, current *release.Release, newV
 	if u.ResetThenReuseValues {
 		slog.Debug("merging values from old release to new values")
 
-		newVals = chartutil.CoalesceTables(newVals, current.Config)
+		newVals = util.CoalesceTables(newVals, current.Config)
 
 		return newVals, nil
 	}
diff --git a/pkg/chart/common.go b/pkg/chart/common.go
new file mode 100644
index 000000000..8b1dd58c3
--- /dev/null
+++ b/pkg/chart/common.go
@@ -0,0 +1,219 @@
+/*
+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 chart
+
+import (
+	"errors"
+	"fmt"
+	"log/slog"
+	"reflect"
+	"strings"
+
+	v3chart "helm.sh/helm/v4/internal/chart/v3"
+	common "helm.sh/helm/v4/pkg/chart/common"
+	v2chart "helm.sh/helm/v4/pkg/chart/v2"
+)
+
+var NewAccessor func(chrt Charter) (Accessor, error) = NewDefaultAccessor //nolint:revive
+
+func NewDefaultAccessor(chrt Charter) (Accessor, error) {
+	switch v := chrt.(type) {
+	case v2chart.Chart:
+		return &v2Accessor{&v}, nil
+	case *v2chart.Chart:
+		return &v2Accessor{v}, nil
+	case v3chart.Chart:
+		return &v3Accessor{&v}, nil
+	case *v3chart.Chart:
+		return &v3Accessor{v}, nil
+	default:
+		return nil, errors.New("unsupported chart type")
+	}
+}
+
+type v2Accessor struct {
+	chrt *v2chart.Chart
+}
+
+func (r *v2Accessor) Name() string {
+	return r.chrt.Metadata.Name
+}
+
+func (r *v2Accessor) IsRoot() bool {
+	return r.chrt.IsRoot()
+}
+
+func (r *v2Accessor) MetadataAsMap() map[string]interface{} {
+	var ret map[string]interface{}
+	if r.chrt.Metadata == nil {
+		return ret
+	}
+
+	ret, err := structToMap(r.chrt.Metadata)
+	if err != nil {
+		slog.Error("error converting metadata to map", "error", err)
+	}
+	return ret
+}
+
+func (r *v2Accessor) Files() []*common.File {
+	return r.chrt.Files
+}
+
+func (r *v2Accessor) Templates() []*common.File {
+	return r.chrt.Templates
+}
+
+func (r *v2Accessor) ChartFullPath() string {
+	return r.chrt.ChartFullPath()
+}
+
+func (r *v2Accessor) IsLibraryChart() bool {
+	return strings.EqualFold(r.chrt.Metadata.Type, "library")
+}
+
+func (r *v2Accessor) Dependencies() []Charter {
+	var deps = make([]Charter, len(r.chrt.Dependencies()))
+	for i, c := range r.chrt.Dependencies() {
+		deps[i] = c
+	}
+	return deps
+}
+
+func (r *v2Accessor) Values() map[string]interface{} {
+	return r.chrt.Values
+}
+
+func (r *v2Accessor) Schema() []byte {
+	return r.chrt.Schema
+}
+
+type v3Accessor struct {
+	chrt *v3chart.Chart
+}
+
+func (r *v3Accessor) Name() string {
+	return r.chrt.Metadata.Name
+}
+
+func (r *v3Accessor) IsRoot() bool {
+	return r.chrt.IsRoot()
+}
+
+func (r *v3Accessor) MetadataAsMap() map[string]interface{} {
+	var ret map[string]interface{}
+	if r.chrt.Metadata == nil {
+		return ret
+	}
+
+	ret, err := structToMap(r.chrt.Metadata)
+	if err != nil {
+		slog.Error("error converting metadata to map", "error", err)
+	}
+	return ret
+}
+
+func (r *v3Accessor) Files() []*common.File {
+	return r.chrt.Files
+}
+
+func (r *v3Accessor) Templates() []*common.File {
+	return r.chrt.Templates
+}
+
+func (r *v3Accessor) ChartFullPath() string {
+	return r.chrt.ChartFullPath()
+}
+
+func (r *v3Accessor) IsLibraryChart() bool {
+	return strings.EqualFold(r.chrt.Metadata.Type, "library")
+}
+
+func (r *v3Accessor) Dependencies() []Charter {
+	var deps = make([]Charter, len(r.chrt.Dependencies()))
+	for i, c := range r.chrt.Dependencies() {
+		deps[i] = c
+	}
+	return deps
+}
+
+func (r *v3Accessor) Values() map[string]interface{} {
+	return r.chrt.Values
+}
+
+func (r *v3Accessor) Schema() []byte {
+	return r.chrt.Schema
+}
+
+func structToMap(obj interface{}) (map[string]interface{}, error) {
+	objValue := reflect.ValueOf(obj)
+
+	// If the value is a pointer, dereference it
+	if objValue.Kind() == reflect.Ptr {
+		objValue = objValue.Elem()
+	}
+
+	// Check if the input is a struct
+	if objValue.Kind() != reflect.Struct {
+		return nil, fmt.Errorf("input must be a struct or a pointer to a struct")
+	}
+
+	result := make(map[string]interface{})
+	objType := objValue.Type()
+
+	for i := 0; i < objValue.NumField(); i++ {
+		field := objType.Field(i)
+		value := objValue.Field(i)
+
+		switch value.Kind() {
+		case reflect.Struct:
+			nestedMap, err := structToMap(value.Interface())
+			if err != nil {
+				return nil, err
+			}
+			result[field.Name] = nestedMap
+		case reflect.Ptr:
+			// Recurse for pointers by dereferencing
+			if value.IsNil() {
+				result[field.Name] = nil
+			} else {
+				nestedMap, err := structToMap(value.Interface())
+				if err != nil {
+					return nil, err
+				}
+				result[field.Name] = nestedMap
+			}
+		case reflect.Slice:
+			sliceOfMaps := make([]interface{}, value.Len())
+			for j := 0; j < value.Len(); j++ {
+				sliceElement := value.Index(j)
+				if sliceElement.Kind() == reflect.Struct || sliceElement.Kind() == reflect.Ptr {
+					nestedMap, err := structToMap(sliceElement.Interface())
+					if err != nil {
+						return nil, err
+					}
+					sliceOfMaps[j] = nestedMap
+				} else {
+					sliceOfMaps[j] = sliceElement.Interface()
+				}
+			}
+			result[field.Name] = sliceOfMaps
+		default:
+			result[field.Name] = value.Interface()
+		}
+	}
+	return result, nil
+}
diff --git a/pkg/chart/v2/util/capabilities.go b/pkg/chart/common/capabilities.go
similarity index 99%
rename from pkg/chart/v2/util/capabilities.go
rename to pkg/chart/common/capabilities.go
index 19d62c5e3..355c3978a 100644
--- a/pkg/chart/v2/util/capabilities.go
+++ b/pkg/chart/common/capabilities.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"fmt"
diff --git a/pkg/chart/v2/util/capabilities_test.go b/pkg/chart/common/capabilities_test.go
similarity index 99%
rename from pkg/chart/v2/util/capabilities_test.go
rename to pkg/chart/common/capabilities_test.go
index e5513b3fd..bf32b1f3f 100644
--- a/pkg/chart/v2/util/capabilities_test.go
+++ b/pkg/chart/common/capabilities_test.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"testing"
diff --git a/pkg/chart/v2/util/errors.go b/pkg/chart/common/errors.go
similarity index 98%
rename from pkg/chart/v2/util/errors.go
rename to pkg/chart/common/errors.go
index a175b9758..b0a2d650e 100644
--- a/pkg/chart/v2/util/errors.go
+++ b/pkg/chart/common/errors.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"fmt"
diff --git a/pkg/chart/v2/util/errors_test.go b/pkg/chart/common/errors_test.go
similarity index 98%
rename from pkg/chart/v2/util/errors_test.go
rename to pkg/chart/common/errors_test.go
index b8ae86384..06b3b054c 100644
--- a/pkg/chart/v2/util/errors_test.go
+++ b/pkg/chart/common/errors_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"testing"
diff --git a/internal/chart/v3/file.go b/pkg/chart/common/file.go
similarity index 98%
rename from internal/chart/v3/file.go
rename to pkg/chart/common/file.go
index ba04e106d..304643f1a 100644
--- a/internal/chart/v3/file.go
+++ b/pkg/chart/common/file.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v3
+package common
 
 // File represents a file as a name/value pair.
 //
diff --git a/pkg/chart/v2/util/testdata/coleridge.yaml b/pkg/chart/common/testdata/coleridge.yaml
similarity index 100%
rename from pkg/chart/v2/util/testdata/coleridge.yaml
rename to pkg/chart/common/testdata/coleridge.yaml
diff --git a/pkg/chart/v2/util/coalesce.go b/pkg/chart/common/util/coalesce.go
similarity index 81%
rename from pkg/chart/v2/util/coalesce.go
rename to pkg/chart/common/util/coalesce.go
index a3e0f5ae8..5bfa1c608 100644
--- a/pkg/chart/v2/util/coalesce.go
+++ b/pkg/chart/common/util/coalesce.go
@@ -23,7 +23,8 @@ import (
 
 	"github.com/mitchellh/copystructure"
 
-	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chart "helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func concatPrefix(a, b string) string {
@@ -42,7 +43,7 @@ func concatPrefix(a, b string) string {
 //   - Scalar values and arrays are replaced, maps are merged
 //   - A chart has access to all of the variables for it, as well as all of
 //     the values destined for its dependencies.
-func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
+func CoalesceValues(chrt chart.Charter, vals map[string]interface{}) (common.Values, error) {
 	valsCopy, err := copyValues(vals)
 	if err != nil {
 		return vals, err
@@ -64,7 +65,7 @@ func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, err
 // Retaining Nils is useful when processes early in a Helm action or business
 // logic need to retain them for when Coalescing will happen again later in the
 // business logic.
-func MergeValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error) {
+func MergeValues(chrt chart.Charter, vals map[string]interface{}) (common.Values, error) {
 	valsCopy, err := copyValues(vals)
 	if err != nil {
 		return vals, err
@@ -72,7 +73,7 @@ func MergeValues(chrt *chart.Chart, vals map[string]interface{}) (Values, error)
 	return coalesce(log.Printf, chrt, valsCopy, "", true)
 }
 
-func copyValues(vals map[string]interface{}) (Values, error) {
+func copyValues(vals map[string]interface{}) (common.Values, error) {
 	v, err := copystructure.Copy(vals)
 	if err != nil {
 		return vals, err
@@ -96,28 +97,36 @@ type printFn func(format string, v ...interface{})
 // Note, the merge argument specifies whether this is being used by MergeValues
 // or CoalesceValues. Coalescing removes null values and their keys in some
 // situations while merging keeps the null values.
-func coalesce(printf printFn, ch *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
+func coalesce(printf printFn, ch chart.Charter, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
 	coalesceValues(printf, ch, dest, prefix, merge)
 	return coalesceDeps(printf, ch, dest, prefix, merge)
 }
 
 // coalesceDeps coalesces the dependencies of the given chart.
-func coalesceDeps(printf printFn, chrt *chart.Chart, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
-	for _, subchart := range chrt.Dependencies() {
-		if c, ok := dest[subchart.Name()]; !ok {
+func coalesceDeps(printf printFn, chrt chart.Charter, dest map[string]interface{}, prefix string, merge bool) (map[string]interface{}, error) {
+	ch, err := chart.NewAccessor(chrt)
+	if err != nil {
+		return dest, err
+	}
+	for _, subchart := range ch.Dependencies() {
+		sub, err := chart.NewAccessor(subchart)
+		if err != nil {
+			return dest, err
+		}
+		if c, ok := dest[sub.Name()]; !ok {
 			// If dest doesn't already have the key, create it.
-			dest[subchart.Name()] = make(map[string]interface{})
+			dest[sub.Name()] = make(map[string]interface{})
 		} else if !istable(c) {
-			return dest, fmt.Errorf("type mismatch on %s: %t", subchart.Name(), c)
+			return dest, fmt.Errorf("type mismatch on %s: %t", sub.Name(), c)
 		}
-		if dv, ok := dest[subchart.Name()]; ok {
+		if dv, ok := dest[sub.Name()]; ok {
 			dvmap := dv.(map[string]interface{})
-			subPrefix := concatPrefix(prefix, chrt.Metadata.Name)
+			subPrefix := concatPrefix(prefix, ch.Name())
 			// Get globals out of dest and merge them into dvmap.
 			coalesceGlobals(printf, dvmap, dest, subPrefix, merge)
 			// Now coalesce the rest of the values.
 			var err error
-			dest[subchart.Name()], err = coalesce(printf, subchart, dvmap, subPrefix, merge)
+			dest[sub.Name()], err = coalesce(printf, subchart, dvmap, subPrefix, merge)
 			if err != nil {
 				return dest, err
 			}
@@ -132,17 +141,17 @@ func coalesceDeps(printf printFn, chrt *chart.Chart, dest map[string]interface{}
 func coalesceGlobals(printf printFn, dest, src map[string]interface{}, prefix string, _ bool) {
 	var dg, sg map[string]interface{}
 
-	if destglob, ok := dest[GlobalKey]; !ok {
+	if destglob, ok := dest[common.GlobalKey]; !ok {
 		dg = make(map[string]interface{})
 	} else if dg, ok = destglob.(map[string]interface{}); !ok {
-		printf("warning: skipping globals because destination %s is not a table.", GlobalKey)
+		printf("warning: skipping globals because destination %s is not a table.", common.GlobalKey)
 		return
 	}
 
-	if srcglob, ok := src[GlobalKey]; !ok {
+	if srcglob, ok := src[common.GlobalKey]; !ok {
 		sg = make(map[string]interface{})
 	} else if sg, ok = srcglob.(map[string]interface{}); !ok {
-		printf("warning: skipping globals because source %s is not a table.", GlobalKey)
+		printf("warning: skipping globals because source %s is not a table.", common.GlobalKey)
 		return
 	}
 
@@ -178,7 +187,7 @@ func coalesceGlobals(printf printFn, dest, src map[string]interface{}, prefix st
 			dg[key] = val
 		}
 	}
-	dest[GlobalKey] = dg
+	dest[common.GlobalKey] = dg
 }
 
 func copyMap(src map[string]interface{}) map[string]interface{} {
@@ -190,13 +199,18 @@ func copyMap(src map[string]interface{}) map[string]interface{} {
 // coalesceValues builds up a values map for a particular chart.
 //
 // Values in v will override the values in the chart.
-func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, prefix string, merge bool) {
-	subPrefix := concatPrefix(prefix, c.Metadata.Name)
+func coalesceValues(printf printFn, c chart.Charter, v map[string]interface{}, prefix string, merge bool) {
+	ch, err := chart.NewAccessor(c)
+	if err != nil {
+		return
+	}
+
+	subPrefix := concatPrefix(prefix, ch.Name())
 
 	// Using c.Values directly when coalescing a table can cause problems where
 	// the original c.Values is altered. Creating a deep copy stops the problem.
 	// This section is fault-tolerant as there is no ability to return an error.
-	valuesCopy, err := copystructure.Copy(c.Values)
+	valuesCopy, err := copystructure.Copy(ch.Values())
 	var vc map[string]interface{}
 	var ok bool
 	if err != nil {
@@ -205,7 +219,7 @@ func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, pr
 		// wrong with c.Values. In this case we will use c.Values and report
 		// an error.
 		printf("warning: unable to copy values, err: %s", err)
-		vc = c.Values
+		vc = ch.Values()
 	} else {
 		vc, ok = valuesCopy.(map[string]interface{})
 		if !ok {
@@ -213,7 +227,7 @@ func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, pr
 			// it cannot be treated as map[string]interface{} there is something
 			// strangely wrong. Log it and use c.Values
 			printf("warning: unable to convert values copy to values type")
-			vc = c.Values
+			vc = ch.Values()
 		}
 	}
 
@@ -250,9 +264,17 @@ func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, pr
 	}
 }
 
-func childChartMergeTrue(chrt *chart.Chart, key string, merge bool) bool {
-	for _, subchart := range chrt.Dependencies() {
-		if subchart.Name() == key {
+func childChartMergeTrue(chrt chart.Charter, key string, merge bool) bool {
+	ch, err := chart.NewAccessor(chrt)
+	if err != nil {
+		return merge
+	}
+	for _, subchart := range ch.Dependencies() {
+		sub, err := chart.NewAccessor(subchart)
+		if err != nil {
+			return merge
+		}
+		if sub.Name() == key {
 			return true
 		}
 	}
@@ -306,3 +328,9 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
 	}
 	return dst
 }
+
+// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
+func istable(v interface{}) bool {
+	_, ok := v.(map[string]interface{})
+	return ok
+}
diff --git a/pkg/chart/v2/util/coalesce_test.go b/pkg/chart/common/util/coalesce_test.go
similarity index 97%
rename from pkg/chart/v2/util/coalesce_test.go
rename to pkg/chart/common/util/coalesce_test.go
index e2c45a435..871bfa8da 100644
--- a/pkg/chart/v2/util/coalesce_test.go
+++ b/pkg/chart/common/util/coalesce_test.go
@@ -17,13 +17,16 @@ limitations under the License.
 package util
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"maps"
 	"testing"
+	"text/template"
 
 	"github.com/stretchr/testify/assert"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -136,7 +139,7 @@ func TestCoalesceValues(t *testing.T) {
 		},
 	)
 
-	vals, err := ReadValues(testCoalesceValuesYaml)
+	vals, err := common.ReadValues(testCoalesceValuesYaml)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -144,7 +147,7 @@ func TestCoalesceValues(t *testing.T) {
 	// taking a copy of the values before passing it
 	// to CoalesceValues as argument, so that we can
 	// use it for asserting later
-	valsCopy := make(Values, len(vals))
+	valsCopy := make(common.Values, len(vals))
 	maps.Copy(valsCopy, vals)
 
 	v, err := CoalesceValues(c, vals)
@@ -238,6 +241,13 @@ func TestCoalesceValues(t *testing.T) {
 	is.Equal(valsCopy, vals)
 }
 
+func ttpl(tpl string, v map[string]interface{}) (string, error) {
+	var b bytes.Buffer
+	tt := template.Must(template.New("t").Parse(tpl))
+	err := tt.Execute(&b, v)
+	return b.String(), err
+}
+
 func TestMergeValues(t *testing.T) {
 	is := assert.New(t)
 
@@ -294,7 +304,7 @@ func TestMergeValues(t *testing.T) {
 		},
 	)
 
-	vals, err := ReadValues(testCoalesceValuesYaml)
+	vals, err := common.ReadValues(testCoalesceValuesYaml)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -302,7 +312,7 @@ func TestMergeValues(t *testing.T) {
 	// taking a copy of the values before passing it
 	// to MergeValues as argument, so that we can
 	// use it for asserting later
-	valsCopy := make(Values, len(vals))
+	valsCopy := make(common.Values, len(vals))
 	maps.Copy(valsCopy, vals)
 
 	v, err := MergeValues(c, vals)
diff --git a/pkg/chart/v2/util/jsonschema.go b/pkg/chart/common/util/jsonschema.go
similarity index 89%
rename from pkg/chart/v2/util/jsonschema.go
rename to pkg/chart/common/util/jsonschema.go
index 72e133363..acd2ca100 100644
--- a/pkg/chart/v2/util/jsonschema.go
+++ b/pkg/chart/common/util/jsonschema.go
@@ -30,7 +30,8 @@ import (
 
 	"helm.sh/helm/v4/internal/version"
 
-	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chart "helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // HTTPURLLoader implements a loader for HTTP/HTTPS URLs
@@ -71,11 +72,15 @@ func newHTTPURLLoader() *HTTPURLLoader {
 }
 
 // ValidateAgainstSchema checks that values does not violate the structure laid out in schema
-func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
+func ValidateAgainstSchema(ch chart.Charter, values map[string]interface{}) error {
+	chrt, err := chart.NewAccessor(ch)
+	if err != nil {
+		return err
+	}
 	var sb strings.Builder
-	if chrt.Schema != nil {
+	if chrt.Schema() != nil {
 		slog.Debug("chart name", "chart-name", chrt.Name())
-		err := ValidateAgainstSingleSchema(values, chrt.Schema)
+		err := ValidateAgainstSingleSchema(values, chrt.Schema())
 		if err != nil {
 			sb.WriteString(fmt.Sprintf("%s:\n", chrt.Name()))
 			sb.WriteString(err.Error())
@@ -84,7 +89,11 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err
 	slog.Debug("number of dependencies in the chart", "dependencies", len(chrt.Dependencies()))
 	// For each dependency, recursively call this function with the coalesced values
 	for _, subchart := range chrt.Dependencies() {
-		subchartValues := values[subchart.Name()].(map[string]interface{})
+		sub, err := chart.NewAccessor(subchart)
+		if err != nil {
+			return err
+		}
+		subchartValues := values[sub.Name()].(map[string]interface{})
 		if err := ValidateAgainstSchema(subchart, subchartValues); err != nil {
 			sb.WriteString(err.Error())
 		}
@@ -98,7 +107,7 @@ func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) err
 }
 
 // ValidateAgainstSingleSchema checks that values does not violate the structure laid out in this schema
-func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error) {
+func ValidateAgainstSingleSchema(values common.Values, schemaJSON []byte) (reterr error) {
 	defer func() {
 		if r := recover(); r != nil {
 			reterr = fmt.Errorf("unable to validate schema: %s", r)
diff --git a/pkg/chart/v2/util/jsonschema_test.go b/pkg/chart/common/util/jsonschema_test.go
similarity index 96%
rename from pkg/chart/v2/util/jsonschema_test.go
rename to pkg/chart/common/util/jsonschema_test.go
index cd95b7faf..b34f9d514 100644
--- a/pkg/chart/v2/util/jsonschema_test.go
+++ b/pkg/chart/common/util/jsonschema_test.go
@@ -23,11 +23,12 @@ import (
 	"strings"
 	"testing"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestValidateAgainstSingleSchema(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values.yaml")
+	values, err := common.ReadValuesFile("./testdata/test-values.yaml")
 	if err != nil {
 		t.Fatalf("Error reading YAML file: %s", err)
 	}
@@ -42,7 +43,7 @@ func TestValidateAgainstSingleSchema(t *testing.T) {
 }
 
 func TestValidateAgainstInvalidSingleSchema(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values.yaml")
+	values, err := common.ReadValuesFile("./testdata/test-values.yaml")
 	if err != nil {
 		t.Fatalf("Error reading YAML file: %s", err)
 	}
@@ -66,7 +67,7 @@ func TestValidateAgainstInvalidSingleSchema(t *testing.T) {
 }
 
 func TestValidateAgainstSingleSchemaNegative(t *testing.T) {
-	values, err := ReadValuesFile("./testdata/test-values-negative.yaml")
+	values, err := common.ReadValuesFile("./testdata/test-values-negative.yaml")
 	if err != nil {
 		t.Fatalf("Error reading YAML file: %s", err)
 	}
diff --git a/pkg/chart/v2/util/testdata/test-values-invalid.schema.json b/pkg/chart/common/util/testdata/test-values-invalid.schema.json
similarity index 100%
rename from pkg/chart/v2/util/testdata/test-values-invalid.schema.json
rename to pkg/chart/common/util/testdata/test-values-invalid.schema.json
diff --git a/pkg/chart/v2/util/testdata/test-values-negative.yaml b/pkg/chart/common/util/testdata/test-values-negative.yaml
similarity index 100%
rename from pkg/chart/v2/util/testdata/test-values-negative.yaml
rename to pkg/chart/common/util/testdata/test-values-negative.yaml
diff --git a/pkg/chart/v2/util/testdata/test-values.schema.json b/pkg/chart/common/util/testdata/test-values.schema.json
similarity index 100%
rename from pkg/chart/v2/util/testdata/test-values.schema.json
rename to pkg/chart/common/util/testdata/test-values.schema.json
diff --git a/pkg/chart/v2/util/testdata/test-values.yaml b/pkg/chart/common/util/testdata/test-values.yaml
similarity index 100%
rename from pkg/chart/v2/util/testdata/test-values.yaml
rename to pkg/chart/common/util/testdata/test-values.yaml
diff --git a/pkg/chart/common/util/values.go b/pkg/chart/common/util/values.go
new file mode 100644
index 000000000..85cb29012
--- /dev/null
+++ b/pkg/chart/common/util/values.go
@@ -0,0 +1,70 @@
+/*
+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 util
+
+import (
+	"fmt"
+
+	"helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/common"
+)
+
+// ToRenderValues composes the struct from the data coming from the Releases, Charts and Values files
+//
+// This takes both ReleaseOptions and Capabilities to merge into the render values.
+func ToRenderValues(chrt chart.Charter, chrtVals map[string]interface{}, options common.ReleaseOptions, caps *common.Capabilities) (common.Values, error) {
+	return ToRenderValuesWithSchemaValidation(chrt, chrtVals, options, caps, false)
+}
+
+// ToRenderValuesWithSchemaValidation composes the struct from the data coming from the Releases, Charts and Values files
+//
+// This takes both ReleaseOptions and Capabilities to merge into the render values.
+func ToRenderValuesWithSchemaValidation(chrt chart.Charter, chrtVals map[string]interface{}, options common.ReleaseOptions, caps *common.Capabilities, skipSchemaValidation bool) (common.Values, error) {
+	if caps == nil {
+		caps = common.DefaultCapabilities
+	}
+	accessor, err := chart.NewAccessor(chrt)
+	if err != nil {
+		return nil, err
+	}
+	top := map[string]interface{}{
+		"Chart":        accessor.MetadataAsMap(),
+		"Capabilities": caps,
+		"Release": map[string]interface{}{
+			"Name":      options.Name,
+			"Namespace": options.Namespace,
+			"IsUpgrade": options.IsUpgrade,
+			"IsInstall": options.IsInstall,
+			"Revision":  options.Revision,
+			"Service":   "Helm",
+		},
+	}
+
+	vals, err := CoalesceValues(chrt, chrtVals)
+	if err != nil {
+		return common.Values(top), err
+	}
+
+	if !skipSchemaValidation {
+		if err := ValidateAgainstSchema(chrt, vals); err != nil {
+			return top, fmt.Errorf("values don't meet the specifications of the schema(s) in the following chart(s):\n%w", err)
+		}
+	}
+
+	top["Values"] = vals
+	return top, nil
+}
diff --git a/pkg/chart/common/util/values_test.go b/pkg/chart/common/util/values_test.go
new file mode 100644
index 000000000..5fc030567
--- /dev/null
+++ b/pkg/chart/common/util/values_test.go
@@ -0,0 +1,111 @@
+/*
+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 util
+
+import (
+	"testing"
+
+	"helm.sh/helm/v4/pkg/chart/common"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
+)
+
+func TestToRenderValues(t *testing.T) {
+
+	chartValues := map[string]interface{}{
+		"name": "al Rashid",
+		"where": map[string]interface{}{
+			"city":  "Basrah",
+			"title": "caliph",
+		},
+	}
+
+	overrideValues := map[string]interface{}{
+		"name": "Haroun",
+		"where": map[string]interface{}{
+			"city": "Baghdad",
+			"date": "809 CE",
+		},
+	}
+
+	c := &chart.Chart{
+		Metadata:  &chart.Metadata{Name: "test"},
+		Templates: []*common.File{},
+		Values:    chartValues,
+		Files: []*common.File{
+			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
+		},
+	}
+	c.AddDependency(&chart.Chart{
+		Metadata: &chart.Metadata{Name: "where"},
+	})
+
+	o := common.ReleaseOptions{
+		Name:      "Seven Voyages",
+		Namespace: "default",
+		Revision:  1,
+		IsInstall: true,
+	}
+
+	res, err := ToRenderValuesWithSchemaValidation(c, overrideValues, o, nil, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Ensure that the top-level values are all set.
+	metamap := res["Chart"].(map[string]interface{})
+	if name := metamap["Name"]; name.(string) != "test" {
+		t.Errorf("Expected chart name 'test', got %q", name)
+	}
+	relmap := res["Release"].(map[string]interface{})
+	if name := relmap["Name"]; name.(string) != "Seven Voyages" {
+		t.Errorf("Expected release name 'Seven Voyages', got %q", name)
+	}
+	if namespace := relmap["Namespace"]; namespace.(string) != "default" {
+		t.Errorf("Expected namespace 'default', got %q", namespace)
+	}
+	if revision := relmap["Revision"]; revision.(int) != 1 {
+		t.Errorf("Expected revision '1', got %d", revision)
+	}
+	if relmap["IsUpgrade"].(bool) {
+		t.Error("Expected upgrade to be false.")
+	}
+	if !relmap["IsInstall"].(bool) {
+		t.Errorf("Expected install to be true.")
+	}
+	if !res["Capabilities"].(*common.Capabilities).APIVersions.Has("v1") {
+		t.Error("Expected Capabilities to have v1 as an API")
+	}
+	if res["Capabilities"].(*common.Capabilities).KubeVersion.Major != "1" {
+		t.Error("Expected Capabilities to have a Kube version")
+	}
+
+	vals := res["Values"].(common.Values)
+	if vals["name"] != "Haroun" {
+		t.Errorf("Expected 'Haroun', got %q (%v)", vals["name"], vals)
+	}
+	where := vals["where"].(map[string]interface{})
+	expects := map[string]string{
+		"city":  "Baghdad",
+		"date":  "809 CE",
+		"title": "caliph",
+	}
+	for field, expect := range expects {
+		if got := where[field]; got != expect {
+			t.Errorf("Expected %q, got %q (%v)", expect, got, where)
+		}
+	}
+}
diff --git a/pkg/chart/v2/util/values.go b/pkg/chart/common/values.go
similarity index 74%
rename from pkg/chart/v2/util/values.go
rename to pkg/chart/common/values.go
index 6850e8b9b..94958a779 100644
--- a/pkg/chart/v2/util/values.go
+++ b/pkg/chart/common/values.go
@@ -14,18 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"strings"
 
 	"sigs.k8s.io/yaml"
-
-	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // GlobalKey is the name of the Values key that is used for storing global vars.
@@ -131,48 +128,6 @@ type ReleaseOptions struct {
 	IsInstall bool
 }
 
-// ToRenderValues composes the struct from the data coming from the Releases, Charts and Values files
-//
-// This takes both ReleaseOptions and Capabilities to merge into the render values.
-func ToRenderValues(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities) (Values, error) {
-	return ToRenderValuesWithSchemaValidation(chrt, chrtVals, options, caps, false)
-}
-
-// ToRenderValuesWithSchemaValidation composes the struct from the data coming from the Releases, Charts and Values files
-//
-// This takes both ReleaseOptions and Capabilities to merge into the render values.
-func ToRenderValuesWithSchemaValidation(chrt *chart.Chart, chrtVals map[string]interface{}, options ReleaseOptions, caps *Capabilities, skipSchemaValidation bool) (Values, error) {
-	if caps == nil {
-		caps = DefaultCapabilities
-	}
-	top := map[string]interface{}{
-		"Chart":        chrt.Metadata,
-		"Capabilities": caps,
-		"Release": map[string]interface{}{
-			"Name":      options.Name,
-			"Namespace": options.Namespace,
-			"IsUpgrade": options.IsUpgrade,
-			"IsInstall": options.IsInstall,
-			"Revision":  options.Revision,
-			"Service":   "Helm",
-		},
-	}
-
-	vals, err := CoalesceValues(chrt, chrtVals)
-	if err != nil {
-		return top, err
-	}
-
-	if !skipSchemaValidation {
-		if err := ValidateAgainstSchema(chrt, vals); err != nil {
-			return top, fmt.Errorf("values don't meet the specifications of the schema(s) in the following chart(s):\n%w", err)
-		}
-	}
-
-	top["Values"] = vals
-	return top, nil
-}
-
 // istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
 func istable(v interface{}) bool {
 	_, ok := v.(map[string]interface{})
diff --git a/pkg/chart/v2/util/values_test.go b/pkg/chart/common/values_test.go
similarity index 66%
rename from pkg/chart/v2/util/values_test.go
rename to pkg/chart/common/values_test.go
index 1a25fafb8..3cceeb2b5 100644
--- a/pkg/chart/v2/util/values_test.go
+++ b/pkg/chart/common/values_test.go
@@ -14,15 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package common
 
 import (
 	"bytes"
 	"fmt"
 	"testing"
 	"text/template"
-
-	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 func TestReadValues(t *testing.T) {
@@ -66,92 +64,6 @@ water:
 	}
 }
 
-func TestToRenderValues(t *testing.T) {
-
-	chartValues := map[string]interface{}{
-		"name": "al Rashid",
-		"where": map[string]interface{}{
-			"city":  "Basrah",
-			"title": "caliph",
-		},
-	}
-
-	overrideValues := map[string]interface{}{
-		"name": "Haroun",
-		"where": map[string]interface{}{
-			"city": "Baghdad",
-			"date": "809 CE",
-		},
-	}
-
-	c := &chart.Chart{
-		Metadata:  &chart.Metadata{Name: "test"},
-		Templates: []*chart.File{},
-		Values:    chartValues,
-		Files: []*chart.File{
-			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
-		},
-	}
-	c.AddDependency(&chart.Chart{
-		Metadata: &chart.Metadata{Name: "where"},
-	})
-
-	o := ReleaseOptions{
-		Name:      "Seven Voyages",
-		Namespace: "default",
-		Revision:  1,
-		IsInstall: true,
-	}
-
-	res, err := ToRenderValuesWithSchemaValidation(c, overrideValues, o, nil, false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure that the top-level values are all set.
-	if name := res["Chart"].(*chart.Metadata).Name; name != "test" {
-		t.Errorf("Expected chart name 'test', got %q", name)
-	}
-	relmap := res["Release"].(map[string]interface{})
-	if name := relmap["Name"]; name.(string) != "Seven Voyages" {
-		t.Errorf("Expected release name 'Seven Voyages', got %q", name)
-	}
-	if namespace := relmap["Namespace"]; namespace.(string) != "default" {
-		t.Errorf("Expected namespace 'default', got %q", namespace)
-	}
-	if revision := relmap["Revision"]; revision.(int) != 1 {
-		t.Errorf("Expected revision '1', got %d", revision)
-	}
-	if relmap["IsUpgrade"].(bool) {
-		t.Error("Expected upgrade to be false.")
-	}
-	if !relmap["IsInstall"].(bool) {
-		t.Errorf("Expected install to be true.")
-	}
-	if !res["Capabilities"].(*Capabilities).APIVersions.Has("v1") {
-		t.Error("Expected Capabilities to have v1 as an API")
-	}
-	if res["Capabilities"].(*Capabilities).KubeVersion.Major != "1" {
-		t.Error("Expected Capabilities to have a Kube version")
-	}
-
-	vals := res["Values"].(Values)
-	if vals["name"] != "Haroun" {
-		t.Errorf("Expected 'Haroun', got %q (%v)", vals["name"], vals)
-	}
-	where := vals["where"].(map[string]interface{})
-	expects := map[string]string{
-		"city":  "Baghdad",
-		"date":  "809 CE",
-		"title": "caliph",
-	}
-	for field, expect := range expects {
-		if got := where[field]; got != expect {
-			t.Errorf("Expected %q, got %q (%v)", expect, got, where)
-		}
-	}
-}
-
 func TestReadValuesFile(t *testing.T) {
 	data, err := ReadValuesFile("./testdata/coleridge.yaml")
 	if err != nil {
diff --git a/pkg/chart/v2/file.go b/pkg/chart/interfaces.go
similarity index 60%
rename from pkg/chart/v2/file.go
rename to pkg/chart/interfaces.go
index a2eeb0fcd..e87dd2c08 100644
--- a/pkg/chart/v2/file.go
+++ b/pkg/chart/interfaces.go
@@ -13,15 +13,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2
+package chart
 
-// File represents a file as a name/value pair.
-//
-// By convention, name is a relative path within the scope of the chart's
-// base directory.
-type File struct {
-	// Name is the path-like name of the template.
-	Name string `json:"name"`
-	// Data is the template as byte data.
-	Data []byte `json:"data"`
+import (
+	common "helm.sh/helm/v4/pkg/chart/common"
+)
+
+type Charter interface{}
+
+type Accessor interface {
+	Name() string
+	IsRoot() bool
+	MetadataAsMap() map[string]interface{}
+	Files() []*common.File
+	Templates() []*common.File
+	ChartFullPath() string
+	IsLibraryChart() bool
+	Dependencies() []Charter
+	Values() map[string]interface{}
+	Schema() []byte
 }
diff --git a/pkg/chart/v2/chart.go b/pkg/chart/v2/chart.go
index 66ddf98a5..f59bcd8b3 100644
--- a/pkg/chart/v2/chart.go
+++ b/pkg/chart/v2/chart.go
@@ -19,6 +19,8 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // APIVersionV1 is the API version number for version 1.
@@ -37,20 +39,20 @@ type Chart struct {
 	//
 	// This should not be used except in special cases like `helm show values`,
 	// where we want to display the raw values, comments and all.
-	Raw []*File `json:"-"`
+	Raw []*common.File `json:"-"`
 	// Metadata is the contents of the Chartfile.
 	Metadata *Metadata `json:"metadata"`
 	// Lock is the contents of Chart.lock.
 	Lock *Lock `json:"lock"`
 	// Templates for this chart.
-	Templates []*File `json:"templates"`
+	Templates []*common.File `json:"templates"`
 	// Values are default config for this chart.
 	Values map[string]interface{} `json:"values"`
 	// Schema is an optional JSON schema for imposing structure on Values
 	Schema []byte `json:"schema"`
 	// Files are miscellaneous files in a chart archive,
 	// e.g. README, LICENSE, etc.
-	Files []*File `json:"files"`
+	Files []*common.File `json:"files"`
 
 	parent       *Chart
 	dependencies []*Chart
@@ -62,7 +64,7 @@ type CRD struct {
 	// Filename is the File obj Name including (sub-)chart.ChartFullPath
 	Filename string
 	// File is the File obj for the crd
-	File *File
+	File *common.File
 }
 
 // SetDependencies replaces the chart dependencies.
@@ -137,8 +139,8 @@ func (ch *Chart) AppVersion() string {
 
 // CRDs returns a list of File objects in the 'crds/' directory of a Helm chart.
 // Deprecated: use CRDObjects()
-func (ch *Chart) CRDs() []*File {
-	files := []*File{}
+func (ch *Chart) CRDs() []*common.File {
+	files := []*common.File{}
 	// Find all resources in the crds/ directory
 	for _, f := range ch.Files {
 		if strings.HasPrefix(f.Name, "crds/") && hasManifestExtension(f.Name) {
diff --git a/pkg/chart/v2/chart_test.go b/pkg/chart/v2/chart_test.go
index d6311085b..a96d8c0c0 100644
--- a/pkg/chart/v2/chart_test.go
+++ b/pkg/chart/v2/chart_test.go
@@ -20,11 +20,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 func TestCRDs(t *testing.T) {
 	chrt := Chart{
-		Files: []*File{
+		Files: []*common.File{
 			{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
@@ -57,7 +59,7 @@ func TestCRDs(t *testing.T) {
 
 func TestSaveChartNoRawData(t *testing.T) {
 	chrt := Chart{
-		Raw: []*File{
+		Raw: []*common.File{
 			{
 				Name: "fhqwhgads.yaml",
 				Data: []byte("Everybody to the Limit"),
@@ -76,7 +78,7 @@ func TestSaveChartNoRawData(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	is.Equal([]*File(nil), res.Raw)
+	is.Equal([]*common.File(nil), res.Raw)
 }
 
 func TestMetadata(t *testing.T) {
@@ -162,7 +164,7 @@ func TestChartFullPath(t *testing.T) {
 
 func TestCRDObjects(t *testing.T) {
 	chrt := Chart{
-		Files: []*File{
+		Files: []*common.File{
 			{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
@@ -190,7 +192,7 @@ func TestCRDObjects(t *testing.T) {
 		{
 			Name:     "crds/foo.yaml",
 			Filename: "crds/foo.yaml",
-			File: &File{
+			File: &common.File{
 				Name: "crds/foo.yaml",
 				Data: []byte("hello"),
 			},
@@ -198,7 +200,7 @@ func TestCRDObjects(t *testing.T) {
 		{
 			Name:     "crds/foo/bar/baz.yaml",
 			Filename: "crds/foo/bar/baz.yaml",
-			File: &File{
+			File: &common.File{
 				Name: "crds/foo/bar/baz.yaml",
 				Data: []byte("hello"),
 			},
diff --git a/pkg/lint/lint.go b/pkg/chart/v2/lint/lint.go
similarity index 83%
rename from pkg/lint/lint.go
rename to pkg/chart/v2/lint/lint.go
index 64b2a6057..773c9bc5e 100644
--- a/pkg/lint/lint.go
+++ b/pkg/chart/v2/lint/lint.go
@@ -14,24 +14,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lint // import "helm.sh/helm/v4/pkg/lint"
+package lint // import "helm.sh/helm/v4/pkg/chart/v2/lint"
 
 import (
 	"path/filepath"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/rules"
-	"helm.sh/helm/v4/pkg/lint/support"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/rules"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 )
 
 type linterOptions struct {
-	KubeVersion          *chartutil.KubeVersion
+	KubeVersion          *common.KubeVersion
 	SkipSchemaValidation bool
 }
 
 type LinterOption func(lo *linterOptions)
 
-func WithKubeVersion(kubeVersion *chartutil.KubeVersion) LinterOption {
+func WithKubeVersion(kubeVersion *common.KubeVersion) LinterOption {
 	return func(lo *linterOptions) {
 		lo.KubeVersion = kubeVersion
 	}
diff --git a/pkg/lint/lint_test.go b/pkg/chart/v2/lint/lint_test.go
similarity index 99%
rename from pkg/lint/lint_test.go
rename to pkg/chart/v2/lint/lint_test.go
index 5b590c010..3c777e2bb 100644
--- a/pkg/lint/lint_test.go
+++ b/pkg/chart/v2/lint/lint_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 var values map[string]interface{}
diff --git a/pkg/lint/rules/chartfile.go b/pkg/chart/v2/lint/rules/chartfile.go
similarity index 98%
rename from pkg/lint/rules/chartfile.go
rename to pkg/chart/v2/lint/rules/chartfile.go
index 103c28374..185f524a4 100644
--- a/pkg/lint/rules/chartfile.go
+++ b/pkg/chart/v2/lint/rules/chartfile.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rules // import "helm.sh/helm/v4/pkg/lint/rules"
+package rules // import "helm.sh/helm/v4/pkg/chart/v2/lint/rules"
 
 import (
 	"errors"
@@ -27,8 +27,8 @@ import (
 	"sigs.k8s.io/yaml"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 // Chartfile runs a set of linter rules related to Chart.yaml file
diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/chart/v2/lint/rules/chartfile_test.go
similarity index 99%
rename from pkg/lint/rules/chartfile_test.go
rename to pkg/chart/v2/lint/rules/chartfile_test.go
index 1719a2011..5a1ad2f24 100644
--- a/pkg/lint/rules/chartfile_test.go
+++ b/pkg/chart/v2/lint/rules/chartfile_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 const (
diff --git a/pkg/lint/rules/crds.go b/pkg/chart/v2/lint/rules/crds.go
similarity index 98%
rename from pkg/lint/rules/crds.go
rename to pkg/chart/v2/lint/rules/crds.go
index 1b8a73139..49e30192a 100644
--- a/pkg/lint/rules/crds.go
+++ b/pkg/chart/v2/lint/rules/crds.go
@@ -28,8 +28,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 // Crds lints the CRDs in the Linter.
diff --git a/pkg/lint/rules/crds_test.go b/pkg/chart/v2/lint/rules/crds_test.go
similarity index 95%
rename from pkg/lint/rules/crds_test.go
rename to pkg/chart/v2/lint/rules/crds_test.go
index d497b29ba..e644f182f 100644
--- a/pkg/lint/rules/crds_test.go
+++ b/pkg/chart/v2/lint/rules/crds_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"helm.sh/helm/v4/pkg/lint/support"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 )
 
 const invalidCrdsDir = "./testdata/invalidcrdsdir"
diff --git a/pkg/lint/rules/dependencies.go b/pkg/chart/v2/lint/rules/dependencies.go
similarity index 96%
rename from pkg/lint/rules/dependencies.go
rename to pkg/chart/v2/lint/rules/dependencies.go
index 16c9d6435..d944a016d 100644
--- a/pkg/lint/rules/dependencies.go
+++ b/pkg/chart/v2/lint/rules/dependencies.go
@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rules // import "helm.sh/helm/v4/pkg/lint/rules"
+package rules // import "helm.sh/helm/v4/pkg/chart/v2/lint/rules"
 
 import (
 	"fmt"
 	"strings"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 // Dependencies runs lints against a chart's dependencies
diff --git a/pkg/lint/rules/dependencies_test.go b/pkg/chart/v2/lint/rules/dependencies_test.go
similarity index 98%
rename from pkg/lint/rules/dependencies_test.go
rename to pkg/chart/v2/lint/rules/dependencies_test.go
index 1369b2372..08a6646cd 100644
--- a/pkg/lint/rules/dependencies_test.go
+++ b/pkg/chart/v2/lint/rules/dependencies_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 func chartWithBadDependencies() chart.Chart {
diff --git a/pkg/chart/v2/lint/rules/deprecations.go b/pkg/chart/v2/lint/rules/deprecations.go
new file mode 100644
index 000000000..6eba316bc
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/deprecations.go
@@ -0,0 +1,106 @@
+/*
+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 rules // import "helm.sh/helm/v4/pkg/chart/v2/lint/rules"
+
+import (
+	"fmt"
+	"strconv"
+
+	"helm.sh/helm/v4/pkg/chart/common"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/deprecation"
+	kscheme "k8s.io/client-go/kubernetes/scheme"
+)
+
+var (
+	// This should be set in the Makefile based on the version of client-go being imported.
+	// These constants will be overwritten with LDFLAGS. The version components must be
+	// strings in order for LDFLAGS to set them.
+	k8sVersionMajor = "1"
+	k8sVersionMinor = "20"
+)
+
+// deprecatedAPIError indicates than an API is deprecated in Kubernetes
+type deprecatedAPIError struct {
+	Deprecated string
+	Message    string
+}
+
+func (e deprecatedAPIError) Error() string {
+	msg := e.Message
+	return msg
+}
+
+func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *common.KubeVersion) error {
+	// if `resource` does not have an APIVersion or Kind, we cannot test it for deprecation
+	if resource.APIVersion == "" {
+		return nil
+	}
+	if resource.Kind == "" {
+		return nil
+	}
+
+	majorVersion := k8sVersionMajor
+	minorVersion := k8sVersionMinor
+
+	if kubeVersion != nil {
+		majorVersion = kubeVersion.Major
+		minorVersion = kubeVersion.Minor
+	}
+
+	runtimeObject, err := resourceToRuntimeObject(resource)
+	if err != nil {
+		// do not error for non-kubernetes resources
+		if runtime.IsNotRegisteredError(err) {
+			return nil
+		}
+		return err
+	}
+
+	major, err := strconv.Atoi(majorVersion)
+	if err != nil {
+		return err
+	}
+	minor, err := strconv.Atoi(minorVersion)
+	if err != nil {
+		return err
+	}
+
+	if !deprecation.IsDeprecated(runtimeObject, major, minor) {
+		return nil
+	}
+	gvk := fmt.Sprintf("%s %s", resource.APIVersion, resource.Kind)
+	return deprecatedAPIError{
+		Deprecated: gvk,
+		Message:    deprecation.WarningMessage(runtimeObject),
+	}
+}
+
+func resourceToRuntimeObject(resource *k8sYamlStruct) (runtime.Object, error) {
+	scheme := runtime.NewScheme()
+	kscheme.AddToScheme(scheme)
+
+	gvk := schema.FromAPIVersionAndKind(resource.APIVersion, resource.Kind)
+	out, err := scheme.New(gvk)
+	if err != nil {
+		return nil, err
+	}
+	out.GetObjectKind().SetGroupVersionKind(gvk)
+	return out, nil
+}
diff --git a/pkg/lint/rules/deprecations_test.go b/pkg/chart/v2/lint/rules/deprecations_test.go
similarity index 94%
rename from pkg/lint/rules/deprecations_test.go
rename to pkg/chart/v2/lint/rules/deprecations_test.go
index 6add843ce..e153f67e6 100644
--- a/pkg/lint/rules/deprecations_test.go
+++ b/pkg/chart/v2/lint/rules/deprecations_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rules // import "helm.sh/helm/v4/pkg/lint/rules"
+package rules // import "helm.sh/helm/v4/pkg/chart/v2/lint/rules"
 
 import "testing"
 
diff --git a/pkg/lint/rules/template.go b/pkg/chart/v2/lint/rules/template.go
similarity index 95%
rename from pkg/lint/rules/template.go
rename to pkg/chart/v2/lint/rules/template.go
index b36153ec6..5c84d0f68 100644
--- a/pkg/lint/rules/template.go
+++ b/pkg/chart/v2/lint/rules/template.go
@@ -33,10 +33,12 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/apimachinery/pkg/util/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	"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"
 )
 
 // Templates lints the templates in the Linter.
@@ -45,12 +47,12 @@ func Templates(linter *support.Linter, values map[string]interface{}, namespace
 }
 
 // TemplatesWithKubeVersion lints the templates in the Linter, allowing to specify the kubernetes version.
-func TemplatesWithKubeVersion(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion) {
+func TemplatesWithKubeVersion(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *common.KubeVersion) {
 	TemplatesWithSkipSchemaValidation(linter, values, namespace, kubeVersion, false)
 }
 
 // TemplatesWithSkipSchemaValidation lints the templates in the Linter, allowing to specify the kubernetes version and if schema validation is enabled or not.
-func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, skipSchemaValidation bool) {
+func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string]interface{}, namespace string, kubeVersion *common.KubeVersion, skipSchemaValidation bool) {
 	fpath := "templates/"
 	templatesPath := filepath.Join(linter.ChartDir, fpath)
 
@@ -74,12 +76,12 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 		return
 	}
 
-	options := chartutil.ReleaseOptions{
+	options := common.ReleaseOptions{
 		Name:      "test-release",
 		Namespace: namespace,
 	}
 
-	caps := chartutil.DefaultCapabilities.Copy()
+	caps := common.DefaultCapabilities.Copy()
 	if kubeVersion != nil {
 		caps.KubeVersion = *kubeVersion
 	}
@@ -90,12 +92,12 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string
 		return
 	}
 
-	cvals, err := chartutil.CoalesceValues(chart, values)
+	cvals, err := util.CoalesceValues(chart, values)
 	if err != nil {
 		return
 	}
 
-	valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chart, cvals, options, caps, skipSchemaValidation)
+	valuesToRender, err := util.ToRenderValuesWithSchemaValidation(chart, cvals, options, caps, skipSchemaValidation)
 	if err != nil {
 		linter.RunLinterRule(support.ErrorSev, fpath, err)
 		return
diff --git a/pkg/lint/rules/template_test.go b/pkg/chart/v2/lint/rules/template_test.go
similarity index 98%
rename from pkg/lint/rules/template_test.go
rename to pkg/chart/v2/lint/rules/template_test.go
index 787bd6e4b..3e8e0b371 100644
--- a/pkg/lint/rules/template_test.go
+++ b/pkg/chart/v2/lint/rules/template_test.go
@@ -23,9 +23,10 @@ import (
 	"strings"
 	"testing"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 const templateTestBasedir = "./testdata/albatross"
@@ -189,7 +190,7 @@ func TestDeprecatedAPIFails(t *testing.T) {
 			Version:    "0.1.0",
 			Icon:       "satisfy-the-linting-gods.gif",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{
 				Name: "templates/baddeployment.yaml",
 				Data: []byte("apiVersion: apps/v1beta1\nkind: Deployment\nmetadata:\n  name: baddep\nspec: {selector: {matchLabels: {foo: bar}}}"),
@@ -249,7 +250,7 @@ func TestStrictTemplateParsingMapError(t *testing.T) {
 				"key1": "val1",
 			},
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{
 				Name: "templates/configmap.yaml",
 				Data: []byte(manifest),
@@ -378,7 +379,7 @@ func TestEmptyWithCommentsManifests(t *testing.T) {
 			Version:    "0.1.0",
 			Icon:       "satisfy-the-linting-gods.gif",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{
 				Name: "templates/empty-with-comments.yaml",
 				Data: []byte("#@formatter:off\n"),
diff --git a/pkg/lint/rules/testdata/albatross/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/albatross/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/albatross/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/albatross/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/albatross/templates/_helpers.tpl b/pkg/chart/v2/lint/rules/testdata/albatross/templates/_helpers.tpl
new file mode 100644
index 000000000..24f76db73
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/albatross/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{define "name"}}{{default "nginx" .Values.nameOverride | trunc 63 | trimSuffix "-" }}{{end}}
+
+{{/*
+Create a default fully qualified app name.
+
+We truncate at 63 chars because some Kubernetes name fields are limited to this
+(by the DNS naming spec).
+*/}}
+{{define "fullname"}}
+{{- $name := default "nginx" .Values.nameOverride -}}
+{{printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{end}}
diff --git a/pkg/chart/v2/lint/rules/testdata/albatross/templates/fail.yaml b/pkg/chart/v2/lint/rules/testdata/albatross/templates/fail.yaml
new file mode 100644
index 000000000..a11e0e90e
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/albatross/templates/fail.yaml
@@ -0,0 +1 @@
+{{ deliberateSyntaxError }}
diff --git a/pkg/chart/v2/lint/rules/testdata/albatross/templates/svc.yaml b/pkg/chart/v2/lint/rules/testdata/albatross/templates/svc.yaml
new file mode 100644
index 000000000..16bb27d55
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/albatross/templates/svc.yaml
@@ -0,0 +1,19 @@
+# This is a service gateway to the replica set created by the deployment.
+# Take a look at the deployment.yaml for general notes about this chart.
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Values.name }}"
+  labels:
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+    kubeVersion: {{ .Capabilities.KubeVersion.Major }}
+spec:
+  ports:
+  - port: {{default 80 .Values.httpPort | quote}}
+    targetPort: 80
+    protocol: TCP
+    name: http
+  selector:
+    app.kubernetes.io/name: {{template "fullname" .}}
diff --git a/pkg/chart/v2/lint/rules/testdata/albatross/values.yaml b/pkg/chart/v2/lint/rules/testdata/albatross/values.yaml
new file mode 100644
index 000000000..74cc6a0dc
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/albatross/values.yaml
@@ -0,0 +1 @@
+name: "mariner"
diff --git a/pkg/lint/rules/testdata/anotherbadchartfile/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/anotherbadchartfile/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/anotherbadchartfile/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/anotherbadchartfile/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/badchartfile/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/badchartfile/Chart.yaml
new file mode 100644
index 000000000..3564ede3e
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badchartfile/Chart.yaml
@@ -0,0 +1,11 @@
+description: A Helm chart for Kubernetes
+version: 0.0.0.0
+home: ""
+type: application
+dependencies:
+- name: mariadb
+  version: 5.x.x
+  repository: https://charts.helm.sh/stable/
+  condition: mariadb.enabled
+  tags:
+    - database
diff --git a/pkg/chart/v2/lint/rules/testdata/badchartfile/values.yaml b/pkg/chart/v2/lint/rules/testdata/badchartfile/values.yaml
new file mode 100644
index 000000000..9f367033b
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badchartfile/values.yaml
@@ -0,0 +1 @@
+# Default values for badchartfile.
diff --git a/pkg/lint/rules/testdata/badchartname/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/badchartname/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badchartname/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/badchartname/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/badchartname/values.yaml b/pkg/chart/v2/lint/rules/testdata/badchartname/values.yaml
new file mode 100644
index 000000000..9f367033b
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badchartname/values.yaml
@@ -0,0 +1 @@
+# Default values for badchartfile.
diff --git a/pkg/lint/rules/testdata/badcrdfile/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/badcrdfile/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badcrdfile/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/badcrdfile/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml b/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
new file mode 100644
index 000000000..468916053
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-apiversion.yaml
@@ -0,0 +1,2 @@
+apiVersion: bad.k8s.io/v1beta1
+kind: CustomResourceDefinition
diff --git a/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml b/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
new file mode 100644
index 000000000..523b97f85
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badcrdfile/crds/bad-crd.yaml
@@ -0,0 +1,2 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: NotACustomResourceDefinition
diff --git a/pkg/chart/v2/lint/rules/testdata/badcrdfile/templates/.gitkeep b/pkg/chart/v2/lint/rules/testdata/badcrdfile/templates/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/chart/v2/lint/rules/testdata/badcrdfile/values.yaml b/pkg/chart/v2/lint/rules/testdata/badcrdfile/values.yaml
new file mode 100644
index 000000000..2fffc7715
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badcrdfile/values.yaml
@@ -0,0 +1 @@
+# Default values for badcrdfile.
diff --git a/pkg/lint/rules/testdata/badvaluesfile/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/badvaluesfile/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/badvaluesfile/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/badvaluesfile/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml b/pkg/chart/v2/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
new file mode 100644
index 000000000..6c2ceb8db
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badvaluesfile/templates/badvaluesfile.yaml
@@ -0,0 +1,2 @@
+metadata:
+  name: {{.name | default "foo" | title}}
diff --git a/pkg/chart/v2/lint/rules/testdata/badvaluesfile/values.yaml b/pkg/chart/v2/lint/rules/testdata/badvaluesfile/values.yaml
new file mode 100644
index 000000000..b5a10271c
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/badvaluesfile/values.yaml
@@ -0,0 +1,2 @@
+# Invalid value for badvaluesfile for testing lint fails with invalid yaml format
+name= "value"
diff --git a/pkg/lint/rules/testdata/goodone/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/goodone/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/goodone/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/goodone/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/goodone/crds/test-crd.yaml b/pkg/chart/v2/lint/rules/testdata/goodone/crds/test-crd.yaml
new file mode 100644
index 000000000..1d7350f1d
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/goodone/crds/test-crd.yaml
@@ -0,0 +1,19 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: tests.test.io
+spec:
+  group: test.io
+  names:
+    kind: Test
+    listKind: TestList
+    plural: tests
+    singular: test
+  scope: Namespaced
+  versions:
+    - name : v1alpha2
+      served: true
+      storage: true
+    - name : v1alpha1
+      served: true
+      storage: false
diff --git a/pkg/chart/v2/lint/rules/testdata/goodone/templates/goodone.yaml b/pkg/chart/v2/lint/rules/testdata/goodone/templates/goodone.yaml
new file mode 100644
index 000000000..cd46f62c7
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/goodone/templates/goodone.yaml
@@ -0,0 +1,2 @@
+metadata:
+  name: {{ .Values.name | default "foo" | lower }}
diff --git a/pkg/chart/v2/lint/rules/testdata/goodone/values.yaml b/pkg/chart/v2/lint/rules/testdata/goodone/values.yaml
new file mode 100644
index 000000000..92c3d9bb9
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/goodone/values.yaml
@@ -0,0 +1 @@
+name: "goodone-here"
diff --git a/pkg/chart/v2/lint/rules/testdata/invalidchartfile/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/invalidchartfile/Chart.yaml
new file mode 100644
index 000000000..0fd58d1d4
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/invalidchartfile/Chart.yaml
@@ -0,0 +1,6 @@
+name: some-chart
+apiVersion: v2
+apiVersion: v1
+description: A Helm chart for Kubernetes
+version: 1.3.0
+icon: http://example.com
diff --git a/pkg/chart/v2/lint/rules/testdata/invalidchartfile/values.yaml b/pkg/chart/v2/lint/rules/testdata/invalidchartfile/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/invalidcrdsdir/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/crds b/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/crds
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/values.yaml b/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/values.yaml
new file mode 100644
index 000000000..6b1611a64
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/invalidcrdsdir/values.yaml
@@ -0,0 +1 @@
+# Default values for invalidcrdsdir.
diff --git a/pkg/chart/v2/lint/rules/testdata/malformed-template/.helmignore b/pkg/chart/v2/lint/rules/testdata/malformed-template/.helmignore
new file mode 100644
index 000000000..0e8a0eb36
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/malformed-template/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/pkg/lint/rules/testdata/malformed-template/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/malformed-template/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/malformed-template/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/malformed-template/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/malformed-template/templates/bad.yaml b/pkg/chart/v2/lint/rules/testdata/malformed-template/templates/bad.yaml
new file mode 100644
index 000000000..213198fda
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/malformed-template/templates/bad.yaml
@@ -0,0 +1 @@
+{ {- $relname := .Release.Name -}}
diff --git a/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml b/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml
new file mode 100644
index 000000000..1cc3182ea
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/malformed-template/values.yaml
@@ -0,0 +1,82 @@
+# Default values for test.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/pkg/lint/rules/testdata/multi-template-fail/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/multi-template-fail/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/multi-template-fail/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/multi-template-fail/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml b/pkg/chart/v2/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
new file mode 100644
index 000000000..835be07be
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/multi-template-fail/templates/multi-fail.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: game-config
+data:
+  game.properties: cheat
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: -this:name-is-not_valid$
+data:
+  game.properties: empty
diff --git a/pkg/lint/rules/testdata/v3-fail/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/v3-fail/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/v3-fail/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/_helpers.tpl b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/_helpers.tpl
new file mode 100644
index 000000000..0b89e723b
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/_helpers.tpl
@@ -0,0 +1,63 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "v3-fail.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "v3-fail.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "v3-fail.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "v3-fail.labels" -}}
+helm.sh/chart: {{ include "v3-fail.chart" . }}
+{{ include "v3-fail.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "v3-fail.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "v3-fail.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "v3-fail.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "v3-fail.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/deployment.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/deployment.yaml
new file mode 100644
index 000000000..6d651ab8e
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/deployment.yaml
@@ -0,0 +1,56 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "v3-fail.fullname" . }}
+  labels:
+    nope: {{ .Release.Time }}
+    {{- include "v3-fail.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "v3-fail.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "v3-fail.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      serviceAccountName: {{ include "v3-fail.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/ingress.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/ingress.yaml
new file mode 100644
index 000000000..4790650d0
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/ingress.yaml
@@ -0,0 +1,62 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "v3-fail.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "v3-fail.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    "helm.sh/hook": crd-install
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/service.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/service.yaml
new file mode 100644
index 000000000..79a0f40b0
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/templates/service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "v3-fail.fullname" . }}
+  annotations:
+    helm.sh/hook: crd-install
+  labels:
+    {{- include "v3-fail.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "v3-fail.selectorLabels" . | nindent 4 }}
diff --git a/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml b/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml
new file mode 100644
index 000000000..01d99b4e6
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/v3-fail/values.yaml
@@ -0,0 +1,66 @@
+# Default values for v3-fail.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  pullPolicy: IfNotPresent
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/pkg/lint/rules/testdata/withsubchart/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/withsubchart/Chart.yaml
diff --git a/pkg/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
similarity index 100%
rename from pkg/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
rename to pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/Chart.yaml
diff --git a/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
new file mode 100644
index 000000000..6cb6cc2af
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/templates/subchart.yaml
@@ -0,0 +1,2 @@
+metadata:
+  name: {{ .Values.subchart.name | lower }}
diff --git a/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/values.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
new file mode 100644
index 000000000..422a359d5
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/withsubchart/charts/subchart/values.yaml
@@ -0,0 +1,2 @@
+subchart:
+  name: subchart
\ No newline at end of file
diff --git a/pkg/chart/v2/lint/rules/testdata/withsubchart/templates/mainchart.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/templates/mainchart.yaml
new file mode 100644
index 000000000..6cb6cc2af
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/testdata/withsubchart/templates/mainchart.yaml
@@ -0,0 +1,2 @@
+metadata:
+  name: {{ .Values.subchart.name | lower }}
diff --git a/pkg/chart/v2/lint/rules/testdata/withsubchart/values.yaml b/pkg/chart/v2/lint/rules/testdata/withsubchart/values.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/pkg/lint/rules/values.go b/pkg/chart/v2/lint/rules/values.go
similarity index 84%
rename from pkg/lint/rules/values.go
rename to pkg/chart/v2/lint/rules/values.go
index 019e74fa7..5260bf8b3 100644
--- a/pkg/lint/rules/values.go
+++ b/pkg/chart/v2/lint/rules/values.go
@@ -21,8 +21,9 @@ import (
 	"os"
 	"path/filepath"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
-	"helm.sh/helm/v4/pkg/lint/support"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 )
 
 // ValuesWithOverrides tests the values.yaml file.
@@ -52,7 +53,7 @@ func validateValuesFileExistence(valuesPath string) error {
 }
 
 func validateValuesFile(valuesPath string, overrides map[string]interface{}) error {
-	values, err := chartutil.ReadValuesFile(valuesPath)
+	values, err := common.ReadValuesFile(valuesPath)
 	if err != nil {
 		return fmt.Errorf("unable to parse YAML: %w", err)
 	}
@@ -62,8 +63,8 @@ func validateValuesFile(valuesPath string, overrides map[string]interface{}) err
 	// We could change that. For now, though, we retain that strategy, and thus can
 	// coalesce tables (like reuse-values does) instead of doing the full chart
 	// CoalesceValues
-	coalescedValues := chartutil.CoalesceTables(make(map[string]interface{}, len(overrides)), overrides)
-	coalescedValues = chartutil.CoalesceTables(coalescedValues, values)
+	coalescedValues := util.CoalesceTables(make(map[string]interface{}, len(overrides)), overrides)
+	coalescedValues = util.CoalesceTables(coalescedValues, values)
 
 	ext := filepath.Ext(valuesPath)
 	schemaPath := valuesPath[:len(valuesPath)-len(ext)] + ".schema.json"
@@ -74,5 +75,5 @@ func validateValuesFile(valuesPath string, overrides map[string]interface{}) err
 	if err != nil {
 		return err
 	}
-	return chartutil.ValidateAgainstSingleSchema(coalescedValues, schema)
+	return util.ValidateAgainstSingleSchema(coalescedValues, schema)
 }
diff --git a/pkg/chart/v2/lint/rules/values_test.go b/pkg/chart/v2/lint/rules/values_test.go
new file mode 100644
index 000000000..348695785
--- /dev/null
+++ b/pkg/chart/v2/lint/rules/values_test.go
@@ -0,0 +1,169 @@
+/*
+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 rules
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"helm.sh/helm/v4/internal/test/ensure"
+)
+
+var nonExistingValuesFilePath = filepath.Join("/fake/dir", "values.yaml")
+
+const testSchema = `
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "helm values test schema",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "username",
+    "password"
+  ],
+  "properties": {
+    "username": {
+      "description": "Your username",
+      "type": "string"
+    },
+    "password": {
+      "description": "Your password",
+      "type": "string"
+    }
+  }
+}
+`
+
+func TestValidateValuesYamlNotDirectory(t *testing.T) {
+	_ = os.Mkdir(nonExistingValuesFilePath, os.ModePerm)
+	defer os.Remove(nonExistingValuesFilePath)
+
+	err := validateValuesFileExistence(nonExistingValuesFilePath)
+	if err == nil {
+		t.Errorf("validateValuesFileExistence to return a linter error, got no error")
+	}
+}
+
+func TestValidateValuesFileWellFormed(t *testing.T) {
+	badYaml := `
+	not:well[]{}formed
+	`
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(badYaml))
+	valfile := filepath.Join(tmpdir, "values.yaml")
+	if err := validateValuesFile(valfile, map[string]interface{}{}); err == nil {
+		t.Fatal("expected values file to fail parsing")
+	}
+}
+
+func TestValidateValuesFileSchema(t *testing.T) {
+	yaml := "username: admin\npassword: swordfish"
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(yaml))
+	createTestingSchema(t, tmpdir)
+
+	valfile := filepath.Join(tmpdir, "values.yaml")
+	if err := validateValuesFile(valfile, map[string]interface{}{}); err != nil {
+		t.Fatalf("Failed validation with %s", err)
+	}
+}
+
+func TestValidateValuesFileSchemaFailure(t *testing.T) {
+	// 1234 is an int, not a string. This should fail.
+	yaml := "username: 1234\npassword: swordfish"
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(yaml))
+	createTestingSchema(t, tmpdir)
+
+	valfile := filepath.Join(tmpdir, "values.yaml")
+
+	err := validateValuesFile(valfile, map[string]interface{}{})
+	if err == nil {
+		t.Fatal("expected values file to fail parsing")
+	}
+
+	assert.Contains(t, err.Error(), "- at '/username': got number, want string")
+}
+
+func TestValidateValuesFileSchemaOverrides(t *testing.T) {
+	yaml := "username: admin"
+	overrides := map[string]interface{}{
+		"password": "swordfish",
+	}
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(yaml))
+	createTestingSchema(t, tmpdir)
+
+	valfile := filepath.Join(tmpdir, "values.yaml")
+	if err := validateValuesFile(valfile, overrides); err != nil {
+		t.Fatalf("Failed validation with %s", err)
+	}
+}
+
+func TestValidateValuesFile(t *testing.T) {
+	tests := []struct {
+		name         string
+		yaml         string
+		overrides    map[string]interface{}
+		errorMessage string
+	}{
+		{
+			name:      "value added",
+			yaml:      "username: admin",
+			overrides: map[string]interface{}{"password": "swordfish"},
+		},
+		{
+			name:         "value not overridden",
+			yaml:         "username: admin\npassword:",
+			overrides:    map[string]interface{}{"username": "anotherUser"},
+			errorMessage: "- at '/password': got null, want string",
+		},
+		{
+			name:      "value overridden",
+			yaml:      "username: admin\npassword:",
+			overrides: map[string]interface{}{"username": "anotherUser", "password": "swordfish"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tmpdir := ensure.TempFile(t, "values.yaml", []byte(tt.yaml))
+			createTestingSchema(t, tmpdir)
+
+			valfile := filepath.Join(tmpdir, "values.yaml")
+
+			err := validateValuesFile(valfile, tt.overrides)
+
+			switch {
+			case err != nil && tt.errorMessage == "":
+				t.Errorf("Failed validation with %s", err)
+			case err == nil && tt.errorMessage != "":
+				t.Error("expected values file to fail parsing")
+			case err != nil && tt.errorMessage != "":
+				assert.Contains(t, err.Error(), tt.errorMessage, "Failed with unexpected error")
+			}
+		})
+	}
+}
+
+func createTestingSchema(t *testing.T, dir string) string {
+	t.Helper()
+	schemafile := filepath.Join(dir, "values.schema.json")
+	if err := os.WriteFile(schemafile, []byte(testSchema), 0700); err != nil {
+		t.Fatalf("Failed to write schema to tmpdir: %s", err)
+	}
+	return schemafile
+}
diff --git a/pkg/lint/support/doc.go b/pkg/chart/v2/lint/support/doc.go
similarity index 91%
rename from pkg/lint/support/doc.go
rename to pkg/chart/v2/lint/support/doc.go
index b007804dc..7e050b8c2 100644
--- a/pkg/lint/support/doc.go
+++ b/pkg/chart/v2/lint/support/doc.go
@@ -20,4 +20,4 @@ Package support contains tools for linting charts.
 Linting is the process of testing charts for errors or warnings regarding
 formatting, compilation, or standards compliance.
 */
-package support // import "helm.sh/helm/v4/pkg/lint/support"
+package support // import "helm.sh/helm/v4/pkg/chart/v2/lint/support"
diff --git a/pkg/chart/v2/lint/support/message.go b/pkg/chart/v2/lint/support/message.go
new file mode 100644
index 000000000..5efbc7a61
--- /dev/null
+++ b/pkg/chart/v2/lint/support/message.go
@@ -0,0 +1,76 @@
+/*
+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 support
+
+import "fmt"
+
+// Severity indicates the severity of a Message.
+const (
+	// UnknownSev indicates that the severity of the error is unknown, and should not stop processing.
+	UnknownSev = iota
+	// InfoSev indicates information, for example missing values.yaml file
+	InfoSev
+	// WarningSev indicates that something does not meet code standards, but will likely function.
+	WarningSev
+	// ErrorSev indicates that something will not likely function.
+	ErrorSev
+)
+
+// sev matches the *Sev states.
+var sev = []string{"UNKNOWN", "INFO", "WARNING", "ERROR"}
+
+// Linter encapsulates a linting run of a particular chart.
+type Linter struct {
+	Messages []Message
+	// The highest severity of all the failing lint rules
+	HighestSeverity int
+	ChartDir        string
+}
+
+// Message describes an error encountered while linting.
+type Message struct {
+	// Severity is one of the *Sev constants
+	Severity int
+	Path     string
+	Err      error
+}
+
+func (m Message) Error() string {
+	return fmt.Sprintf("[%s] %s: %s", sev[m.Severity], m.Path, m.Err.Error())
+}
+
+// NewMessage creates a new Message struct
+func NewMessage(severity int, path string, err error) Message {
+	return Message{Severity: severity, Path: path, Err: err}
+}
+
+// RunLinterRule returns true if the validation passed
+func (l *Linter) RunLinterRule(severity int, path string, err error) bool {
+	// severity is out of bound
+	if severity < 0 || severity >= len(sev) {
+		return false
+	}
+
+	if err != nil {
+		l.Messages = append(l.Messages, NewMessage(severity, path, err))
+
+		if severity > l.HighestSeverity {
+			l.HighestSeverity = severity
+		}
+	}
+	return err == nil
+}
diff --git a/pkg/chart/v2/lint/support/message_test.go b/pkg/chart/v2/lint/support/message_test.go
new file mode 100644
index 000000000..ce5b5e42e
--- /dev/null
+++ b/pkg/chart/v2/lint/support/message_test.go
@@ -0,0 +1,79 @@
+/*
+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 support
+
+import (
+	"errors"
+	"testing"
+)
+
+var errLint = errors.New("lint failed")
+
+func TestRunLinterRule(t *testing.T) {
+	var tests = []struct {
+		Severity                int
+		LintError               error
+		ExpectedMessages        int
+		ExpectedReturn          bool
+		ExpectedHighestSeverity int
+	}{
+		{InfoSev, errLint, 1, false, InfoSev},
+		{WarningSev, errLint, 2, false, WarningSev},
+		{ErrorSev, errLint, 3, false, ErrorSev},
+		// No error so it returns true
+		{ErrorSev, nil, 3, true, ErrorSev},
+		// Retains highest severity
+		{InfoSev, errLint, 4, false, ErrorSev},
+		// Invalid severity values
+		{4, errLint, 4, false, ErrorSev},
+		{22, errLint, 4, false, ErrorSev},
+		{-1, errLint, 4, false, ErrorSev},
+	}
+
+	linter := Linter{}
+	for _, test := range tests {
+		isValid := linter.RunLinterRule(test.Severity, "chart", test.LintError)
+		if len(linter.Messages) != test.ExpectedMessages {
+			t.Errorf("RunLinterRule(%d, \"chart\", %v), linter.Messages should now have %d message, we got %d", test.Severity, test.LintError, test.ExpectedMessages, len(linter.Messages))
+		}
+
+		if linter.HighestSeverity != test.ExpectedHighestSeverity {
+			t.Errorf("RunLinterRule(%d, \"chart\", %v), linter.HighestSeverity should be %d, we got %d", test.Severity, test.LintError, test.ExpectedHighestSeverity, linter.HighestSeverity)
+		}
+
+		if isValid != test.ExpectedReturn {
+			t.Errorf("RunLinterRule(%d, \"chart\", %v), should have returned %t but returned %t", test.Severity, test.LintError, test.ExpectedReturn, isValid)
+		}
+	}
+}
+
+func TestMessage(t *testing.T) {
+	m := Message{ErrorSev, "Chart.yaml", errors.New("Foo")}
+	if m.Error() != "[ERROR] Chart.yaml: Foo" {
+		t.Errorf("Unexpected output: %s", m.Error())
+	}
+
+	m = Message{WarningSev, "templates/", errors.New("Bar")}
+	if m.Error() != "[WARNING] templates/: Bar" {
+		t.Errorf("Unexpected output: %s", m.Error())
+	}
+
+	m = Message{InfoSev, "templates/rc.yaml", errors.New("FooBar")}
+	if m.Error() != "[INFO] templates/rc.yaml: FooBar" {
+		t.Errorf("Unexpected output: %s", m.Error())
+	}
+}
diff --git a/pkg/chart/v2/loader/load.go b/pkg/chart/v2/loader/load.go
index 75c73e959..0c025e183 100644
--- a/pkg/chart/v2/loader/load.go
+++ b/pkg/chart/v2/loader/load.go
@@ -31,6 +31,7 @@ import (
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -80,7 +81,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 	// do not rely on assumed ordering of files in the chart and crash
 	// if Chart.yaml was not coming early enough to initialize metadata
 	for _, f := range files {
-		c.Raw = append(c.Raw, &chart.File{Name: f.Name, Data: f.Data})
+		c.Raw = append(c.Raw, &common.File{Name: f.Name, Data: f.Data})
 		if f.Name == "Chart.yaml" {
 			if c.Metadata == nil {
 				c.Metadata = new(chart.Metadata)
@@ -128,7 +129,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 				return c, fmt.Errorf("cannot load requirements.yaml: %w", err)
 			}
 			if c.Metadata.APIVersion == chart.APIVersionV1 {
-				c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+				c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 			}
 		// Deprecated: requirements.lock is deprecated use Chart.lock.
 		case f.Name == "requirements.lock":
@@ -143,14 +144,14 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 				log.Printf("Warning: Dependency locking is handled in Chart.lock since apiVersion \"v2\". We recommend migrating to Chart.lock.")
 			}
 			if c.Metadata.APIVersion == chart.APIVersionV1 {
-				c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+				c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 			}
 
 		case strings.HasPrefix(f.Name, "templates/"):
-			c.Templates = append(c.Templates, &chart.File{Name: f.Name, Data: f.Data})
+			c.Templates = append(c.Templates, &common.File{Name: f.Name, Data: f.Data})
 		case strings.HasPrefix(f.Name, "charts/"):
 			if filepath.Ext(f.Name) == ".prov" {
-				c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+				c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 				continue
 			}
 
@@ -158,7 +159,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 			cname := strings.SplitN(fname, "/", 2)[0]
 			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
 		default:
-			c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})
+			c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 		}
 	}
 
diff --git a/pkg/chart/v2/loader/load_test.go b/pkg/chart/v2/loader/load_test.go
index 41154421c..c4ae646f6 100644
--- a/pkg/chart/v2/loader/load_test.go
+++ b/pkg/chart/v2/loader/load_test.go
@@ -30,6 +30,7 @@ import (
 	"testing"
 	"time"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -543,7 +544,7 @@ foo:
 	}
 }
 
-func TestMergeValues(t *testing.T) {
+func TestMergeValuesV2(t *testing.T) {
 	nestedMap := map[string]interface{}{
 		"foo": "bar",
 		"baz": map[string]string{
@@ -753,7 +754,7 @@ func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) {
 	}
 }
 
-func verifyBomStripped(t *testing.T, files []*chart.File) {
+func verifyBomStripped(t *testing.T, files []*common.File) {
 	t.Helper()
 	for _, file := range files {
 		if bytes.HasPrefix(file.Data, utf8bom) {
diff --git a/pkg/chart/v2/util/create.go b/pkg/chart/v2/util/create.go
index a8ae3ab40..d7c1fe31c 100644
--- a/pkg/chart/v2/util/create.go
+++ b/pkg/chart/v2/util/create.go
@@ -26,6 +26,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
@@ -655,11 +656,11 @@ func CreateFrom(chartfile *chart.Metadata, dest, src string) error {
 
 	schart.Metadata = chartfile
 
-	var updatedTemplates []*chart.File
+	var updatedTemplates []*common.File
 
 	for _, template := range schart.Templates {
 		newData := transform(string(template.Data), schart.Name())
-		updatedTemplates = append(updatedTemplates, &chart.File{Name: template.Name, Data: newData})
+		updatedTemplates = append(updatedTemplates, &common.File{Name: template.Name, Data: newData})
 	}
 
 	schart.Templates = updatedTemplates
diff --git a/pkg/chart/v2/util/dependencies.go b/pkg/chart/v2/util/dependencies.go
index 1a2aa1c95..a52f09f82 100644
--- a/pkg/chart/v2/util/dependencies.go
+++ b/pkg/chart/v2/util/dependencies.go
@@ -22,11 +22,13 @@ import (
 
 	"github.com/mitchellh/copystructure"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
 // ProcessDependencies checks through this chart's dependencies, processing accordingly.
-func ProcessDependencies(c *chart.Chart, v Values) error {
+func ProcessDependencies(c *chart.Chart, v common.Values) error {
 	if err := processDependencyEnabled(c, v, ""); err != nil {
 		return err
 	}
@@ -34,7 +36,7 @@ func ProcessDependencies(c *chart.Chart, v Values) error {
 }
 
 // processDependencyConditions disables charts based on condition path value in values
-func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath string) {
+func processDependencyConditions(reqs []*chart.Dependency, cvals common.Values, cpath string) {
 	if reqs == nil {
 		return
 	}
@@ -50,7 +52,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
 						break
 					}
 					slog.Warn("returned non-bool value", "path", c, "chart", r.Name)
-				} else if _, ok := err.(ErrNoValue); !ok {
+				} else if _, ok := err.(common.ErrNoValue); !ok {
 					// this is a real error
 					slog.Warn("the method PathValue returned error", slog.Any("error", err))
 				}
@@ -60,7 +62,7 @@ func processDependencyConditions(reqs []*chart.Dependency, cvals Values, cpath s
 }
 
 // processDependencyTags disables charts based on tags in values
-func processDependencyTags(reqs []*chart.Dependency, cvals Values) {
+func processDependencyTags(reqs []*chart.Dependency, cvals common.Values) {
 	if reqs == nil {
 		return
 	}
@@ -177,7 +179,7 @@ Loop:
 	for _, lr := range c.Metadata.Dependencies {
 		lr.Enabled = true
 	}
-	cvals, err := CoalesceValues(c, v)
+	cvals, err := util.CoalesceValues(c, v)
 	if err != nil {
 		return err
 	}
@@ -232,6 +234,8 @@ func pathToMap(path string, data map[string]interface{}) map[string]interface{}
 	return set(parsePath(path), data)
 }
 
+func parsePath(key string) []string { return strings.Split(key, ".") }
+
 func set(path []string, data map[string]interface{}) map[string]interface{} {
 	if len(path) == 0 {
 		return nil
@@ -249,12 +253,12 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		return nil
 	}
 	// combine chart values and empty config to get Values
-	var cvals Values
+	var cvals common.Values
 	var err error
 	if merge {
-		cvals, err = MergeValues(c, nil)
+		cvals, err = util.MergeValues(c, nil)
 	} else {
-		cvals, err = CoalesceValues(c, nil)
+		cvals, err = util.CoalesceValues(c, nil)
 	}
 	if err != nil {
 		return err
@@ -282,9 +286,9 @@ func processImportValues(c *chart.Chart, merge bool) error {
 				}
 				// create value map from child to be merged into parent
 				if merge {
-					b = MergeTables(b, pathToMap(parent, vv.AsMap()))
+					b = util.MergeTables(b, pathToMap(parent, vv.AsMap()))
 				} else {
-					b = CoalesceTables(b, pathToMap(parent, vv.AsMap()))
+					b = util.CoalesceTables(b, pathToMap(parent, vv.AsMap()))
 				}
 			case string:
 				child := "exports." + iv
@@ -298,9 +302,9 @@ func processImportValues(c *chart.Chart, merge bool) error {
 					continue
 				}
 				if merge {
-					b = MergeTables(b, vm.AsMap())
+					b = util.MergeTables(b, vm.AsMap())
 				} else {
-					b = CoalesceTables(b, vm.AsMap())
+					b = util.CoalesceTables(b, vm.AsMap())
 				}
 			}
 		}
@@ -315,14 +319,14 @@ func processImportValues(c *chart.Chart, merge bool) error {
 		// deep copying the cvals as there are cases where pointers can end
 		// up in the cvals when they are copied onto b in ways that break things.
 		cvals = deepCopyMap(cvals)
-		c.Values = MergeTables(cvals, b)
+		c.Values = util.MergeTables(cvals, b)
 	} else {
 		// Trimming the nil values from cvals is needed for backwards compatibility.
 		// Previously, the b value had been populated with cvals along with some
 		// overrides. This caused the coalescing functionality to remove the
 		// nil/null values. This trimming is for backwards compat.
 		cvals = trimNilValues(cvals)
-		c.Values = CoalesceTables(cvals, b)
+		c.Values = util.CoalesceTables(cvals, b)
 	}
 
 	return nil
@@ -355,6 +359,12 @@ func trimNilValues(vals map[string]interface{}) map[string]interface{} {
 	return valsCopyMap
 }
 
+// istable is a special-purpose function to see if the present thing matches the definition of a YAML table.
+func istable(v interface{}) bool {
+	_, ok := v.(map[string]interface{})
+	return ok
+}
+
 // processDependencyImportValues imports specified chart values from child to parent.
 func processDependencyImportValues(c *chart.Chart, merge bool) error {
 	for _, d := range c.Dependencies() {
diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go
index d645d7bf5..c817b0b89 100644
--- a/pkg/chart/v2/util/dependencies_test.go
+++ b/pkg/chart/v2/util/dependencies_test.go
@@ -21,6 +21,7 @@ import (
 	"strconv"
 	"testing"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
@@ -221,7 +222,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	if err := processDependencyImportValues(c, false); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc := Values(c.Values)
+	cc := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cc.PathValue(kk)
 		if err != nil {
@@ -251,7 +252,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 		t.Error("expect nil value not found but found it")
 	}
 	switch xerr := err.(type) {
-	case ErrNoValue:
+	case common.ErrNoValue:
 		// We found what we expected
 	default:
 		t.Errorf("expected an ErrNoValue but got %q instead", xerr)
@@ -261,7 +262,7 @@ func TestProcessDependencyImportValues(t *testing.T) {
 	if err := processDependencyImportValues(c, true); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc = Values(c.Values)
+	cc = common.Values(c.Values)
 	val, err := cc.PathValue("ensurenull")
 	if err != nil {
 		t.Error("expect value but ensurenull was not found")
@@ -291,7 +292,7 @@ func TestProcessDependencyImportValuesFromSharedDependencyToAliases(t *testing.T
 	e["foo.grandchild.defaults.defaultValue"] = "42"
 	e["bar.grandchild.defaults.defaultValue"] = "42"
 
-	cValues := Values(c.Values)
+	cValues := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cValues.PathValue(kk)
 		if err != nil {
@@ -329,7 +330,7 @@ func TestProcessDependencyImportValuesMultiLevelPrecedence(t *testing.T) {
 	if err := processDependencyImportValues(c, true); err != nil {
 		t.Fatalf("processing import values dependencies %v", err)
 	}
-	cc := Values(c.Values)
+	cc := common.Values(c.Values)
 	for kk, vv := range e {
 		pv, err := cc.PathValue(kk)
 		if err != nil {
diff --git a/pkg/chart/v2/util/save.go b/pkg/chart/v2/util/save.go
index 624a5b562..69a98924c 100644
--- a/pkg/chart/v2/util/save.go
+++ b/pkg/chart/v2/util/save.go
@@ -29,6 +29,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -76,7 +77,7 @@ func SaveDir(c *chart.Chart, dest string) error {
 	}
 
 	// Save templates and files
-	for _, o := range [][]*chart.File{c.Templates, c.Files} {
+	for _, o := range [][]*common.File{c.Templates, c.Files} {
 		for _, f := range o {
 			n := filepath.Join(outdir, f.Name)
 			if err := writeFile(n, f.Data); err != nil {
@@ -258,7 +259,7 @@ func validateName(name string) error {
 	nname := filepath.Base(name)
 
 	if nname != name {
-		return ErrInvalidChartName{name}
+		return common.ErrInvalidChartName{Name: name}
 	}
 
 	return nil
diff --git a/pkg/chart/v2/util/save_test.go b/pkg/chart/v2/util/save_test.go
index ff96331b5..ef822a82a 100644
--- a/pkg/chart/v2/util/save_test.go
+++ b/pkg/chart/v2/util/save_test.go
@@ -29,6 +29,7 @@ import (
 	"testing"
 	"time"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 )
@@ -47,7 +48,7 @@ func TestSave(t *testing.T) {
 				Lock: &chart.Lock{
 					Digest: "testdigest",
 				},
-				Files: []*chart.File{
+				Files: []*common.File{
 					{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 				},
 				Schema: []byte("{\n  \"title\": \"Values\"\n}"),
@@ -116,7 +117,7 @@ func TestSave(t *testing.T) {
 		Lock: &chart.Lock{
 			Digest: "testdigest",
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
 	}
@@ -156,7 +157,7 @@ func TestSavePreservesTimestamps(t *testing.T) {
 			"imageName": "testimage",
 			"imageId":   42,
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
 		Schema: []byte("{\n  \"title\": \"Values\"\n}"),
@@ -222,10 +223,10 @@ func TestSaveDir(t *testing.T) {
 			Name:       "ahab",
 			Version:    "1.2.3",
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "scheherazade/shahryar.txt", Data: []byte("1,001 Nights")},
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: path.Join(TemplatesDir, "nested", "dir", "thing.yaml"), Data: []byte("abc: {{ .Values.abc }}")},
 		},
 	}
diff --git a/pkg/cli/values/options_test.go b/pkg/cli/values/options_test.go
index 4dbc709f1..fe1afc5d2 100644
--- a/pkg/cli/values/options_test.go
+++ b/pkg/cli/values/options_test.go
@@ -294,7 +294,7 @@ func TestReadFileOriginal(t *testing.T) {
 	}
 }
 
-func TestMergeValues(t *testing.T) {
+func TestMergeValuesCLI(t *testing.T) {
 	tests := []struct {
 		name     string
 		opts     Options
diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go
index 40478c30e..55e3a842f 100644
--- a/pkg/cmd/helpers_test.go
+++ b/pkg/cmd/helpers_test.go
@@ -28,7 +28,7 @@ import (
 
 	"helm.sh/helm/v4/internal/test"
 	"helm.sh/helm/v4/pkg/action"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/cli"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -91,7 +91,7 @@ func executeActionCommandStdinC(store *storage.Storage, in *os.File, cmd string)
 	actionConfig := &action.Configuration{
 		Releases:     store,
 		KubeClient:   &kubefake.PrintingKubeClient{Out: io.Discard},
-		Capabilities: chartutil.DefaultCapabilities,
+		Capabilities: common.DefaultCapabilities,
 	}
 
 	root, err := newRootCmdWithConfig(actionConfig, buf, args, SetupLogging)
diff --git a/pkg/cmd/lint.go b/pkg/cmd/lint.go
index 78083a7ea..71540f1be 100644
--- a/pkg/cmd/lint.go
+++ b/pkg/cmd/lint.go
@@ -27,10 +27,10 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/pkg/action"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/v2/lint/support"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/getter"
-	"helm.sh/helm/v4/pkg/lint/support"
 )
 
 var longLintHelp = `
@@ -58,7 +58,7 @@ func newLintCmd(out io.Writer) *cobra.Command {
 			}
 
 			if kubeVersion != "" {
-				parsedKubeVersion, err := chartutil.ParseKubeVersion(kubeVersion)
+				parsedKubeVersion, err := common.ParseKubeVersion(kubeVersion)
 				if err != nil {
 					return fmt.Errorf("invalid kube version '%s': %s", kubeVersion, err)
 				}
diff --git a/pkg/cmd/status.go b/pkg/cmd/status.go
index aa836f9f3..3d1309c3e 100644
--- a/pkg/cmd/status.go
+++ b/pkg/cmd/status.go
@@ -30,7 +30,7 @@ import (
 
 	coloroutput "helm.sh/helm/v4/internal/cli/output"
 	"helm.sh/helm/v4/pkg/action"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
@@ -197,7 +197,7 @@ func (s statusPrinter) WriteTable(out io.Writer) error {
 		// Print an extra newline
 		_, _ = fmt.Fprintln(out)
 
-		cfg, err := chartutil.CoalesceValues(s.release.Chart, s.release.Config)
+		cfg, err := util.CoalesceValues(s.release.Chart, s.release.Config)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cmd/template.go b/pkg/cmd/template.go
index aaf848c9e..81c112d51 100644
--- a/pkg/cmd/template.go
+++ b/pkg/cmd/template.go
@@ -35,7 +35,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/pkg/action"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/cmd/require"
 	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
@@ -69,7 +69,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 		},
 		RunE: func(_ *cobra.Command, args []string) error {
 			if kubeVersion != "" {
-				parsedKubeVersion, err := chartutil.ParseKubeVersion(kubeVersion)
+				parsedKubeVersion, err := common.ParseKubeVersion(kubeVersion)
 				if err != nil {
 					return fmt.Errorf("invalid kube version '%s': %s", kubeVersion, err)
 				}
@@ -93,7 +93,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 			client.ReleaseName = "release-name"
 			client.Replace = true // Skip the name check
 			client.ClientOnly = !validate
-			client.APIVersions = chartutil.VersionSet(extraAPIs)
+			client.APIVersions = common.VersionSet(extraAPIs)
 			client.IncludeCRDs = includeCrds
 			rel, err := runInstall(args, client, valueOpts, out)
 
diff --git a/pkg/cmd/upgrade_test.go b/pkg/cmd/upgrade_test.go
index d7375dcad..9b17f187d 100644
--- a/pkg/cmd/upgrade_test.go
+++ b/pkg/cmd/upgrade_test.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 	"testing"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	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"
@@ -382,7 +383,7 @@ func prepareMockRelease(t *testing.T, releaseName string) (func(n string, v int,
 			Description: "A Helm chart for Kubernetes",
 			Version:     "0.1.0",
 		},
-		Templates: []*chart.File{{Name: "templates/configmap.yaml", Data: configmapData}},
+		Templates: []*common.File{{Name: "templates/configmap.yaml", Data: configmapData}},
 	}
 	chartPath := filepath.Join(tmpChart, cfile.Metadata.Name)
 	if err := chartutil.SaveDir(cfile, tmpChart); err != nil {
@@ -490,7 +491,7 @@ func prepareMockReleaseWithSecret(t *testing.T, releaseName string) (func(n stri
 			Description: "A Helm chart for Kubernetes",
 			Version:     "0.1.0",
 		},
-		Templates: []*chart.File{{Name: "templates/configmap.yaml", Data: configmapData}, {Name: "templates/secret.yaml", Data: secretData}},
+		Templates: []*common.File{{Name: "templates/configmap.yaml", Data: configmapData}, {Name: "templates/secret.yaml", Data: secretData}},
 	}
 	chartPath := filepath.Join(tmpChart, cfile.Metadata.Name)
 	if err := chartutil.SaveDir(cfile, tmpChart); err != nil {
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 6e47a0e39..a0ca17f08 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -30,8 +30,8 @@ import (
 
 	"k8s.io/client-go/rest"
 
-	chart "helm.sh/helm/v4/pkg/chart/v2"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	ci "helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
@@ -88,21 +88,21 @@ func New(config *rest.Config) Engine {
 // that section of the values will be passed into the "foo" chart. And if that
 // section contains a value named "bar", that value will be passed on to the
 // bar chart during render time.
-func (e Engine) Render(chrt *chart.Chart, values chartutil.Values) (map[string]string, error) {
+func (e Engine) Render(chrt ci.Charter, values common.Values) (map[string]string, error) {
 	tmap := allTemplates(chrt, values)
 	return e.render(tmap)
 }
 
 // Render takes a chart, optional values, and value overrides, and attempts to
 // render the Go templates using the default options.
-func Render(chrt *chart.Chart, values chartutil.Values) (map[string]string, error) {
+func Render(chrt ci.Charter, values common.Values) (map[string]string, error) {
 	return new(Engine).Render(chrt, values)
 }
 
 // RenderWithClient takes a chart, optional values, and value overrides, and attempts to
 // render the Go templates using the default options. This engine is client aware and so can have template
 // functions that interact with the client.
-func RenderWithClient(chrt *chart.Chart, values chartutil.Values, config *rest.Config) (map[string]string, error) {
+func RenderWithClient(chrt ci.Charter, values common.Values, config *rest.Config) (map[string]string, error) {
 	var clientProvider ClientProvider = clientProviderFromConfig{config}
 	return Engine{
 		clientProvider: &clientProvider,
@@ -113,7 +113,7 @@ func RenderWithClient(chrt *chart.Chart, values chartutil.Values, config *rest.C
 // render the Go templates using the default options. This engine is client aware and so can have template
 // functions that interact with the client.
 // This function differs from RenderWithClient in that it lets you customize the way a dynamic client is constructed.
-func RenderWithClientProvider(chrt *chart.Chart, values chartutil.Values, clientProvider ClientProvider) (map[string]string, error) {
+func RenderWithClientProvider(chrt ci.Charter, values common.Values, clientProvider ClientProvider) (map[string]string, error) {
 	return Engine{
 		clientProvider: &clientProvider,
 	}.Render(chrt, values)
@@ -124,7 +124,7 @@ type renderable struct {
 	// tpl is the current template.
 	tpl string
 	// vals are the values to be supplied to the template.
-	vals chartutil.Values
+	vals common.Values
 	// namespace prefix to the templates of the current chart
 	basePath string
 }
@@ -312,7 +312,7 @@ func (e Engine) render(tpls map[string]renderable) (rendered map[string]string,
 		}
 		// At render time, add information about the template that is being rendered.
 		vals := tpls[filename].vals
-		vals["Template"] = chartutil.Values{"Name": filename, "BasePath": tpls[filename].basePath}
+		vals["Template"] = common.Values{"Name": filename, "BasePath": tpls[filename].basePath}
 		var buf strings.Builder
 		if err := t.ExecuteTemplate(&buf, filename, vals); err != nil {
 			return map[string]string{}, reformatExecErrorMsg(filename, err)
@@ -455,7 +455,7 @@ func (p byPathLen) Less(i, j int) bool {
 // allTemplates returns all templates for a chart and its dependencies.
 //
 // As it goes, it also prepares the values in a scope-sensitive manner.
-func allTemplates(c *chart.Chart, vals chartutil.Values) map[string]renderable {
+func allTemplates(c ci.Charter, vals common.Values) map[string]renderable {
 	templates := make(map[string]renderable)
 	recAllTpls(c, templates, vals)
 	return templates
@@ -465,40 +465,46 @@ func allTemplates(c *chart.Chart, vals chartutil.Values) map[string]renderable {
 //
 // As it recurses, it also sets the values to be appropriate for the template
 // scope.
-func recAllTpls(c *chart.Chart, templates map[string]renderable, vals chartutil.Values) map[string]interface{} {
+func recAllTpls(c ci.Charter, templates map[string]renderable, values common.Values) map[string]interface{} {
+	vals := values.AsMap()
 	subCharts := make(map[string]interface{})
-	chartMetaData := struct {
-		chart.Metadata
-		IsRoot bool
-	}{*c.Metadata, c.IsRoot()}
+	accessor, err := ci.NewAccessor(c)
+	if err != nil {
+		slog.Error("error accessing chart", "error", err)
+	}
+	chartMetaData := accessor.MetadataAsMap()
+	fmt.Printf("metadata: %v\n", chartMetaData)
+	chartMetaData["IsRoot"] = accessor.IsRoot()
 
 	next := map[string]interface{}{
 		"Chart":        chartMetaData,
-		"Files":        newFiles(c.Files),
+		"Files":        newFiles(accessor.Files()),
 		"Release":      vals["Release"],
 		"Capabilities": vals["Capabilities"],
-		"Values":       make(chartutil.Values),
+		"Values":       make(common.Values),
 		"Subcharts":    subCharts,
 	}
 
 	// If there is a {{.Values.ThisChart}} in the parent metadata,
 	// copy that into the {{.Values}} for this template.
-	if c.IsRoot() {
+	if accessor.IsRoot() {
 		next["Values"] = vals["Values"]
-	} else if vs, err := vals.Table("Values." + c.Name()); err == nil {
+	} else if vs, err := values.Table("Values." + accessor.Name()); err == nil {
 		next["Values"] = vs
 	}
 
-	for _, child := range c.Dependencies() {
-		subCharts[child.Name()] = recAllTpls(child, templates, next)
+	for _, child := range accessor.Dependencies() {
+		// TODO: Handle error
+		sub, _ := ci.NewAccessor(child)
+		subCharts[sub.Name()] = recAllTpls(child, templates, next)
 	}
 
-	newParentID := c.ChartFullPath()
-	for _, t := range c.Templates {
+	newParentID := accessor.ChartFullPath()
+	for _, t := range accessor.Templates() {
 		if t == nil {
 			continue
 		}
-		if !isTemplateValid(c, t.Name) {
+		if !isTemplateValid(accessor, t.Name) {
 			continue
 		}
 		templates[path.Join(newParentID, t.Name)] = renderable{
@@ -512,14 +518,9 @@ func recAllTpls(c *chart.Chart, templates map[string]renderable, vals chartutil.
 }
 
 // isTemplateValid returns true if the template is valid for the chart type
-func isTemplateValid(ch *chart.Chart, templateName string) bool {
-	if isLibraryChart(ch) {
+func isTemplateValid(accessor ci.Accessor, templateName string) bool {
+	if accessor.IsLibraryChart() {
 		return strings.HasPrefix(filepath.Base(templateName), "_")
 	}
 	return true
 }
-
-// isLibraryChart returns true if the chart is a library chart
-func isLibraryChart(c *chart.Chart) bool {
-	return strings.EqualFold(c.Metadata.Type, "library")
-}
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index f4228fbd7..7ac892cec 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -32,8 +32,9 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/dynamic/fake"
 
+	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/common/util"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 )
 
 func TestSortTemplates(t *testing.T) {
@@ -94,7 +95,7 @@ func TestRender(t *testing.T) {
 			Name:    "moby",
 			Version: "1.2.3",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/test1", Data: []byte("{{.Values.outer | title }} {{.Values.inner | title}}")},
 			{Name: "templates/test2", Data: []byte("{{.Values.global.callme | lower }}")},
 			{Name: "templates/test3", Data: []byte("{{.noValue}}")},
@@ -114,7 +115,7 @@ func TestRender(t *testing.T) {
 		},
 	}
 
-	v, err := chartutil.CoalesceValues(c, vals)
+	v, err := util.CoalesceValues(c, vals)
 	if err != nil {
 		t.Fatalf("Failed to coalesce values: %s", err)
 	}
@@ -144,7 +145,7 @@ func TestRenderRefsOrdering(t *testing.T) {
 			Name:    "parent",
 			Version: "1.2.3",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/_helpers.tpl", Data: []byte(`{{- define "test" -}}parent value{{- end -}}`)},
 			{Name: "templates/test.yaml", Data: []byte(`{{ tpl "{{ include \"test\" . }}" . }}`)},
 		},
@@ -154,7 +155,7 @@ func TestRenderRefsOrdering(t *testing.T) {
 			Name:    "child",
 			Version: "1.2.3",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/_helpers.tpl", Data: []byte(`{{- define "test" -}}child value{{- end -}}`)},
 		},
 	}
@@ -165,7 +166,7 @@ func TestRenderRefsOrdering(t *testing.T) {
 	}
 
 	for i := 0; i < 100; i++ {
-		out, err := Render(parentChart, chartutil.Values{})
+		out, err := Render(parentChart, common.Values{})
 		if err != nil {
 			t.Fatalf("Failed to render templates: %s", err)
 		}
@@ -181,7 +182,7 @@ func TestRenderRefsOrdering(t *testing.T) {
 func TestRenderInternals(t *testing.T) {
 	// Test the internals of the rendering tool.
 
-	vals := chartutil.Values{"Name": "one", "Value": "two"}
+	vals := common.Values{"Name": "one", "Value": "two"}
 	tpls := map[string]renderable{
 		"one": {tpl: `Hello {{title .Name}}`, vals: vals},
 		"two": {tpl: `Goodbye {{upper .Value}}`, vals: vals},
@@ -218,7 +219,7 @@ func TestRenderWithDNS(t *testing.T) {
 			Name:    "moby",
 			Version: "1.2.3",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/test1", Data: []byte("{{getHostByName \"helm.sh\"}}")},
 		},
 		Values: map[string]interface{}{},
@@ -228,7 +229,7 @@ func TestRenderWithDNS(t *testing.T) {
 		"Values": map[string]interface{}{},
 	}
 
-	v, err := chartutil.CoalesceValues(c, vals)
+	v, err := util.CoalesceValues(c, vals)
 	if err != nil {
 		t.Fatalf("Failed to coalesce values: %s", err)
 	}
@@ -355,7 +356,7 @@ func TestRenderWithClientProvider(t *testing.T) {
 	}
 
 	for name, exp := range cases {
-		c.Templates = append(c.Templates, &chart.File{
+		c.Templates = append(c.Templates, &common.File{
 			Name: path.Join("templates", name),
 			Data: []byte(exp.template),
 		})
@@ -365,7 +366,7 @@ func TestRenderWithClientProvider(t *testing.T) {
 		"Values": map[string]interface{}{},
 	}
 
-	v, err := chartutil.CoalesceValues(c, vals)
+	v, err := util.CoalesceValues(c, vals)
 	if err != nil {
 		t.Fatalf("Failed to coalesce values: %s", err)
 	}
@@ -391,7 +392,7 @@ func TestRenderWithClientProvider_error(t *testing.T) {
 			Name:    "moby",
 			Version: "1.2.3",
 		},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/error", Data: []byte(`{{ lookup "v1" "Error" "" "" }}`)},
 		},
 		Values: map[string]interface{}{},
@@ -401,7 +402,7 @@ func TestRenderWithClientProvider_error(t *testing.T) {
 		"Values": map[string]interface{}{},
 	}
 
-	v, err := chartutil.CoalesceValues(c, vals)
+	v, err := util.CoalesceValues(c, vals)
 	if err != nil {
 		t.Fatalf("Failed to coalesce values: %s", err)
 	}
@@ -448,7 +449,7 @@ func TestParallelRenderInternals(t *testing.T) {
 }
 
 func TestParseErrors(t *testing.T) {
-	vals := chartutil.Values{"Values": map[string]interface{}{}}
+	vals := common.Values{"Values": map[string]interface{}{}}
 
 	tplsUndefinedFunction := map[string]renderable{
 		"undefined_function": {tpl: `{{foo}}`, vals: vals},
@@ -464,7 +465,7 @@ func TestParseErrors(t *testing.T) {
 }
 
 func TestExecErrors(t *testing.T) {
-	vals := chartutil.Values{"Values": map[string]interface{}{}}
+	vals := common.Values{"Values": map[string]interface{}{}}
 	cases := []struct {
 		name     string
 		tpls     map[string]renderable
@@ -528,7 +529,7 @@ linebreak`,
 }
 
 func TestFailErrors(t *testing.T) {
-	vals := chartutil.Values{"Values": map[string]interface{}{}}
+	vals := common.Values{"Values": map[string]interface{}{}}
 
 	failtpl := `All your base are belong to us{{ fail "This is an error" }}`
 	tplsFailed := map[string]renderable{
@@ -559,14 +560,14 @@ func TestFailErrors(t *testing.T) {
 func TestAllTemplates(t *testing.T) {
 	ch1 := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "ch1"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/foo", Data: []byte("foo")},
 			{Name: "templates/bar", Data: []byte("bar")},
 		},
 	}
 	dep1 := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "laboratory mice"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/pinky", Data: []byte("pinky")},
 			{Name: "templates/brain", Data: []byte("brain")},
 		},
@@ -575,13 +576,13 @@ func TestAllTemplates(t *testing.T) {
 
 	dep2 := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "same thing we do every night"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/innermost", Data: []byte("innermost")},
 		},
 	}
 	dep1.AddDependency(dep2)
 
-	tpls := allTemplates(ch1, chartutil.Values{})
+	tpls := allTemplates(ch1, common.Values{})
 	if len(tpls) != 5 {
 		t.Errorf("Expected 5 charts, got %d", len(tpls))
 	}
@@ -590,19 +591,19 @@ func TestAllTemplates(t *testing.T) {
 func TestChartValuesContainsIsRoot(t *testing.T) {
 	ch1 := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "parent"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/isroot", Data: []byte("{{.Chart.IsRoot}}")},
 		},
 	}
 	dep1 := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "child"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/isroot", Data: []byte("{{.Chart.IsRoot}}")},
 		},
 	}
 	ch1.AddDependency(dep1)
 
-	out, err := Render(ch1, chartutil.Values{})
+	out, err := Render(ch1, common.Values{})
 	if err != nil {
 		t.Fatalf("failed to render templates: %s", err)
 	}
@@ -622,13 +623,13 @@ func TestRenderDependency(t *testing.T) {
 	toptpl := `Hello {{template "myblock"}}`
 	ch := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "outerchart"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/outer", Data: []byte(toptpl)},
 		},
 	}
 	ch.AddDependency(&chart.Chart{
 		Metadata: &chart.Metadata{Name: "innerchart"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/inner", Data: []byte(deptpl)},
 		},
 	})
@@ -660,7 +661,7 @@ func TestRenderNestedValues(t *testing.T) {
 
 	deepest := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "deepest"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: deepestpath, Data: []byte(`And this same {{.Values.what}} that smiles {{.Values.global.when}}`)},
 			{Name: checkrelease, Data: []byte(`Tomorrow will be {{default "happy" .Release.Name }}`)},
 		},
@@ -669,7 +670,7 @@ func TestRenderNestedValues(t *testing.T) {
 
 	inner := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "herrick"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: innerpath, Data: []byte(`Old {{.Values.who}} is still a-flyin'`)},
 		},
 		Values: map[string]interface{}{"who": "Robert", "what": "glasses"},
@@ -678,7 +679,7 @@ func TestRenderNestedValues(t *testing.T) {
 
 	outer := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "top"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: outerpath, Data: []byte(`Gather ye {{.Values.what}} while ye may`)},
 			{Name: subchartspath, Data: []byte(`The glorious Lamp of {{.Subcharts.herrick.Subcharts.deepest.Values.where}}, the {{.Subcharts.herrick.Values.what}}`)},
 		},
@@ -706,15 +707,15 @@ func TestRenderNestedValues(t *testing.T) {
 		},
 	}
 
-	tmp, err := chartutil.CoalesceValues(outer, injValues)
+	tmp, err := util.CoalesceValues(outer, injValues)
 	if err != nil {
 		t.Fatalf("Failed to coalesce values: %s", err)
 	}
 
-	inject := chartutil.Values{
+	inject := common.Values{
 		"Values": tmp,
 		"Chart":  outer.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "dyin",
 		},
 	}
@@ -754,30 +755,30 @@ func TestRenderNestedValues(t *testing.T) {
 
 func TestRenderBuiltinValues(t *testing.T) {
 	inner := &chart.Chart{
-		Metadata: &chart.Metadata{Name: "Latium"},
-		Templates: []*chart.File{
+		Metadata: &chart.Metadata{Name: "Latium", APIVersion: chart.APIVersionV2},
+		Templates: []*common.File{
 			{Name: "templates/Lavinia", Data: []byte(`{{.Template.Name}}{{.Chart.Name}}{{.Release.Name}}`)},
 			{Name: "templates/From", Data: []byte(`{{.Files.author | printf "%s"}} {{.Files.Get "book/title.txt"}}`)},
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "author", Data: []byte("Virgil")},
 			{Name: "book/title.txt", Data: []byte("Aeneid")},
 		},
 	}
 
 	outer := &chart.Chart{
-		Metadata: &chart.Metadata{Name: "Troy"},
-		Templates: []*chart.File{
+		Metadata: &chart.Metadata{Name: "Troy", APIVersion: chart.APIVersionV2},
+		Templates: []*common.File{
 			{Name: "templates/Aeneas", Data: []byte(`{{.Template.Name}}{{.Chart.Name}}{{.Release.Name}}`)},
 			{Name: "templates/Amata", Data: []byte(`{{.Subcharts.Latium.Chart.Name}} {{.Subcharts.Latium.Files.author | printf "%s"}}`)},
 		},
 	}
 	outer.AddDependency(inner)
 
-	inject := chartutil.Values{
+	inject := common.Values{
 		"Values": "",
 		"Chart":  outer.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "Aeneid",
 		},
 	}
@@ -806,7 +807,7 @@ func TestRenderBuiltinValues(t *testing.T) {
 func TestAlterFuncMap_include(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "conrad"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/quote", Data: []byte(`{{include "conrad/templates/_partial" . | indent 2}} dead.`)},
 			{Name: "templates/_partial", Data: []byte(`{{.Release.Name}} - he`)},
 		},
@@ -815,16 +816,16 @@ func TestAlterFuncMap_include(t *testing.T) {
 	// Check nested reference in include FuncMap
 	d := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "nested"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/quote", Data: []byte(`{{include "nested/templates/quote" . | indent 2}} dead.`)},
 			{Name: "templates/_partial", Data: []byte(`{{.Release.Name}} - he`)},
 		},
 	}
 
-	v := chartutil.Values{
+	v := common.Values{
 		"Values": "",
 		"Chart":  c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "Mistah Kurtz",
 		},
 	}
@@ -849,19 +850,19 @@ func TestAlterFuncMap_include(t *testing.T) {
 func TestAlterFuncMap_require(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "conan"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/quote", Data: []byte(`All your base are belong to {{ required "A valid 'who' is required" .Values.who }}`)},
 			{Name: "templates/bases", Data: []byte(`All {{ required "A valid 'bases' is required" .Values.bases }} of them!`)},
 		},
 	}
 
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"who":   "us",
 			"bases": 2,
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "That 90s meme",
 		},
 	}
@@ -882,12 +883,12 @@ func TestAlterFuncMap_require(t *testing.T) {
 
 	// test required without passing in needed values with lint mode on
 	// verifies lint replaces required with an empty string (should not fail)
-	lintValues := chartutil.Values{
-		"Values": chartutil.Values{
+	lintValues := common.Values{
+		"Values": common.Values{
 			"who": "us",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "That 90s meme",
 		},
 	}
@@ -911,17 +912,17 @@ func TestAlterFuncMap_require(t *testing.T) {
 func TestAlterFuncMap_tpl(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplFunction"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/base", Data: []byte(`Evaluate tpl {{tpl "Value: {{ .Values.value}}" .}}`)},
 		},
 	}
 
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"value": "myvalue",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -940,17 +941,17 @@ func TestAlterFuncMap_tpl(t *testing.T) {
 func TestAlterFuncMap_tplfunc(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplFunction"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/base", Data: []byte(`Evaluate tpl {{tpl "Value: {{ .Values.value | quote}}" .}}`)},
 		},
 	}
 
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"value": "myvalue",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -969,17 +970,17 @@ func TestAlterFuncMap_tplfunc(t *testing.T) {
 func TestAlterFuncMap_tplinclude(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplFunction"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/base", Data: []byte(`{{ tpl "{{include ` + "`" + `TplFunction/templates/_partial` + "`" + ` .  | quote }}" .}}`)},
 			{Name: "templates/_partial", Data: []byte(`{{.Template.Name}}`)},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"value": "myvalue",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1000,15 +1001,15 @@ func TestRenderRecursionLimit(t *testing.T) {
 	// endless recursion should produce an error
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "bad"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/base", Data: []byte(`{{include "recursion" . }}`)},
 			{Name: "templates/recursion", Data: []byte(`{{define "recursion"}}{{include "recursion" . }}{{end}}`)},
 		},
 	}
-	v := chartutil.Values{
+	v := common.Values{
 		"Values": "",
 		"Chart":  c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1030,7 +1031,7 @@ func TestRenderRecursionLimit(t *testing.T) {
 
 	d := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "overlook"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/quote", Data: []byte(repeatedIncl)},
 			{Name: "templates/_function", Data: []byte(printFunc)},
 		},
@@ -1054,23 +1055,23 @@ func TestRenderRecursionLimit(t *testing.T) {
 func TestRenderLoadTemplateForTplFromFile(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplLoadFromFile"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/base", Data: []byte(`{{ tpl (.Files.Get .Values.filename) . }}`)},
 			{Name: "templates/_function", Data: []byte(`{{define "test-function"}}test-function{{end}}`)},
 		},
-		Files: []*chart.File{
+		Files: []*common.File{
 			{Name: "test", Data: []byte(`{{ tpl (.Files.Get .Values.filename2) .}}`)},
 			{Name: "test2", Data: []byte(`{{include "test-function" .}}{{define "nested-define"}}nested-define-content{{end}} {{include "nested-define" .}}`)},
 		},
 	}
 
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"filename":  "test",
 			"filename2": "test2",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1089,15 +1090,15 @@ func TestRenderLoadTemplateForTplFromFile(t *testing.T) {
 func TestRenderTplEmpty(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplEmpty"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/empty-string", Data: []byte(`{{tpl "" .}}`)},
 			{Name: "templates/empty-action", Data: []byte(`{{tpl "{{ \"\"}}" .}}`)},
 			{Name: "templates/only-defines", Data: []byte(`{{tpl "{{define \"not-invoked\"}}not-rendered{{end}}" .}}`)},
 		},
 	}
-	v := chartutil.Values{
+	v := common.Values{
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1123,7 +1124,7 @@ func TestRenderTplTemplateNames(t *testing.T) {
 	// .Template.BasePath and .Name make it through
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplTemplateNames"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/default-basepath", Data: []byte(`{{tpl "{{ .Template.BasePath }}" .}}`)},
 			{Name: "templates/default-name", Data: []byte(`{{tpl "{{ .Template.Name }}" .}}`)},
 			{Name: "templates/modified-basepath", Data: []byte(`{{tpl "{{ .Template.BasePath }}" .Values.dot}}`)},
@@ -1131,10 +1132,10 @@ func TestRenderTplTemplateNames(t *testing.T) {
 			{Name: "templates/modified-field", Data: []byte(`{{tpl "{{ .Template.Field }}" .Values.dot}}`)},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{
-			"dot": chartutil.Values{
-				"Template": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
+			"dot": common.Values{
+				"Template": common.Values{
 					"BasePath": "path/to/template",
 					"Name":     "name-of-template",
 					"Field":    "extra-field",
@@ -1142,7 +1143,7 @@ func TestRenderTplTemplateNames(t *testing.T) {
 			},
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1170,7 +1171,7 @@ func TestRenderTplRedefines(t *testing.T) {
 	// Redefining a template inside 'tpl' does not affect the outer definition
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplRedefines"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/_partials", Data: []byte(`{{define "partial"}}original-in-partial{{end}}`)},
 			{Name: "templates/partial", Data: []byte(
 				`before: {{include "partial" .}}\n{{tpl .Values.partialText .}}\nafter: {{include "partial" .}}`,
@@ -1192,8 +1193,8 @@ func TestRenderTplRedefines(t *testing.T) {
 			)},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"partialText":      `{{define "partial"}}redefined-in-tpl{{end}}tpl: {{include "partial" .}}`,
 			"manifestText":     `{{define "manifest"}}redefined-in-tpl{{end}}tpl: {{include "manifest" .}}`,
 			"manifestOnlyText": `tpl: {{include "manifest-only" .}}`,
@@ -1205,7 +1206,7 @@ func TestRenderTplRedefines(t *testing.T) {
 			"innerText": `{{define "nested"}}redefined-in-inner-tpl{{end}}inner-tpl: {{include "nested" .}} {{include "nested-outer" . }}`,
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1236,16 +1237,16 @@ func TestRenderTplMissingKey(t *testing.T) {
 	// Rendering a missing key results in empty/zero output.
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplMissingKey"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/manifest", Data: []byte(
 				`missingValue: {{tpl "{{.Values.noSuchKey}}" .}}`,
 			)},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{},
+	v := common.Values{
+		"Values": common.Values{},
 		"Chart":  c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1269,16 +1270,16 @@ func TestRenderTplMissingKeyString(t *testing.T) {
 	// Rendering a missing key results in error
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "TplMissingKeyStrict"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/manifest", Data: []byte(
 				`missingValue: {{tpl "{{.Values.noSuchKey}}" .}}`,
 			)},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{},
+	v := common.Values{
+		"Values": common.Values{},
 		"Chart":  c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
@@ -1301,7 +1302,7 @@ func TestRenderTplMissingKeyString(t *testing.T) {
 func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "NestedHelperFunctions"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/svc.yaml", Data: []byte(
 				`name: {{ include "nested_helper.name" . }}`,
 			)},
@@ -1324,9 +1325,9 @@ NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:49
   executing "common.names.get_name" at <.Values.nonexistant.key>:
     nil pointer evaluating interface {}.key`
 
-	v := chartutil.Values{}
+	v := common.Values{}
 
-	val, _ := chartutil.CoalesceValues(c, v)
+	val, _ := util.CoalesceValues(c, v)
 	vals := map[string]interface{}{
 		"Values": val.AsMap(),
 	}
@@ -1339,7 +1340,7 @@ NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:49
 func TestMultilineNoTemplateAssociatedError(t *testing.T) {
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "multiline"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{Name: "templates/svc.yaml", Data: []byte(
 				`name: {{ include "nested_helper.name" . }}`,
 			)},
@@ -1357,9 +1358,9 @@ func TestMultilineNoTemplateAssociatedError(t *testing.T) {
     error calling include:
 template: no template "nested_helper.name" associated with template "gotpl"`
 
-	v := chartutil.Values{}
+	v := common.Values{}
 
-	val, _ := chartutil.CoalesceValues(c, v)
+	val, _ := util.CoalesceValues(c, v)
 	vals := map[string]interface{}{
 		"Values": val.AsMap(),
 	}
@@ -1373,7 +1374,7 @@ func TestRenderCustomTemplateFuncs(t *testing.T) {
 	// Create a chart with two templates that use custom functions
 	c := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "CustomFunc"},
-		Templates: []*chart.File{
+		Templates: []*common.File{
 			{
 				Name: "templates/manifest",
 				Data: []byte(`{{exclaim .Values.message}}`),
@@ -1384,12 +1385,12 @@ func TestRenderCustomTemplateFuncs(t *testing.T) {
 			},
 		},
 	}
-	v := chartutil.Values{
-		"Values": chartutil.Values{
+	v := common.Values{
+		"Values": common.Values{
 			"message": "hello",
 		},
 		"Chart": c.Metadata,
-		"Release": chartutil.Values{
+		"Release": common.Values{
 			"Name": "TestRelease",
 		},
 	}
diff --git a/pkg/engine/files.go b/pkg/engine/files.go
index 87166728c..f0a86988e 100644
--- a/pkg/engine/files.go
+++ b/pkg/engine/files.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/gobwas/glob"
 
-	chart "helm.sh/helm/v4/pkg/chart/v2"
+	"helm.sh/helm/v4/pkg/chart/common"
 )
 
 // files is a map of files in a chart that can be accessed from a template.
@@ -31,7 +31,7 @@ type files map[string][]byte
 
 // NewFiles creates a new files from chart files.
 // Given an []*chart.File (the format for files in a chart.Chart), extract a map of files.
-func newFiles(from []*chart.File) files {
+func newFiles(from []*common.File) files {
 	files := make(map[string][]byte)
 	for _, f := range from {
 		files[f.Name] = f.Data
diff --git a/pkg/engine/lookup_func.go b/pkg/engine/lookup_func.go
index 605b43a48..18ed2b63b 100644
--- a/pkg/engine/lookup_func.go
+++ b/pkg/engine/lookup_func.go
@@ -35,7 +35,7 @@ type lookupFunc = func(apiversion string, resource string, namespace string, nam
 // NewLookupFunction returns a function for looking up objects in the cluster.
 //
 // If the resource does not exist, no error is raised.
-func NewLookupFunction(config *rest.Config) lookupFunc {
+func NewLookupFunction(config *rest.Config) lookupFunc { //nolint:revive
 	return newLookupFunction(clientProviderFromConfig{config: config})
 }
 
diff --git a/pkg/release/v1/mock.go b/pkg/release/v1/mock.go
index 3d3b0c2e2..c3a6594cc 100644
--- a/pkg/release/v1/mock.go
+++ b/pkg/release/v1/mock.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"math/rand"
 
+	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/time"
 )
@@ -98,7 +99,7 @@ func Mock(opts *MockReleaseOptions) *Release {
 					},
 				},
 			},
-			Templates: []*chart.File{
+			Templates: []*common.File{
 				{Name: "templates/foo.tpl", Data: []byte(MockManifest)},
 			},
 		}
diff --git a/pkg/release/v1/util/manifest_sorter.go b/pkg/release/v1/util/manifest_sorter.go
index 21fdec7c6..6f7b4ea8b 100644
--- a/pkg/release/v1/util/manifest_sorter.go
+++ b/pkg/release/v1/util/manifest_sorter.go
@@ -26,7 +26,7 @@ import (
 
 	"sigs.k8s.io/yaml"
 
-	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
+	"helm.sh/helm/v4/pkg/chart/common"
 	release "helm.sh/helm/v4/pkg/release/v1"
 )
 
@@ -74,7 +74,7 @@ var events = map[string]release.HookEvent{
 //
 // Files that do not parse into the expected format are simply placed into a map and
 // returned.
-func SortManifests(files map[string]string, _ chartutil.VersionSet, ordering KindSortOrder) ([]*release.Hook, []Manifest, error) {
+func SortManifests(files map[string]string, _ common.VersionSet, ordering KindSortOrder) ([]*release.Hook, []Manifest, error) {
 	result := &result{}
 
 	var sortedFilePaths []string

From a8151ef4fef684992a66956399fded22f7f24502 Mon Sep 17 00:00:00 2001
From: George Jenkins <gvjenkins@gmail.com>
Date: Mon, 25 Aug 2025 11:45:49 -0700
Subject: [PATCH 185/211] Cleanup plugin config

Signed-off-by: George Jenkins <gvjenkins@gmail.com>
---
 internal/plugin/config.go                     | 63 +++++--------------
 internal/plugin/config_test.go                | 56 +++++++++++++++++
 internal/plugin/loader_test.go                |  8 ++-
 internal/plugin/metadata.go                   | 30 +--------
 internal/plugin/plugin_test.go                |  4 +-
 internal/plugin/plugin_type_registry.go       | 10 ++-
 internal/plugin/plugin_type_registry_test.go  |  2 +-
 internal/plugin/runtime_subprocess_test.go    |  2 +-
 internal/plugin/schema/cli.go                 | 19 ++++++
 internal/plugin/schema/doc.go                 | 18 ++++++
 internal/plugin/schema/getter.go              | 21 ++++++-
 internal/plugin/schema/postrenderer.go        |  6 ++
 pkg/cmd/load_plugins.go                       |  4 +-
 pkg/cmd/plugin_list.go                        |  3 +-
 .../helm/plugins/postrenderer-v1/plugin.yaml  |  4 --
 pkg/getter/plugingetter.go                    |  2 +-
 pkg/getter/plugingetter_test.go               |  2 +-
 17 files changed, 161 insertions(+), 93 deletions(-)
 create mode 100644 internal/plugin/config_test.go
 create mode 100644 internal/plugin/schema/doc.go

diff --git a/internal/plugin/config.go b/internal/plugin/config.go
index e8bf4e356..e1f491779 100644
--- a/internal/plugin/config.go
+++ b/internal/plugin/config.go
@@ -16,72 +16,39 @@ limitations under the License.
 package plugin
 
 import (
+	"bytes"
 	"fmt"
+	"reflect"
 
 	"go.yaml.in/yaml/v3"
 )
 
-// Config interface defines the methods that all plugin type configurations must implement
+// Config represents an plugin type specific configuration
+// It is expected to type assert (cast) the a Config to its expected underlying type (schema.ConfigCLIV1, schema.ConfigGetterV1, etc).
 type Config interface {
 	Validate() error
 }
 
-// ConfigCLI represents the configuration for CLI plugins
-type ConfigCLI struct {
-	// Usage is the single-line usage text shown in help
-	// For recommended syntax, see [spf13/cobra.command.Command] Use field comment:
-	// https://pkg.go.dev/github.com/spf13/cobra#Command
-	Usage string `yaml:"usage"`
-	// ShortHelp is the short description shown in the 'helm help' output
-	ShortHelp string `yaml:"shortHelp"`
-	// LongHelp is the long message shown in the 'helm help <this-command>' output
-	LongHelp string `yaml:"longHelp"`
-	// IgnoreFlags ignores any flags passed in from Helm
-	IgnoreFlags bool `yaml:"ignoreFlags"`
-}
-
-// ConfigGetter represents the configuration for download plugins
-type ConfigGetter struct {
-	// Protocols are the list of URL schemes supported by this downloader
-	Protocols []string `yaml:"protocols"`
-}
-
-// ConfigPostrenderer represents the configuration for postrenderer plugins
-// there are no runtime-independent configurations for postrenderer/v1 plugin type
-type ConfigPostrenderer struct{}
-
-func (c *ConfigCLI) Validate() error {
-	// Config validation for CLI plugins
-	return nil
-}
+func unmarshaConfig(pluginType string, configData map[string]any) (Config, error) {
 
-func (c *ConfigGetter) Validate() error {
-	if len(c.Protocols) == 0 {
-		return fmt.Errorf("getter has no protocols")
-	}
-	for i, protocol := range c.Protocols {
-		if protocol == "" {
-			return fmt.Errorf("getter has empty protocol at index %d", i)
-		}
+	pluginTypeMeta, ok := pluginTypesIndex[pluginType]
+	if !ok {
+		return nil, fmt.Errorf("unknown plugin type %q", pluginType)
 	}
-	return nil
-}
 
-func (c *ConfigPostrenderer) Validate() error {
-	// Config validation for postrenderer plugins
-	return nil
-}
+	// TODO: Avoid (yaml) serialization/deserialization for type conversion here
 
-func remarshalConfig[T Config](configData map[string]any) (Config, error) {
 	data, err := yaml.Marshal(configData)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to marshel config data (plugin type %s): %w", pluginType, err)
 	}
 
-	var config T
-	if err := yaml.Unmarshal(data, &config); err != nil {
+	config := reflect.New(pluginTypeMeta.configType)
+	d := yaml.NewDecoder(bytes.NewReader(data))
+	d.KnownFields(true)
+	if err := d.Decode(config.Interface()); err != nil {
 		return nil, err
 	}
 
-	return config, nil
+	return config.Interface().(Config), nil
 }
diff --git a/internal/plugin/config_test.go b/internal/plugin/config_test.go
new file mode 100644
index 000000000..c51b77ff0
--- /dev/null
+++ b/internal/plugin/config_test.go
@@ -0,0 +1,56 @@
+/*
+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 plugin
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
+)
+
+func TestUnmarshaConfig(t *testing.T) {
+	// Test unmarshalling a CLI plugin config
+	{
+		config, err := unmarshaConfig("cli/v1", map[string]any{
+			"usage":       "usage string",
+			"shortHelp":   "short help string",
+			"longHelp":    "long help string",
+			"ignoreFlags": true,
+		})
+		require.NoError(t, err)
+
+		require.IsType(t, &schema.ConfigCLIV1{}, config)
+		assert.Equal(t, schema.ConfigCLIV1{
+			Usage:       "usage string",
+			ShortHelp:   "short help string",
+			LongHelp:    "long help string",
+			IgnoreFlags: true,
+		}, *(config.(*schema.ConfigCLIV1)))
+	}
+
+	// Test unmarshalling invalid config data
+	{
+		config, err := unmarshaConfig("cli/v1", map[string]any{
+			"invalid field": "foo",
+		})
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "field not found")
+		assert.Nil(t, config)
+	}
+}
diff --git a/internal/plugin/loader_test.go b/internal/plugin/loader_test.go
index d214f7b6b..47c214910 100644
--- a/internal/plugin/loader_test.go
+++ b/internal/plugin/loader_test.go
@@ -22,6 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 )
 
 func TestPeekAPIVersion(t *testing.T) {
@@ -73,7 +75,7 @@ func TestLoadDir(t *testing.T) {
 			Version:    "0.1.0",
 			Type:       "cli/v1",
 			Runtime:    "subprocess",
-			Config: &ConfigCLI{
+			Config: &schema.ConfigCLIV1{
 				Usage:       usage,
 				ShortHelp:   "echo hello message",
 				LongHelp:    "description",
@@ -145,7 +147,7 @@ func TestLoadDirGetter(t *testing.T) {
 		Type:       "getter/v1",
 		APIVersion: "v1",
 		Runtime:    "subprocess",
-		Config: &ConfigGetter{
+		Config: &schema.ConfigGetterV1{
 			Protocols: []string{"myprotocol", "myprotocols"},
 		},
 		RuntimeConfig: &RuntimeConfigSubprocess{
@@ -173,7 +175,7 @@ func TestPostRenderer(t *testing.T) {
 		Type:       "postrenderer/v1",
 		APIVersion: "v1",
 		Runtime:    "subprocess",
-		Config:     &ConfigPostrenderer{},
+		Config:     &schema.ConfigPostRendererV1{},
 		RuntimeConfig: &RuntimeConfigSubprocess{
 			PlatformCommand: []PlatformCommand{
 				{
diff --git a/internal/plugin/metadata.go b/internal/plugin/metadata.go
index 1c4f02836..111c0599f 100644
--- a/internal/plugin/metadata.go
+++ b/internal/plugin/metadata.go
@@ -123,11 +123,11 @@ func buildLegacyConfig(m MetadataLegacy, pluginType string) Config {
 		for _, d := range m.Downloaders {
 			protocols = append(protocols, d.Protocols...)
 		}
-		return &ConfigGetter{
+		return &schema.ConfigGetterV1{
 			Protocols: protocols,
 		}
 	case "cli/v1":
-		return &ConfigCLI{
+		return &schema.ConfigCLIV1{
 			Usage:       "",            // Legacy plugins don't have Usage field for command syntax
 			ShortHelp:   m.Usage,       // Map legacy usage to shortHelp
 			LongHelp:    m.Description, // Map legacy description to longHelp
@@ -175,7 +175,7 @@ func buildLegacyRuntimeConfig(m MetadataLegacy) RuntimeConfig {
 
 func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) {
 
-	config, err := convertMetadataConfig(mv1.Type, mv1.Config)
+	config, err := unmarshaConfig(mv1.Type, mv1.Config)
 	if err != nil {
 		return nil, err
 	}
@@ -197,30 +197,6 @@ func fromMetadataV1(mv1 MetadataV1) (*Metadata, error) {
 	}, nil
 }
 
-func convertMetadataConfig(pluginType string, configRaw map[string]any) (Config, error) {
-	var err error
-	var config Config
-
-	switch pluginType {
-	case "test/v1":
-		config, err = remarshalConfig[*schema.ConfigTestV1](configRaw)
-	case "cli/v1":
-		config, err = remarshalConfig[*ConfigCLI](configRaw)
-	case "getter/v1":
-		config, err = remarshalConfig[*ConfigGetter](configRaw)
-	case "postrenderer/v1":
-		config, err = remarshalConfig[*ConfigPostrenderer](configRaw)
-	default:
-		return nil, fmt.Errorf("unsupported plugin type: %s", pluginType)
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to unmarshal config for %s plugin type: %w", pluginType, err)
-	}
-
-	return config, nil
-}
-
 func convertMetdataRuntimeConfig(runtimeType string, runtimeConfigRaw map[string]any) (RuntimeConfig, error) {
 	var runtimeConfig RuntimeConfig
 	var err error
diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go
index a4de8e52a..b6c2245ff 100644
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
@@ -17,6 +17,8 @@ package plugin
 
 import (
 	"testing"
+
+	"helm.sh/helm/v4/internal/plugin/schema"
 )
 
 func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginRuntime {
@@ -46,7 +48,7 @@ func mockSubprocessCLIPlugin(t *testing.T, pluginName string) *SubprocessPluginR
 			Type:       "cli/v1",
 			APIVersion: "v1",
 			Runtime:    "subprocess",
-			Config: &ConfigCLI{
+			Config: &schema.ConfigCLIV1{
 				Usage:       "Mock plugin",
 				ShortHelp:   "Mock plugin",
 				LongHelp:    "Mock plugin for testing",
diff --git a/internal/plugin/plugin_type_registry.go b/internal/plugin/plugin_type_registry.go
index 63450b823..da6546c47 100644
--- a/internal/plugin/plugin_type_registry.go
+++ b/internal/plugin/plugin_type_registry.go
@@ -81,13 +81,19 @@ var pluginTypes = []pluginTypeMeta{
 		pluginType: "cli/v1",
 		inputType:  reflect.TypeOf(schema.InputMessageCLIV1{}),
 		outputType: reflect.TypeOf(schema.OutputMessageCLIV1{}),
-		configType: reflect.TypeOf(ConfigCLI{}),
+		configType: reflect.TypeOf(schema.ConfigCLIV1{}),
 	},
 	{
 		pluginType: "getter/v1",
 		inputType:  reflect.TypeOf(schema.InputMessageGetterV1{}),
 		outputType: reflect.TypeOf(schema.OutputMessageGetterV1{}),
-		configType: reflect.TypeOf(ConfigGetter{}),
+		configType: reflect.TypeOf(schema.ConfigGetterV1{}),
+	},
+	{
+		pluginType: "postrenderer/v1",
+		inputType:  reflect.TypeOf(schema.InputMessagePostRendererV1{}),
+		outputType: reflect.TypeOf(schema.OutputMessagePostRendererV1{}),
+		configType: reflect.TypeOf(schema.ConfigPostRendererV1{}),
 	},
 }
 
diff --git a/internal/plugin/plugin_type_registry_test.go b/internal/plugin/plugin_type_registry_test.go
index ee8a44bb6..22f26262d 100644
--- a/internal/plugin/plugin_type_registry_test.go
+++ b/internal/plugin/plugin_type_registry_test.go
@@ -34,5 +34,5 @@ func TestMakeOutputMessage(t *testing.T) {
 func TestMakeConfig(t *testing.T) {
 	ptm := pluginTypesIndex["getter/v1"]
 	config := reflect.New(ptm.configType).Interface().(Config)
-	assert.IsType(t, &ConfigGetter{}, config)
+	assert.IsType(t, &schema.ConfigGetterV1{}, config)
 }
diff --git a/internal/plugin/runtime_subprocess_test.go b/internal/plugin/runtime_subprocess_test.go
index dab372027..243f4ad7c 100644
--- a/internal/plugin/runtime_subprocess_test.go
+++ b/internal/plugin/runtime_subprocess_test.go
@@ -45,7 +45,7 @@ func mockSubprocessCLIPluginErrorExit(t *testing.T, pluginName string, exitCode
 		Type:       "cli/v1",
 		APIVersion: "v1",
 		Runtime:    "subprocess",
-		Config: &ConfigCLI{
+		Config: &schema.ConfigCLIV1{
 			Usage:       "Mock plugin",
 			ShortHelp:   "Mock plugin",
 			LongHelp:    "Mock plugin for testing",
diff --git a/internal/plugin/schema/cli.go b/internal/plugin/schema/cli.go
index 3976d3737..702b27e45 100644
--- a/internal/plugin/schema/cli.go
+++ b/internal/plugin/schema/cli.go
@@ -27,3 +27,22 @@ type InputMessageCLIV1 struct {
 type OutputMessageCLIV1 struct {
 	Data *bytes.Buffer `json:"data"`
 }
+
+// ConfigCLIV1 represents the configuration for CLI plugins
+type ConfigCLIV1 struct {
+	// Usage is the single-line usage text shown in help
+	// For recommended syntax, see [spf13/cobra.command.Command] Use field comment:
+	// https://pkg.go.dev/github.com/spf13/cobra#Command
+	Usage string `yaml:"usage"`
+	// ShortHelp is the short description shown in the 'helm help' output
+	ShortHelp string `yaml:"shortHelp"`
+	// LongHelp is the long message shown in the 'helm help <this-command>' output
+	LongHelp string `yaml:"longHelp"`
+	// IgnoreFlags ignores any flags passed in from Helm
+	IgnoreFlags bool `yaml:"ignoreFlags"`
+}
+
+func (c *ConfigCLIV1) Validate() error {
+	// Config validation for CLI plugins
+	return nil
+}
diff --git a/internal/plugin/schema/doc.go b/internal/plugin/schema/doc.go
new file mode 100644
index 000000000..4b3fe5d49
--- /dev/null
+++ b/internal/plugin/schema/doc.go
@@ -0,0 +1,18 @@
+/*
+ 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 schema
diff --git a/internal/plugin/schema/getter.go b/internal/plugin/schema/getter.go
index f9840008e..2c5e81df1 100644
--- a/internal/plugin/schema/getter.go
+++ b/internal/plugin/schema/getter.go
@@ -14,10 +14,11 @@
 package schema
 
 import (
+	"fmt"
 	"time"
 )
 
-// TODO: can we generate these plugin input/outputs?
+// TODO: can we generate these plugin input/output messages?
 
 type GetterOptionsV1 struct {
 	URL                   string
@@ -45,3 +46,21 @@ type InputMessageGetterV1 struct {
 type OutputMessageGetterV1 struct {
 	Data []byte `json:"data"`
 }
+
+// ConfigGetterV1 represents the configuration for download plugins
+type ConfigGetterV1 struct {
+	// Protocols are the list of URL schemes supported by this downloader
+	Protocols []string `yaml:"protocols"`
+}
+
+func (c *ConfigGetterV1) Validate() error {
+	if len(c.Protocols) == 0 {
+		return fmt.Errorf("getter has no protocols")
+	}
+	for i, protocol := range c.Protocols {
+		if protocol == "" {
+			return fmt.Errorf("getter has empty protocol at index %d", i)
+		}
+	}
+	return nil
+}
diff --git a/internal/plugin/schema/postrenderer.go b/internal/plugin/schema/postrenderer.go
index 82fd3059f..ef51a8a61 100644
--- a/internal/plugin/schema/postrenderer.go
+++ b/internal/plugin/schema/postrenderer.go
@@ -30,3 +30,9 @@ type InputMessagePostRendererV1 struct {
 type OutputMessagePostRendererV1 struct {
 	Manifests *bytes.Buffer `json:"manifests"`
 }
+
+type ConfigPostRendererV1 struct{}
+
+func (c *ConfigPostRendererV1) Validate() error {
+	return nil
+}
diff --git a/pkg/cmd/load_plugins.go b/pkg/cmd/load_plugins.go
index 75cfdc3cf..c0593f384 100644
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@@ -71,7 +71,7 @@ func loadCLIPlugins(baseCmd *cobra.Command, out io.Writer) {
 	for _, plug := range found {
 		var use, short, long string
 		var ignoreFlags bool
-		if cliConfig, ok := plug.Metadata().Config.(*plugin.ConfigCLI); ok {
+		if cliConfig, ok := plug.Metadata().Config.(*schema.ConfigCLIV1); ok {
 			use = cliConfig.Usage
 			short = cliConfig.ShortHelp
 			long = cliConfig.LongHelp
@@ -340,7 +340,7 @@ func pluginDynamicComp(plug plugin.Plugin, cmd *cobra.Command, args []string, to
 	}
 
 	var ignoreFlags bool
-	if cliConfig, ok := subprocessPlug.Metadata().Config.(*plugin.ConfigCLI); ok {
+	if cliConfig, ok := subprocessPlug.Metadata().Config.(*schema.ConfigCLIV1); ok {
 		ignoreFlags = cliConfig.IgnoreFlags
 	}
 
diff --git a/pkg/cmd/plugin_list.go b/pkg/cmd/plugin_list.go
index 9b2895441..74e969e04 100644
--- a/pkg/cmd/plugin_list.go
+++ b/pkg/cmd/plugin_list.go
@@ -26,6 +26,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/schema"
 )
 
 func newPluginListCmd(out io.Writer) *cobra.Command {
@@ -106,7 +107,7 @@ func compListPlugins(_ string, ignoredPluginNames []string) []string {
 		for _, p := range filteredPlugins {
 			m := p.Metadata()
 			var shortHelp string
-			if config, ok := m.Config.(*plugin.ConfigCLI); ok {
+			if config, ok := m.Config.(*schema.ConfigCLIV1); ok {
 				shortHelp = config.ShortHelp
 			}
 			pNames = append(pNames, fmt.Sprintf("%s\t%s", p.Metadata().Name, shortHelp))
diff --git a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
index d4cd57a13..b6e8afa57 100644
--- a/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
+++ b/pkg/cmd/testdata/helmhome/helm/plugins/postrenderer-v1/plugin.yaml
@@ -4,10 +4,6 @@ name: "postrenderer-v1"
 version: "1.2.3"
 type: postrenderer/v1
 runtime: subprocess
-config:
-  shortHelp: "echo test"
-  longHelp: "This echos test"
-  ignoreFlags: false
 runtimeConfig:
   platformCommand:
   - command: "${HELM_PLUGIN_DIR}/sed-test.sh"
diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go
index b2dfb3e42..32dbc70c9 100644
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@@ -49,7 +49,7 @@ func collectGetterPlugins(settings *cli.EnvSettings) (Providers, error) {
 	}
 	results := make([]Provider, 0, len(plgs))
 	for _, plg := range plgs {
-		if c, ok := plg.Metadata().Config.(*plugin.ConfigGetter); ok {
+		if c, ok := plg.Metadata().Config.(*schema.ConfigGetterV1); ok {
 			results = append(results, Provider{
 				Schemes: c.Protocols,
 				New:     pluginConstructorBuilder(plg),
diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go
index 23cfc80f8..8faaf7329 100644
--- a/pkg/getter/plugingetter_test.go
+++ b/pkg/getter/plugingetter_test.go
@@ -110,7 +110,7 @@ func (t *testPlugin) Metadata() plugin.Metadata {
 		Type:       "cli/v1",
 		APIVersion: "v1",
 		Runtime:    "subprocess",
-		Config:     &plugin.ConfigCLI{},
+		Config:     &schema.ConfigCLIV1{},
 		RuntimeConfig: &plugin.RuntimeConfigSubprocess{
 			PlatformCommand: []plugin.PlatformCommand{
 				{

From 38d1a7376ff77a609874b3263427f711da946e32 Mon Sep 17 00:00:00 2001
From: Kamil Swiechowski <kamil.swiechowski@iprally.com>
Date: Fri, 11 Jul 2025 16:52:58 +0200
Subject: [PATCH 186/211] fix: throw warning when chart version is not semverv2

Signed-off-by: Kamil Swiechowski <kamil.swiechowski@iprally.com>
---
 pkg/chart/v2/lint/lint_test.go                | 13 +++++--
 pkg/chart/v2/lint/rules/chartfile.go          | 11 ++++++
 pkg/chart/v2/lint/rules/chartfile_test.go     | 39 ++++++++++++++++++-
 pkg/chart/v2/metadata.go                      |  2 +-
 ...hart-with-bad-subcharts-with-subcharts.txt |  1 +
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/pkg/chart/v2/lint/lint_test.go b/pkg/chart/v2/lint/lint_test.go
index 3c777e2bb..bd3ec1f1f 100644
--- a/pkg/chart/v2/lint/lint_test.go
+++ b/pkg/chart/v2/lint/lint_test.go
@@ -42,12 +42,12 @@ const invalidChartFileDir = "rules/testdata/invalidchartfile"
 
 func TestBadChart(t *testing.T) {
 	m := RunAll(badChartDir, values, namespace).Messages
-	if len(m) != 8 {
+	if len(m) != 9 {
 		t.Errorf("Number of errors %v", len(m))
 		t.Errorf("All didn't fail with expected errors, got %#v", m)
 	}
-	// There should be one INFO, one WARNING, and 2 ERROR messages, check for them
-	var i, w, e, e2, e3, e4, e5, e6 bool
+	// There should be one INFO, 2 WARNING and 2 ERROR messages, check for them
+	var i, w, w2, e, e2, e3, e4, e5, e6 bool
 	for _, msg := range m {
 		if msg.Severity == support.InfoSev {
 			if strings.Contains(msg.Err.Error(), "icon is recommended") {
@@ -83,8 +83,13 @@ func TestBadChart(t *testing.T) {
 				e6 = true
 			}
 		}
+		if msg.Severity == support.WarningSev {
+			if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVerV2") {
+				w2 = true
+			}
+		}
 	}
-	if !e || !e2 || !e3 || !e4 || !e5 || !i || !e6 || !w {
+	if !e || !e2 || !e3 || !e4 || !e5 || !i || !e6 || !w || !w2 {
 		t.Errorf("Didn't find all the expected errors, got %#v", m)
 	}
 }
diff --git a/pkg/chart/v2/lint/rules/chartfile.go b/pkg/chart/v2/lint/rules/chartfile.go
index 185f524a4..806363477 100644
--- a/pkg/chart/v2/lint/rules/chartfile.go
+++ b/pkg/chart/v2/lint/rules/chartfile.go
@@ -67,6 +67,7 @@ func Chartfile(linter *support.Linter) {
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartIconURL(chartFile))
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartType(chartFile))
 	linter.RunLinterRule(support.ErrorSev, chartFileName, validateChartDependencies(chartFile))
+	linter.RunLinterRule(support.WarningSev, chartFileName, validateChartVersionStrictSemVerV2(chartFile))
 }
 
 func validateChartVersionType(data map[string]interface{}) error {
@@ -158,6 +159,16 @@ func validateChartVersion(cf *chart.Metadata) error {
 	return nil
 }
 
+func validateChartVersionStrictSemVerV2(cf *chart.Metadata) error {
+	_, err := semver.StrictNewVersion(cf.Version)
+
+	if err != nil {
+		return fmt.Errorf("version '%s' is not a valid SemVerV2", cf.Version)
+	}
+
+	return nil
+}
+
 func validateChartMaintainer(cf *chart.Metadata) error {
 	for _, maintainer := range cf.Maintainers {
 		if maintainer == nil {
diff --git a/pkg/chart/v2/lint/rules/chartfile_test.go b/pkg/chart/v2/lint/rules/chartfile_test.go
index 5a1ad2f24..ddaa72510 100644
--- a/pkg/chart/v2/lint/rules/chartfile_test.go
+++ b/pkg/chart/v2/lint/rules/chartfile_test.go
@@ -108,6 +108,35 @@ func TestValidateChartVersion(t *testing.T) {
 	}
 }
 
+func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
+	var failTest = []struct {
+		Version  string
+		ErrorMsg string
+	}{
+		{"", "version '' is not a valid SemVerV2"},
+		{"1", "version '1' is not a valid SemVerV2"},
+		{"1.1", "version '1.1' is not a valid SemVerV2"},
+	}
+
+	var successTest = []string{"1.1.1", "0.0.1+build", "0.0.1-beta"}
+
+	for _, test := range failTest {
+		badChart.Version = test.Version
+		err := validateChartVersionStrictSemVerV2(badChart)
+		if err == nil || !strings.Contains(err.Error(), test.ErrorMsg) {
+			t.Errorf("validateChartVersion(%s) to return \"%s\", got no error", test.Version, test.ErrorMsg)
+		}
+	}
+
+	for _, version := range successTest {
+		badChart.Version = version
+		err := validateChartVersionStrictSemVerV2(badChart)
+		if err != nil {
+			t.Errorf("validateChartVersion(%s) to return no error, got a linter error", version)
+		}
+	}
+}
+
 func TestValidateChartMaintainer(t *testing.T) {
 	var failTest = []struct {
 		Name     string
@@ -226,7 +255,7 @@ func TestChartfile(t *testing.T) {
 		linter := support.Linter{ChartDir: badChartDir}
 		Chartfile(&linter)
 		msgs := linter.Messages
-		expectedNumberOfErrorMessages := 6
+		expectedNumberOfErrorMessages := 7
 
 		if len(msgs) != expectedNumberOfErrorMessages {
 			t.Errorf("Expected %d errors, got %d", expectedNumberOfErrorMessages, len(msgs))
@@ -256,13 +285,16 @@ func TestChartfile(t *testing.T) {
 		if !strings.Contains(msgs[5].Err.Error(), "dependencies are not valid in the Chart file with apiVersion") {
 			t.Errorf("Unexpected message 5: %s", msgs[5].Err)
 		}
+		if !strings.Contains(msgs[6].Err.Error(), "version '0.0.0.0' is not a valid SemVerV2") {
+			t.Errorf("Unexpected message 6: %s", msgs[6].Err)
+		}
 	})
 
 	t.Run("Chart.yaml validity issues due to type mismatch", func(t *testing.T) {
 		linter := support.Linter{ChartDir: anotherBadChartDir}
 		Chartfile(&linter)
 		msgs := linter.Messages
-		expectedNumberOfErrorMessages := 3
+		expectedNumberOfErrorMessages := 4
 
 		if len(msgs) != expectedNumberOfErrorMessages {
 			t.Errorf("Expected %d errors, got %d", expectedNumberOfErrorMessages, len(msgs))
@@ -280,5 +312,8 @@ func TestChartfile(t *testing.T) {
 		if !strings.Contains(msgs[2].Err.Error(), "appVersion should be of type string") {
 			t.Errorf("Unexpected message 2: %s", msgs[2].Err)
 		}
+		if !strings.Contains(msgs[3].Err.Error(), "version '7.2445e+06' is not a valid SemVerV2") {
+			t.Errorf("Unexpected message 3: %s", msgs[3].Err)
+		}
 	})
 }
diff --git a/pkg/chart/v2/metadata.go b/pkg/chart/v2/metadata.go
index d213a3491..c46007863 100644
--- a/pkg/chart/v2/metadata.go
+++ b/pkg/chart/v2/metadata.go
@@ -52,7 +52,7 @@ type Metadata struct {
 	Home string `json:"home,omitempty"`
 	// Source is the URL to the source code of this chart
 	Sources []string `json:"sources,omitempty"`
-	// A SemVer 2 conformant version string of the chart. Required.
+	// A version string of the chart. Required.
 	Version string `json:"version,omitempty"`
 	// A one-sentence description of the chart
 	Description string `json:"description,omitempty"`
diff --git a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
index 7b445a69a..67ed58ec3 100644
--- a/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
+++ b/pkg/cmd/testdata/output/lint-chart-with-bad-subcharts-with-subcharts.txt
@@ -9,6 +9,7 @@
 [ERROR] Chart.yaml: apiVersion is required. The value must be either "v1" or "v2"
 [ERROR] Chart.yaml: version is required
 [INFO] Chart.yaml: icon is recommended
+[WARNING] Chart.yaml: version '' is not a valid SemVerV2
 [WARNING] templates/: directory does not exist
 [ERROR] : unable to load chart
 	validation: chart.metadata.name is required

From cd76ae1c934aeaa22842ef30c898e5888022973b Mon Sep 17 00:00:00 2001
From: Kamil Swiechowski <kamil.swiechowski@iprally.com>
Date: Wed, 3 Sep 2025 08:20:52 +0200
Subject: [PATCH 187/211] feat:strict compliance with semverv2 for
 chart/v3/linter

Signed-off-by: Kamil Swiechowski <kamil.swiechowski@iprally.com>
---
 internal/chart/v3/lint/lint_test.go            | 2 +-
 internal/chart/v3/lint/rules/chartfile.go      | 4 ++--
 internal/chart/v3/lint/rules/chartfile_test.go | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/internal/chart/v3/lint/lint_test.go b/internal/chart/v3/lint/lint_test.go
index af44cc58d..6f5912ae7 100644
--- a/internal/chart/v3/lint/lint_test.go
+++ b/internal/chart/v3/lint/lint_test.go
@@ -60,7 +60,7 @@ func TestBadChartV3(t *testing.T) {
 			}
 		}
 		if msg.Severity == support.ErrorSev {
-			if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVer") {
+			if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVerV2") {
 				e = true
 			}
 			if strings.Contains(msg.Err.Error(), "name is required") {
diff --git a/internal/chart/v3/lint/rules/chartfile.go b/internal/chart/v3/lint/rules/chartfile.go
index e72a0d3b2..fc246ba80 100644
--- a/internal/chart/v3/lint/rules/chartfile.go
+++ b/internal/chart/v3/lint/rules/chartfile.go
@@ -140,9 +140,9 @@ func validateChartVersion(cf *chart.Metadata) error {
 		return errors.New("version is required")
 	}
 
-	version, err := semver.NewVersion(cf.Version)
+	version, err := semver.StrictNewVersion(cf.Version)
 	if err != nil {
-		return fmt.Errorf("version '%s' is not a valid SemVer", cf.Version)
+		return fmt.Errorf("version '%s' is not a valid SemVerV2", cf.Version)
 	}
 
 	c, err := semver.NewConstraint(">0.0.0-0")
diff --git a/internal/chart/v3/lint/rules/chartfile_test.go b/internal/chart/v3/lint/rules/chartfile_test.go
index 070cc244d..57893e151 100644
--- a/internal/chart/v3/lint/rules/chartfile_test.go
+++ b/internal/chart/v3/lint/rules/chartfile_test.go
@@ -84,9 +84,11 @@ func TestValidateChartVersion(t *testing.T) {
 		ErrorMsg string
 	}{
 		{"", "version is required"},
-		{"1.2.3.4", "version '1.2.3.4' is not a valid SemVer"},
-		{"waps", "'waps' is not a valid SemVer"},
-		{"-3", "'-3' is not a valid SemVer"},
+		{"1.2.3.4", "version '1.2.3.4' is not a valid SemVerV2"},
+		{"waps", "'waps' is not a valid SemVerV2"},
+		{"-3", "'-3' is not a valid SemVerV2"},
+		{"1.1", "'1.1' is not a valid SemVerV2"},
+		{"1", "'1' is not a valid SemVerV2"},
 	}
 
 	var successTest = []string{"0.0.1", "0.0.1+build", "0.0.1-beta"}

From 031050675baae8bcf183cdb615d154f909db614b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Sep 2025 16:54:43 +0000
Subject: [PATCH 188/211] chore(deps): bump github.com/spf13/cobra from 1.9.1
 to 1.10.1

Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.9.1 to 1.10.1.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](https://github.com/spf13/cobra/compare/v1.9.1...v1.10.1)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-version: 1.10.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 4 ++--
 go.sum | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index ab8797e6f..bbd273413 100644
--- a/go.mod
+++ b/go.mod
@@ -30,8 +30,8 @@ require (
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
-	github.com/spf13/cobra v1.9.1
-	github.com/spf13/pflag v1.0.7
+	github.com/spf13/cobra v1.10.1
+	github.com/spf13/pflag v1.0.9
 	github.com/stretchr/testify v1.11.1
 	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
diff --git a/go.sum b/go.sum
index 076b6e5bd..cca32e249 100644
--- a/go.sum
+++ b/go.sum
@@ -300,11 +300,10 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
 github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
-github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=

From 5445b6587b4af85be52e7c92ab3bcfb82cd7652f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:04:14 +0000
Subject: [PATCH 189/211] chore(deps): bump github.com/spf13/pflag from 1.0.7
 to 1.0.10

Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.7 to 1.0.10.
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](https://github.com/spf13/pflag/compare/v1.0.7...v1.0.10)

---
updated-dependencies:
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index bbd273413..ca6101583 100644
--- a/go.mod
+++ b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/rubenv/sql-migrate v1.8.0
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
 	github.com/spf13/cobra v1.10.1
-	github.com/spf13/pflag v1.0.9
+	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
diff --git a/go.sum b/go.sum
index cca32e249..471125d6f 100644
--- a/go.sum
+++ b/go.sum
@@ -302,8 +302,9 @@ github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w=
 github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
 github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
-github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=

From 3e97f216cc19bd26ad970a5298d6802ac5fa2ccb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 21:06:24 +0000
Subject: [PATCH 190/211] chore(deps): bump actions/stale from 9.1.0 to 10.0.0

Bumps [actions/stale](https://github.com/actions/stale) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/5bef64f19d7facfb25b37b414482c7164d639639...3a9db7e6a41a89f618792c92c0e97cc736e1b13f)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-version: 10.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/stale.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 3417e1734..965410793 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+    - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'

From a645dfb7f8d1315b500535c1e0fa2b703f097c67 Mon Sep 17 00:00:00 2001
From: Kamil Swiechowski <kamil.swiechowski@iprally.com>
Date: Fri, 5 Sep 2025 13:10:31 +0200
Subject: [PATCH 191/211] fix:semverv2 lint test error message

Signed-off-by: Kamil Swiechowski <kamil.swiechowski@iprally.com>
---
 pkg/chart/v2/lint/rules/chartfile_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/chart/v2/lint/rules/chartfile_test.go b/pkg/chart/v2/lint/rules/chartfile_test.go
index ddaa72510..692358426 100644
--- a/pkg/chart/v2/lint/rules/chartfile_test.go
+++ b/pkg/chart/v2/lint/rules/chartfile_test.go
@@ -124,7 +124,7 @@ func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
 		badChart.Version = test.Version
 		err := validateChartVersionStrictSemVerV2(badChart)
 		if err == nil || !strings.Contains(err.Error(), test.ErrorMsg) {
-			t.Errorf("validateChartVersion(%s) to return \"%s\", got no error", test.Version, test.ErrorMsg)
+			t.Errorf("validateChartVersionStrictSemVerV2(%s) to return \"%s\", got no error", test.Version, test.ErrorMsg)
 		}
 	}
 
@@ -132,7 +132,7 @@ func TestValidateChartVersionStrictSemVerV2(t *testing.T) {
 		badChart.Version = version
 		err := validateChartVersionStrictSemVerV2(badChart)
 		if err != nil {
-			t.Errorf("validateChartVersion(%s) to return no error, got a linter error", version)
+			t.Errorf("validateChartVersionStrictSemVerV2(%s) to return no error, got a linter error", version)
 		}
 	}
 }

From b060911075950273c8d42c005dd5928d905c0ab0 Mon Sep 17 00:00:00 2001
From: Jesse Simpson <jesse.simpson36@gmail.com>
Date: Sat, 6 Sep 2025 11:36:39 -0400
Subject: [PATCH 192/211] refactor: break out into functions and draft tests

Signed-off-by: Jesse Simpson <jesse.simpson36@gmail.com>
---
 pkg/engine/engine.go      | 61 +++++++++++++++++++++++++++++----------
 pkg/engine/engine_test.go | 47 ++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 15 deletions(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index b42fa3219..a5532f73a 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -360,12 +360,56 @@ func parseTemplateExecErrorString(s string) (TraceableError, bool) {
 
 	// Special case: "template: no template %q associated with template %q"
 	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191
-	if strings.HasPrefix(remainder, "no template ") {
-		return TraceableError{message: s}, true
+	traceableError, done := parseTemplateNoTemplateError(s, remainder)
+	if done {
+		return traceableError, done
 	}
 
 	// Executing form: "<templateName>: executing \"<funcName>\" at <<location>>: <errMsg>[ template:...]"
 	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
+	traceableError, done = parseTemplateExecutingAtErrorType(remainder)
+	if done {
+		return traceableError, done
+	}
+
+	// Simple form: "<templateName>: <errMsg>"
+	// Use LastIndex to avoid splitting colons within line:col info.
+	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
+	traceableError, done = parseTemplateSimpleErrorString(remainder)
+	if done {
+		return traceableError, done
+	}
+
+	return TraceableError{}, false
+}
+
+// Special case: "template: no template %q associated with template %q"
+// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191
+func parseTemplateNoTemplateError(s string, remainder string) (TraceableError, bool) {
+	if strings.HasPrefix(remainder, "no template ") {
+		return TraceableError{message: s}, true
+	}
+	return TraceableError{}, false
+}
+
+// Simple form: "<templateName>: <errMsg>"
+// Use LastIndex to avoid splitting colons within line:col info.
+// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
+func parseTemplateSimpleErrorString(remainder string) (TraceableError, bool) {
+	if sep := strings.LastIndex(remainder, ": "); sep != -1 {
+		templateName := remainder[:sep]
+		errMsg := remainder[sep+2:]
+		if cut := strings.Index(errMsg, " template:"); cut != -1 {
+			errMsg = errMsg[:cut]
+		}
+		return TraceableError{location: templateName, message: errMsg}, true
+	}
+	return TraceableError{}, false
+}
+
+// Executing form: "<templateName>: executing \"<funcName>\" at <<location>>: <errMsg>[ template:...]"
+// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
+func parseTemplateExecutingAtErrorType(remainder string) (TraceableError, bool) {
 	if idx := strings.Index(remainder, ": executing "); idx != -1 {
 		templateName := remainder[:idx]
 		after := remainder[idx+len(": executing "):]
@@ -404,19 +448,6 @@ func parseTemplateExecErrorString(s string) (TraceableError, bool) {
 			executedFunction: "executing \"" + functionName + "\" at <" + locationName + ">:",
 		}, true
 	}
-
-	// Simple form: "<templateName>: <errMsg>"
-	// Use LastIndex to avoid splitting colons within line:col info.
-	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
-	if sep := strings.LastIndex(remainder, ": "); sep != -1 {
-		templateName := remainder[:sep]
-		errMsg := remainder[sep+2:]
-		if cut := strings.Index(errMsg, " template:"); cut != -1 {
-			errMsg = errMsg[:cut]
-		}
-		return TraceableError{location: templateName, message: errMsg}, true
-	}
-
 	return TraceableError{}, false
 }
 
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index f4228fbd7..3362fa37e 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -1428,3 +1428,50 @@ func TestRenderCustomTemplateFuncs(t *testing.T) {
 		t.Errorf("Expected %q, got %q", expected, rendered)
 	}
 }
+
+func TestTraceableError_SimpleForm(t *testing.T) {
+	testStrings := []string{
+		"function_not_found/templates/secret.yaml: error calling include",
+	}
+	for _, errString := range testStrings {
+		trace, done := parseTemplateSimpleErrorString(errString)
+		if !done {
+			t.Errorf("Expected parse to pass but did not")
+		}
+		if trace.message != "error calling include" {
+			t.Errorf("Expected %q, got %q", errString, trace.message)
+		}
+	}
+}
+func TestTraceableError_ExecutingForm(t *testing.T) {
+	testStrings := [][]string{
+		{"template: executing \"function_not_found/templates/secret.yaml\" at <include \"name\" .>: ", "function_not_found/templates/secret.yaml"},
+		{"template: executing \"name\" at <include \"common.names.get_name\" .>: ", "name"},
+	}
+	for _, errTuple := range testStrings {
+		errString := errTuple[0]
+		expectedLocation := errTuple[1]
+		trace, done := parseTemplateExecutingAtErrorType(errString)
+		if !done {
+			t.Errorf("Expected parse to pass but did not")
+		}
+		if trace.location != expectedLocation {
+			t.Errorf("Expected %q, got %q", expectedLocation, trace.location)
+		}
+	}
+}
+
+func TestTraceableError_NoTemplateForm(t *testing.T) {
+	testStrings := []string{
+		"no template \"common.names.get_name\" associated with template \"gotpl\"",
+	}
+	for _, errString := range testStrings {
+		trace, done := parseTemplateNoTemplateError(errString, "")
+		if !done {
+			t.Errorf("Expected parse to pass but did not")
+		}
+		if trace.message != errString {
+			t.Errorf("Expected %q, got %q", errString, trace.message)
+		}
+	}
+}

From 712cde46246588beb1fdf2e2119e4faf27a612e4 Mon Sep 17 00:00:00 2001
From: Jesse Simpson <jesse.simpson36@gmail.com>
Date: Sun, 7 Sep 2025 10:42:24 -0400
Subject: [PATCH 193/211] test: passes now

Signed-off-by: Jesse Simpson <jesse.simpson36@gmail.com>
---
 pkg/engine/engine_test.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index 3362fa37e..8dd8f18fe 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -1445,8 +1445,8 @@ func TestTraceableError_SimpleForm(t *testing.T) {
 }
 func TestTraceableError_ExecutingForm(t *testing.T) {
 	testStrings := [][]string{
-		{"template: executing \"function_not_found/templates/secret.yaml\" at <include \"name\" .>: ", "function_not_found/templates/secret.yaml"},
-		{"template: executing \"name\" at <include \"common.names.get_name\" .>: ", "name"},
+		{"function_not_found/templates/secret.yaml:6:11: executing \"function_not_found/templates/secret.yaml\" at <include \"name\" .>: ", "function_not_found/templates/secret.yaml:6:11"},
+		{"divide_by_zero/templates/secret.yaml:6:11: executing \"divide_by_zero/templates/secret.yaml\" at <include \"division\" .>: ", "divide_by_zero/templates/secret.yaml:6:11"},
 	}
 	for _, errTuple := range testStrings {
 		errString := errTuple[0]
@@ -1466,7 +1466,7 @@ func TestTraceableError_NoTemplateForm(t *testing.T) {
 		"no template \"common.names.get_name\" associated with template \"gotpl\"",
 	}
 	for _, errString := range testStrings {
-		trace, done := parseTemplateNoTemplateError(errString, "")
+		trace, done := parseTemplateNoTemplateError(errString, errString)
 		if !done {
 			t.Errorf("Expected parse to pass but did not")
 		}

From 1904ef6ad87c43cb0190ec45e3cf1cd03c7bdea8 Mon Sep 17 00:00:00 2001
From: Stephanie Hohenberg <stephanie.hohenberg@gmail.com>
Date: Sun, 7 Sep 2025 11:01:16 -0400
Subject: [PATCH 194/211] Adapt test-coverage command to be able to run for a
 certain package

Signed-off-by: Stephanie Hohenberg <stephanie.hohenberg@gmail.com>
---
 Makefile            | 9 +++------
 scripts/coverage.sh | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 5e1bfc6c2..e3e6cb538 100644
--- a/Makefile
+++ b/Makefile
@@ -118,11 +118,12 @@ test-unit:
 	go test $(GOFLAGS) -run ^TestHelmCreateChart_CheckDeprecatedWarnings$$ ./internal/chart/v3/lint/ $(TESTFLAGS) -ldflags '$(LDFLAGS)'
 
 
+# To run the coverage for a specific package use: make test-coverage PKG=./pkg/action
 .PHONY: test-coverage
 test-coverage:
 	@echo
-	@echo "==> Running unit tests with coverage <=="
-	@ ./scripts/coverage.sh
+	@echo "==> Running unit tests with coverage: $(PKG) <=="
+	@ ./scripts/coverage.sh $(PKG)
 
 .PHONY: test-style
 test-style:
@@ -148,10 +149,6 @@ test-acceptance: build build-cross
 test-acceptance-completion: ACCEPTANCE_RUN_TESTS = shells.robot
 test-acceptance-completion: test-acceptance
 
-.PHONY: coverage
-coverage:
-	@scripts/coverage.sh
-
 .PHONY: format
 format: $(GOIMPORTS)
 	go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm
diff --git a/scripts/coverage.sh b/scripts/coverage.sh
index 2164d94da..487d4eeee 100755
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -19,9 +19,10 @@ set -euo pipefail
 covermode=${COVERMODE:-atomic}
 coverdir=$(mktemp -d /tmp/coverage.XXXXXXXXXX)
 profile="${coverdir}/cover.out"
+target="${1:-./...}" # by default the whole repository is tested
 
 generate_cover_data() {
-  for d in $(go list ./...) ; do
+  for d in $(go list "$target"); do
     (
       local output="${coverdir}/${d//\//-}.cover"
       go test -coverprofile="${output}" -covermode="$covermode" "$d"

From e19d9fb6eec19f09e8fecb548b4674195221f3db Mon Sep 17 00:00:00 2001
From: Stephanie Hohenberg <stephanie.hohenberg@gmail.com>
Date: Sun, 7 Sep 2025 10:50:02 -0400
Subject: [PATCH 195/211] Refactor unreachableKubeClient for testing into
 failingKubeClient

Signed-off-by: Stephanie Hohenberg <stephanie.hohenberg@gmail.com>
---
 pkg/action/get_metadata_test.go                 | 15 +++------------
 pkg/action/get_values_test.go                   |  7 ++++---
 pkg/action/install_test.go                      | 16 ++++++++++++++++
 pkg/action/list_test.go                         | 16 ++++++++++++++++
 pkg/action/uninstall_test.go                    | 16 ++++++++++++++++
 pkg/action/upgrade_test.go                      | 17 +++++++++++++++++
 .../fake/{fake.go => failing_kube_client.go}    |  8 ++++++++
 7 files changed, 80 insertions(+), 15 deletions(-)
 rename pkg/kube/fake/{fake.go => failing_kube_client.go} (96%)

diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index 6ceb34951..ca612fed7 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -31,15 +31,6 @@ import (
 	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
-// unreachableKubeClient is a test client that always returns an error for IsReachable
-type unreachableKubeClient struct {
-	kubefake.PrintingKubeClient
-}
-
-func (u *unreachableKubeClient) IsReachable() error {
-	return errors.New("connection refused")
-}
-
 func TestNewGetMetadata(t *testing.T) {
 	cfg := actionConfigFixture(t)
 	client := NewGetMetadata(cfg)
@@ -424,9 +415,9 @@ func TestGetMetadata_Run_DifferentStatuses(t *testing.T) {
 
 func TestGetMetadata_Run_UnreachableKubeClient(t *testing.T) {
 	cfg := actionConfigFixture(t)
-	cfg.KubeClient = &unreachableKubeClient{
-		PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard},
-	}
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	cfg.KubeClient = &failingKubeClient
 
 	client := NewGetMetadata(cfg)
 
diff --git a/pkg/action/get_values_test.go b/pkg/action/get_values_test.go
index ec785b5c7..b8630c322 100644
--- a/pkg/action/get_values_test.go
+++ b/pkg/action/get_values_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package action
 
 import (
+	"errors"
 	"io"
 	"testing"
 
@@ -168,9 +169,9 @@ func TestGetValues_Run_EmptyValues(t *testing.T) {
 
 func TestGetValues_Run_UnreachableKubeClient(t *testing.T) {
 	cfg := actionConfigFixture(t)
-	cfg.KubeClient = &unreachableKubeClient{
-		PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard},
-	}
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	cfg.KubeClient = &failingKubeClient
 
 	client := NewGetValues(cfg)
 
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index 92bb64b4d..4c4890ec9 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -997,3 +997,19 @@ func TestUrlEqual(t *testing.T) {
 		})
 	}
 }
+
+func TestInstallRun_UnreachableKubeClient(t *testing.T) {
+	config := actionConfigFixture(t)
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	config.KubeClient = &failingKubeClient
+
+	instAction := NewInstall(config)
+	instAction.ClientOnly = false
+	ctx, done := context.WithCancel(t.Context())
+	res, err := instAction.RunWithContext(ctx, nil, nil)
+
+	done()
+	assert.Nil(t, res)
+	assert.ErrorContains(t, err, "connection refused")
+}
diff --git a/pkg/action/list_test.go b/pkg/action/list_test.go
index b6f89fa1e..75737d635 100644
--- a/pkg/action/list_test.go
+++ b/pkg/action/list_test.go
@@ -17,10 +17,13 @@ limitations under the License.
 package action
 
 import (
+	"errors"
+	"io"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
+	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
 	"helm.sh/helm/v4/pkg/storage"
 )
@@ -367,3 +370,16 @@ func TestSelectorList(t *testing.T) {
 		assert.ElementsMatch(t, expectedFilteredList, res)
 	})
 }
+
+func TestListRun_UnreachableKubeClient(t *testing.T) {
+	config := actionConfigFixture(t)
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	config.KubeClient = &failingKubeClient
+
+	lister := NewList(config)
+	result, err := lister.Run()
+
+	assert.Nil(t, result)
+	assert.ErrorContains(t, err, "connection refused")
+}
diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go
index f7c9e5f44..7c7344383 100644
--- a/pkg/action/uninstall_test.go
+++ b/pkg/action/uninstall_test.go
@@ -17,7 +17,9 @@ limitations under the License.
 package action
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -151,3 +153,17 @@ func TestUninstallRelease_Cascade(t *testing.T) {
 	require.Error(t, err)
 	is.Contains(err.Error(), "failed to delete release: come-fail-away")
 }
+
+func TestUninstallRun_UnreachableKubeClient(t *testing.T) {
+	t.Helper()
+	config := actionConfigFixture(t)
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	config.KubeClient = &failingKubeClient
+
+	client := NewUninstall(config)
+	result, err := client.Run("")
+
+	assert.Nil(t, result)
+	assert.ErrorContains(t, err, "connection refused")
+}
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index 7e27ef594..d31804b87 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -18,7 +18,9 @@ package action
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"reflect"
 	"testing"
 	"time"
@@ -690,3 +692,18 @@ func TestGetUpgradeServerSideValue(t *testing.T) {
 	}
 
 }
+
+func TestUpgradeRun_UnreachableKubeClient(t *testing.T) {
+	t.Helper()
+	config := actionConfigFixture(t)
+	failingKubeClient := kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}, DummyResources: nil}
+	failingKubeClient.ConnectionError = errors.New("connection refused")
+	config.KubeClient = &failingKubeClient
+
+	client := NewUpgrade(config)
+	vals := map[string]interface{}{}
+	result, err := client.Run("", buildChart(), vals)
+
+	assert.Nil(t, result)
+	assert.ErrorContains(t, err, "connection refused")
+}
diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/failing_kube_client.go
similarity index 96%
rename from pkg/kube/fake/fake.go
rename to pkg/kube/fake/failing_kube_client.go
index 588bba83d..154419ebf 100644
--- a/pkg/kube/fake/fake.go
+++ b/pkg/kube/fake/failing_kube_client.go
@@ -40,6 +40,7 @@ type FailingKubeClient struct {
 	UpdateError                error
 	BuildError                 error
 	BuildTableError            error
+	ConnectionError            error
 	BuildDummy                 bool
 	DummyResources             kube.ResourceList
 	BuildUnstructuredError     error
@@ -166,6 +167,13 @@ func (f *FailingKubeClient) GetWaiter(ws kube.WaitStrategy) (kube.Waiter, error)
 	}, nil
 }
 
+func (f *FailingKubeClient) IsReachable() error {
+	if f.ConnectionError != nil {
+		return f.ConnectionError
+	}
+	return f.PrintingKubeClient.IsReachable()
+}
+
 func createDummyResourceList() kube.ResourceList {
 	var resInfo resource.Info
 	resInfo.Name = "dummyName"

From fae2736d1b56377aa9cde8f30fc1ed13a141f728 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 21:27:19 +0000
Subject: [PATCH 196/211] chore(deps): bump golang.org/x/term from 0.34.0 to
 0.35.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.34.0 to 0.35.0.
- [Commits](https://github.com/golang/term/compare/v0.34.0...v0.35.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-version: 0.35.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index bbd273413..5852cf251 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
 	golang.org/x/crypto v0.41.0
-	golang.org/x/term v0.34.0
+	golang.org/x/term v0.35.0
 	golang.org/x/text v0.28.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.34.0
@@ -164,7 +164,7 @@ require (
 	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.35.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
diff --git a/go.sum b/go.sum
index cca32e249..c8bdfc7b8 100644
--- a/go.sum
+++ b/go.sum
@@ -449,8 +449,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -458,8 +458,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
-golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
+golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

From 86c19fdc2a8daf3e4fe5a3748a590f9568598560 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 21:29:27 +0000
Subject: [PATCH 197/211] chore(deps): bump sigs.k8s.io/controller-runtime from
 0.22.0 to 0.22.1

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.22.0 to 0.22.1.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.22.0...v0.22.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.22.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index bbd273413..a666b19a3 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.34.0
 	oras.land/oras-go/v2 v2.6.0
-	sigs.k8s.io/controller-runtime v0.22.0
+	sigs.k8s.io/controller-runtime v0.22.1
 	sigs.k8s.io/kustomize/kyaml v0.20.1
 	sigs.k8s.io/yaml v1.6.0
 )
diff --git a/go.sum b/go.sum
index cca32e249..25abf860c 100644
--- a/go.sum
+++ b/go.sum
@@ -531,8 +531,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
 oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
-sigs.k8s.io/controller-runtime v0.22.0 h1:mTOfibb8Hxwpx3xEkR56i7xSjB+nH4hZG37SrlCY5e0=
-sigs.k8s.io/controller-runtime v0.22.0/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
+sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
+sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=

From b539309aa226e92194d6c63533e682524b31b51b Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Tue, 9 Sep 2025 12:52:31 -0600
Subject: [PATCH 198/211] fix: idea gitignore entry

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7ea0717ed..0fd2c6bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.swp
 .DS_Store
 .coverage/
-.idea/
+.idea
 .vimrc
 .vscode/
 .devcontainer/

From 62cd5d8ba8ece180a75cf8abab3877398efec36c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Sep 2025 21:14:00 +0000
Subject: [PATCH 199/211] chore(deps): bump golang.org/x/crypto from 0.41.0 to
 0.42.0

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.41.0 to 0.42.0.
- [Commits](https://github.com/golang/crypto/compare/v0.41.0...v0.42.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 12 ++++++------
 go.sum | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index 735bd66bd..6b11a9902 100644
--- a/go.mod
+++ b/go.mod
@@ -35,9 +35,9 @@ require (
 	github.com/stretchr/testify v1.11.1
 	github.com/tetratelabs/wazero v1.9.0
 	go.yaml.in/yaml/v3 v3.0.4
-	golang.org/x/crypto v0.41.0
+	golang.org/x/crypto v0.42.0
 	golang.org/x/term v0.35.0
-	golang.org/x/text v0.28.0
+	golang.org/x/text v0.29.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.34.0
 	k8s.io/apiextensions-apiserver v0.34.0
@@ -160,13 +160,13 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	golang.org/x/mod v0.26.0 // indirect
-	golang.org/x/net v0.42.0 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.35.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/grpc v1.72.1 // indirect
diff --git a/go.sum b/go.sum
index 6bd7906f4..0039f5769 100644
--- a/go.sum
+++ b/go.sum
@@ -391,16 +391,16 @@ 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.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
+golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
 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=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -414,8 +414,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -428,8 +428,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -467,8 +467,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -479,8 +479,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 072e2a689ad8ed72258f851e23c5d987f7979ffe Mon Sep 17 00:00:00 2001
From: Benoit Tigeot <benoit.tigeot@lifen.fr>
Date: Wed, 10 Sep 2025 15:19:17 +0200
Subject: [PATCH 200/211] Extend --skip-schema-validation for lint command

When --skip-schema-validation is enabled, the lint command will now skip
JSON schema validation for values.yaml files, allowing charts with schema
validation errors to pass linting when the flag is used.

This addresses the gap where --skip-schema-validation only applied to
templates but not to values files, providing complete schema validation
bypass when needed.

Fixes: #13413

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
---
 internal/chart/v3/lint/lint.go              |  2 +-
 internal/chart/v3/lint/rules/values.go      | 13 +++++++----
 internal/chart/v3/lint/rules/values_test.go | 24 ++++++++++++++++-----
 pkg/chart/v2/lint/lint.go                   |  2 +-
 pkg/chart/v2/lint/rules/values.go           | 13 +++++++----
 pkg/chart/v2/lint/rules/values_test.go      | 24 ++++++++++++++++-----
 6 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/internal/chart/v3/lint/lint.go b/internal/chart/v3/lint/lint.go
index 231bb6803..0cd949065 100644
--- a/internal/chart/v3/lint/lint.go
+++ b/internal/chart/v3/lint/lint.go
@@ -57,7 +57,7 @@ func RunAll(baseDir string, values map[string]interface{}, namespace string, opt
 	}
 
 	rules.Chartfile(&result)
-	rules.ValuesWithOverrides(&result, values)
+	rules.ValuesWithOverrides(&result, values, lo.SkipSchemaValidation)
 	rules.TemplatesWithSkipSchemaValidation(&result, values, namespace, lo.KubeVersion, lo.SkipSchemaValidation)
 	rules.Dependencies(&result)
 	rules.Crds(&result)
diff --git a/internal/chart/v3/lint/rules/values.go b/internal/chart/v3/lint/rules/values.go
index adf2e2c52..0af9765dd 100644
--- a/internal/chart/v3/lint/rules/values.go
+++ b/internal/chart/v3/lint/rules/values.go
@@ -32,7 +32,7 @@ import (
 // they are only tested for well-formedness.
 //
 // If additional values are supplied, they are coalesced into the values in values.yaml.
-func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]interface{}) {
+func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]interface{}, skipSchemaValidation bool) {
 	file := "values.yaml"
 	vf := filepath.Join(linter.ChartDir, file)
 	fileExists := linter.RunLinterRule(support.InfoSev, file, validateValuesFileExistence(vf))
@@ -41,7 +41,7 @@ func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]inter
 		return
 	}
 
-	linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf, valueOverrides))
+	linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf, valueOverrides, skipSchemaValidation))
 }
 
 func validateValuesFileExistence(valuesPath string) error {
@@ -52,7 +52,7 @@ func validateValuesFileExistence(valuesPath string) error {
 	return nil
 }
 
-func validateValuesFile(valuesPath string, overrides map[string]interface{}) error {
+func validateValuesFile(valuesPath string, overrides map[string]interface{}, skipSchemaValidation bool) error {
 	values, err := common.ReadValuesFile(valuesPath)
 	if err != nil {
 		return fmt.Errorf("unable to parse YAML: %w", err)
@@ -75,5 +75,10 @@ func validateValuesFile(valuesPath string, overrides map[string]interface{}) err
 	if err != nil {
 		return err
 	}
-	return util.ValidateAgainstSingleSchema(coalescedValues, schema)
+
+	if !skipSchemaValidation {
+		return util.ValidateAgainstSingleSchema(coalescedValues, schema)
+	}
+
+	return nil
 }
diff --git a/internal/chart/v3/lint/rules/values_test.go b/internal/chart/v3/lint/rules/values_test.go
index 348695785..288b77436 100644
--- a/internal/chart/v3/lint/rules/values_test.go
+++ b/internal/chart/v3/lint/rules/values_test.go
@@ -67,7 +67,7 @@ func TestValidateValuesFileWellFormed(t *testing.T) {
 	`
 	tmpdir := ensure.TempFile(t, "values.yaml", []byte(badYaml))
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, map[string]interface{}{}); err == nil {
+	if err := validateValuesFile(valfile, map[string]interface{}{}, false); err == nil {
 		t.Fatal("expected values file to fail parsing")
 	}
 }
@@ -78,7 +78,7 @@ func TestValidateValuesFileSchema(t *testing.T) {
 	createTestingSchema(t, tmpdir)
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, map[string]interface{}{}); err != nil {
+	if err := validateValuesFile(valfile, map[string]interface{}{}, false); err != nil {
 		t.Fatalf("Failed validation with %s", err)
 	}
 }
@@ -91,7 +91,7 @@ func TestValidateValuesFileSchemaFailure(t *testing.T) {
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
 
-	err := validateValuesFile(valfile, map[string]interface{}{})
+	err := validateValuesFile(valfile, map[string]interface{}{}, false)
 	if err == nil {
 		t.Fatal("expected values file to fail parsing")
 	}
@@ -99,6 +99,20 @@ func TestValidateValuesFileSchemaFailure(t *testing.T) {
 	assert.Contains(t, err.Error(), "- at '/username': got number, want string")
 }
 
+func TestValidateValuesFileSchemaFailureButWithSkipSchemaValidation(t *testing.T) {
+	// 1234 is an int, not a string. This should fail normally but pass with skipSchemaValidation.
+	yaml := "username: 1234\npassword: swordfish"
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(yaml))
+	createTestingSchema(t, tmpdir)
+
+	valfile := filepath.Join(tmpdir, "values.yaml")
+
+	err := validateValuesFile(valfile, map[string]interface{}{}, true)
+	if err != nil {
+		t.Fatal("expected values file to pass parsing because of skipSchemaValidation")
+	}
+}
+
 func TestValidateValuesFileSchemaOverrides(t *testing.T) {
 	yaml := "username: admin"
 	overrides := map[string]interface{}{
@@ -108,7 +122,7 @@ func TestValidateValuesFileSchemaOverrides(t *testing.T) {
 	createTestingSchema(t, tmpdir)
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, overrides); err != nil {
+	if err := validateValuesFile(valfile, overrides, false); err != nil {
 		t.Fatalf("Failed validation with %s", err)
 	}
 }
@@ -145,7 +159,7 @@ func TestValidateValuesFile(t *testing.T) {
 
 			valfile := filepath.Join(tmpdir, "values.yaml")
 
-			err := validateValuesFile(valfile, tt.overrides)
+			err := validateValuesFile(valfile, tt.overrides, false)
 
 			switch {
 			case err != nil && tt.errorMessage == "":
diff --git a/pkg/chart/v2/lint/lint.go b/pkg/chart/v2/lint/lint.go
index 773c9bc5e..b26d65a34 100644
--- a/pkg/chart/v2/lint/lint.go
+++ b/pkg/chart/v2/lint/lint.go
@@ -57,7 +57,7 @@ func RunAll(baseDir string, values map[string]interface{}, namespace string, opt
 	}
 
 	rules.Chartfile(&result)
-	rules.ValuesWithOverrides(&result, values)
+	rules.ValuesWithOverrides(&result, values, lo.SkipSchemaValidation)
 	rules.TemplatesWithSkipSchemaValidation(&result, values, namespace, lo.KubeVersion, lo.SkipSchemaValidation)
 	rules.Dependencies(&result)
 	rules.Crds(&result)
diff --git a/pkg/chart/v2/lint/rules/values.go b/pkg/chart/v2/lint/rules/values.go
index 5260bf8b3..994a6a463 100644
--- a/pkg/chart/v2/lint/rules/values.go
+++ b/pkg/chart/v2/lint/rules/values.go
@@ -32,7 +32,7 @@ import (
 // they are only tested for well-formedness.
 //
 // If additional values are supplied, they are coalesced into the values in values.yaml.
-func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]interface{}) {
+func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]interface{}, skipSchemaValidation bool) {
 	file := "values.yaml"
 	vf := filepath.Join(linter.ChartDir, file)
 	fileExists := linter.RunLinterRule(support.InfoSev, file, validateValuesFileExistence(vf))
@@ -41,7 +41,7 @@ func ValuesWithOverrides(linter *support.Linter, valueOverrides map[string]inter
 		return
 	}
 
-	linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf, valueOverrides))
+	linter.RunLinterRule(support.ErrorSev, file, validateValuesFile(vf, valueOverrides, skipSchemaValidation))
 }
 
 func validateValuesFileExistence(valuesPath string) error {
@@ -52,7 +52,7 @@ func validateValuesFileExistence(valuesPath string) error {
 	return nil
 }
 
-func validateValuesFile(valuesPath string, overrides map[string]interface{}) error {
+func validateValuesFile(valuesPath string, overrides map[string]interface{}, skipSchemaValidation bool) error {
 	values, err := common.ReadValuesFile(valuesPath)
 	if err != nil {
 		return fmt.Errorf("unable to parse YAML: %w", err)
@@ -75,5 +75,10 @@ func validateValuesFile(valuesPath string, overrides map[string]interface{}) err
 	if err != nil {
 		return err
 	}
-	return util.ValidateAgainstSingleSchema(coalescedValues, schema)
+
+	if !skipSchemaValidation {
+		return util.ValidateAgainstSingleSchema(coalescedValues, schema)
+	}
+
+	return nil
 }
diff --git a/pkg/chart/v2/lint/rules/values_test.go b/pkg/chart/v2/lint/rules/values_test.go
index 348695785..288b77436 100644
--- a/pkg/chart/v2/lint/rules/values_test.go
+++ b/pkg/chart/v2/lint/rules/values_test.go
@@ -67,7 +67,7 @@ func TestValidateValuesFileWellFormed(t *testing.T) {
 	`
 	tmpdir := ensure.TempFile(t, "values.yaml", []byte(badYaml))
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, map[string]interface{}{}); err == nil {
+	if err := validateValuesFile(valfile, map[string]interface{}{}, false); err == nil {
 		t.Fatal("expected values file to fail parsing")
 	}
 }
@@ -78,7 +78,7 @@ func TestValidateValuesFileSchema(t *testing.T) {
 	createTestingSchema(t, tmpdir)
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, map[string]interface{}{}); err != nil {
+	if err := validateValuesFile(valfile, map[string]interface{}{}, false); err != nil {
 		t.Fatalf("Failed validation with %s", err)
 	}
 }
@@ -91,7 +91,7 @@ func TestValidateValuesFileSchemaFailure(t *testing.T) {
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
 
-	err := validateValuesFile(valfile, map[string]interface{}{})
+	err := validateValuesFile(valfile, map[string]interface{}{}, false)
 	if err == nil {
 		t.Fatal("expected values file to fail parsing")
 	}
@@ -99,6 +99,20 @@ func TestValidateValuesFileSchemaFailure(t *testing.T) {
 	assert.Contains(t, err.Error(), "- at '/username': got number, want string")
 }
 
+func TestValidateValuesFileSchemaFailureButWithSkipSchemaValidation(t *testing.T) {
+	// 1234 is an int, not a string. This should fail normally but pass with skipSchemaValidation.
+	yaml := "username: 1234\npassword: swordfish"
+	tmpdir := ensure.TempFile(t, "values.yaml", []byte(yaml))
+	createTestingSchema(t, tmpdir)
+
+	valfile := filepath.Join(tmpdir, "values.yaml")
+
+	err := validateValuesFile(valfile, map[string]interface{}{}, true)
+	if err != nil {
+		t.Fatal("expected values file to pass parsing because of skipSchemaValidation")
+	}
+}
+
 func TestValidateValuesFileSchemaOverrides(t *testing.T) {
 	yaml := "username: admin"
 	overrides := map[string]interface{}{
@@ -108,7 +122,7 @@ func TestValidateValuesFileSchemaOverrides(t *testing.T) {
 	createTestingSchema(t, tmpdir)
 
 	valfile := filepath.Join(tmpdir, "values.yaml")
-	if err := validateValuesFile(valfile, overrides); err != nil {
+	if err := validateValuesFile(valfile, overrides, false); err != nil {
 		t.Fatalf("Failed validation with %s", err)
 	}
 }
@@ -145,7 +159,7 @@ func TestValidateValuesFile(t *testing.T) {
 
 			valfile := filepath.Join(tmpdir, "values.yaml")
 
-			err := validateValuesFile(valfile, tt.overrides)
+			err := validateValuesFile(valfile, tt.overrides, false)
 
 			switch {
 			case err != nil && tt.errorMessage == "":

From 99e5fce71a51a948bcfde040cd9be77e02a431f2 Mon Sep 17 00:00:00 2001
From: Benoit Tigeot <benoit.tigeot@lifen.fr>
Date: Wed, 10 Sep 2025 21:26:02 +0200
Subject: [PATCH 201/211] Fix deprecation warning for spf13/pflag from 1.0.7 to
 1.0.10

Close: #31231

```
Error: cmd/helm/root.go:165:2: SA1019: flags.ParseErrorsWhitelist is deprecated: use [FlagSet.ParseErrorsAllowlist] instead. This field will be removed in a future release. (staticcheck)
```

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
---
 pkg/cmd/root.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 4753e51fe..4f1be88d6 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -173,7 +173,7 @@ func newRootCmdWithConfig(actionConfig *action.Configuration, out io.Writer, arg
 	// those errors will be caught later during the call to cmd.Execution.
 	// This call is required to gather configuration information prior to
 	// execution.
-	flags.ParseErrorsWhitelist.UnknownFlags = true
+	flags.ParseErrorsAllowlist.UnknownFlags = true
 	flags.Parse(args)
 
 	logSetup(settings.Debug)

From fcd082e03417d78dec8c105254cd967df8277f48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Sep 2025 21:12:10 +0000
Subject: [PATCH 202/211] chore(deps): bump the k8s-io group with 7 updates

Bumps the k8s-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.34.0` | `0.34.1` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.34.0` | `0.34.1` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.34.0` | `0.34.1` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.34.0` | `0.34.1` |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.34.0` | `0.34.1` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.0` | `0.34.1` |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.34.0` | `0.34.1` |


Updates `k8s.io/api` from 0.34.0 to 0.34.1
- [Commits](https://github.com/kubernetes/api/compare/v0.34.0...v0.34.1)

Updates `k8s.io/apiextensions-apiserver` from 0.34.0 to 0.34.1
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.34.0...v0.34.1)

Updates `k8s.io/apimachinery` from 0.34.0 to 0.34.1
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.34.0...v0.34.1)

Updates `k8s.io/apiserver` from 0.34.0 to 0.34.1
- [Commits](https://github.com/kubernetes/apiserver/compare/v0.34.0...v0.34.1)

Updates `k8s.io/cli-runtime` from 0.34.0 to 0.34.1
- [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.34.0...v0.34.1)

Updates `k8s.io/client-go` from 0.34.0 to 0.34.1
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.34.0...v0.34.1)

Updates `k8s.io/kubectl` from 0.34.0 to 0.34.1
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.34.0...v0.34.1)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/apiserver
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/cli-runtime
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/kubectl
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod | 16 ++++++++--------
 go.sum | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/go.mod b/go.mod
index 5a69e5fd6..77e761de2 100644
--- a/go.mod
+++ b/go.mod
@@ -39,14 +39,14 @@ require (
 	golang.org/x/term v0.35.0
 	golang.org/x/text v0.29.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.34.0
-	k8s.io/apiextensions-apiserver v0.34.0
-	k8s.io/apimachinery v0.34.0
-	k8s.io/apiserver v0.34.0
-	k8s.io/cli-runtime v0.34.0
-	k8s.io/client-go v0.34.0
+	k8s.io/api v0.34.1
+	k8s.io/apiextensions-apiserver v0.34.1
+	k8s.io/apimachinery v0.34.1
+	k8s.io/apiserver v0.34.1
+	k8s.io/cli-runtime v0.34.1
+	k8s.io/client-go v0.34.1
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubectl v0.34.0
+	k8s.io/kubectl v0.34.1
 	oras.land/oras-go/v2 v2.6.0
 	sigs.k8s.io/controller-runtime v0.22.1
 	sigs.k8s.io/kustomize/kyaml v0.20.1
@@ -174,7 +174,7 @@ 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
-	k8s.io/component-base v0.34.0 // indirect
+	k8s.io/component-base v0.34.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
diff --git a/go.sum b/go.sum
index f6086fc2e..9fa40e4d4 100644
--- a/go.sum
+++ b/go.sum
@@ -508,26 +508,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
-k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
-k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
-k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
-k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
-k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
-k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
-k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
-k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw=
-k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8=
-k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
-k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
-k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8=
-k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg=
+k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
+k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
+k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
+k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
+k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
+k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
+k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
+k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
+k8s.io/cli-runtime v0.34.1 h1:btlgAgTrYd4sk8vJTRG6zVtqBKt9ZMDeQZo2PIzbL7M=
+k8s.io/cli-runtime v0.34.1/go.mod h1:aVA65c+f0MZiMUPbseU/M9l1Wo2byeaGwUuQEQVVveE=
+k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
+k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
+k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
+k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
-k8s.io/kubectl v0.34.0 h1:NcXz4TPTaUwhiX4LU+6r6udrlm0NsVnSkP3R9t0dmxs=
-k8s.io/kubectl v0.34.0/go.mod h1:bmd0W5i+HuG7/p5sqicr0Li0rR2iIhXL0oUyLF3OjR4=
+k8s.io/kubectl v0.34.1 h1:1qP1oqT5Xc93K+H8J7ecpBjaz511gan89KO9Vbsh/OI=
+k8s.io/kubectl v0.34.1/go.mod h1:JRYlhJpGPyk3dEmJ+BuBiOB9/dAvnrALJEiY/C5qa6A=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=

From db50c37eda4ccb5d07bbd6733fd27926346f551f Mon Sep 17 00:00:00 2001
From: bennsimon <bennsimonotieno@gmail.com>
Date: Fri, 12 Sep 2025 12:44:18 +0300
Subject: [PATCH 203/211] remove metadata output on helm template

Signed-off-by: bennsimon <bennsimonotieno@gmail.com>
---
 pkg/engine/engine.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index a0ca17f08..7c858690f 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -473,7 +473,6 @@ func recAllTpls(c ci.Charter, templates map[string]renderable, values common.Val
 		slog.Error("error accessing chart", "error", err)
 	}
 	chartMetaData := accessor.MetadataAsMap()
-	fmt.Printf("metadata: %v\n", chartMetaData)
 	chartMetaData["IsRoot"] = accessor.IsRoot()
 
 	next := map[string]interface{}{

From cfaf30083af5b32ae4611c7e58d8dbc2171e9331 Mon Sep 17 00:00:00 2001
From: yajianggroup <yajianggroup@outlook.com>
Date: Fri, 12 Sep 2025 19:03:54 +0800
Subject: [PATCH 204/211] refactor: use strings.CutPrefix

Signed-off-by: yajianggroup <yajianggroup@outlook.com>
---
 internal/plugin/installer/extractor.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/plugin/installer/extractor.go b/internal/plugin/installer/extractor.go
index 9417a0535..407138197 100644
--- a/internal/plugin/installer/extractor.go
+++ b/internal/plugin/installer/extractor.go
@@ -185,8 +185,8 @@ func (g *TarGzExtractor) Extract(buffer *bytes.Buffer, targetDir string) error {
 func stripPluginName(name string) string {
 	var strippedName string
 	for suffix := range Extractors {
-		if strings.HasSuffix(name, suffix) {
-			strippedName = strings.TrimSuffix(name, suffix)
+		if before, ok := strings.CutSuffix(name, suffix); ok {
+			strippedName = before
 			break
 		}
 	}

From 934b4550d9f238b2b9537ea0ea14207d1d1f6ade Mon Sep 17 00:00:00 2001
From: Mile Druzijanic <zedsprogramms@gmail.com>
Date: Fri, 12 Sep 2025 20:42:37 +0200
Subject: [PATCH 205/211] improve fileutil test coverage

Signed-off-by: Mile Druzijanic <zedsprogramms@gmail.com>
---
 internal/fileutil/fileutil_test.go | 64 ++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/internal/fileutil/fileutil_test.go b/internal/fileutil/fileutil_test.go
index 92920d3c4..881fbb49d 100644
--- a/internal/fileutil/fileutil_test.go
+++ b/internal/fileutil/fileutil_test.go
@@ -20,9 +20,12 @@ import (
 	"bytes"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 )
 
+// TestAtomicWriteFile tests the happy path of AtomicWriteFile function.
+// It verifies that the function correctly writes content to a file with the specified mode.
 func TestAtomicWriteFile(t *testing.T) {
 	dir := t.TempDir()
 
@@ -55,3 +58,64 @@ func TestAtomicWriteFile(t *testing.T) {
 			mode, gotinfo.Mode())
 	}
 }
+
+// TestAtomicWriteFile_CreateTempError tests the error path when os.CreateTemp fails
+func TestAtomicWriteFile_CreateTempError(t *testing.T) {
+	invalidPath := "/invalid/path/that/does/not/exist/testfile"
+
+	reader := bytes.NewReader([]byte("test content"))
+	mode := os.FileMode(0644)
+
+	err := AtomicWriteFile(invalidPath, reader, mode)
+	if err == nil {
+		t.Error("Expected error when CreateTemp fails, but got nil")
+	}
+}
+
+// TestAtomicWriteFile_EmptyContent tests with empty content
+func TestAtomicWriteFile_EmptyContent(t *testing.T) {
+	dir := t.TempDir()
+	testpath := filepath.Join(dir, "empty_helm")
+
+	reader := bytes.NewReader([]byte(""))
+	mode := os.FileMode(0644)
+
+	err := AtomicWriteFile(testpath, reader, mode)
+	if err != nil {
+		t.Errorf("AtomicWriteFile error with empty content: %s", err)
+	}
+
+	got, err := os.ReadFile(testpath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(got) != 0 {
+		t.Fatalf("expected empty content, got: %s", string(got))
+	}
+}
+
+// TestAtomicWriteFile_LargeContent tests with large content
+func TestAtomicWriteFile_LargeContent(t *testing.T) {
+	dir := t.TempDir()
+	testpath := filepath.Join(dir, "large_test")
+
+	// Create a large content string
+	largeContent := strings.Repeat("HELM", 1024*1024)
+	reader := bytes.NewReader([]byte(largeContent))
+	mode := os.FileMode(0644)
+
+	err := AtomicWriteFile(testpath, reader, mode)
+	if err != nil {
+		t.Errorf("AtomicWriteFile error with large content: %s", err)
+	}
+
+	got, err := os.ReadFile(testpath)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if largeContent != string(got) {
+		t.Fatalf("expected large content to match, got different length: %d vs %d", len(largeContent), len(got))
+	}
+}

From 9112687a7e0f6fc85f5736dda48c263c30496795 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Fri, 12 Sep 2025 14:12:23 -0600
Subject: [PATCH 206/211] Update pkg/engine/engine.go

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/engine/engine.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index a5532f73a..cce3c10c7 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -362,7 +362,7 @@ func parseTemplateExecErrorString(s string) (TraceableError, bool) {
 	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191
 	traceableError, done := parseTemplateNoTemplateError(s, remainder)
 	if done {
-		return traceableError, done
+		return traceableError, true
 	}
 
 	// Executing form: "<templateName>: executing \"<funcName>\" at <<location>>: <errMsg>[ template:...]"

From 91a65234ac52e1b693cf469a85faa78af79c2163 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Fri, 12 Sep 2025 14:26:53 -0600
Subject: [PATCH 207/211] Update pkg/engine/engine.go

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/engine/engine.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index cce3c10c7..8272889d3 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -369,7 +369,7 @@ func parseTemplateExecErrorString(s string) (TraceableError, bool) {
 	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141
 	traceableError, done = parseTemplateExecutingAtErrorType(remainder)
 	if done {
-		return traceableError, done
+		return traceableError, true
 	}
 
 	// Simple form: "<templateName>: <errMsg>"

From b2870379c88f7bf9a51fe0aa3c1c6442a91cda68 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Fri, 12 Sep 2025 14:27:00 -0600
Subject: [PATCH 208/211] Update pkg/engine/engine.go

Co-authored-by: George Jenkins <gvjenkins@gmail.com>
Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/engine/engine.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index 8272889d3..9cbff272a 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -377,7 +377,7 @@ func parseTemplateExecErrorString(s string) (TraceableError, bool) {
 	// Matches https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138
 	traceableError, done = parseTemplateSimpleErrorString(remainder)
 	if done {
-		return traceableError, done
+		return traceableError, true
 	}
 
 	return TraceableError{}, false

From 1c67fbf108ec9849773897ae4ca1588dca5bdf1f Mon Sep 17 00:00:00 2001
From: reddaisyy <reddaisy@outlook.jp>
Date: Mon, 15 Sep 2025 17:13:58 +0800
Subject: [PATCH 209/211] refactor: use strings.builder

Signed-off-by: reddaisyy <reddaisy@outlook.jp>
---
 pkg/action/hooks_test.go           | 9 +++++----
 pkg/engine/engine_test.go          | 6 +++---
 pkg/strvals/literal_parser_test.go | 7 ++++---
 pkg/strvals/parser_test.go         | 7 ++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkg/action/hooks_test.go b/pkg/action/hooks_test.go
index 091155bc2..fb7d1b4ec 100644
--- a/pkg/action/hooks_test.go
+++ b/pkg/action/hooks_test.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
@@ -112,15 +113,15 @@ spec:
 }
 
 func convertHooksToCommaSeparated(hookDefinitions []release.HookOutputLogPolicy) string {
-	var commaSeparated string
+	var commaSeparated strings.Builder
 	for i, policy := range hookDefinitions {
 		if i+1 == len(hookDefinitions) {
-			commaSeparated += policy.String()
+			commaSeparated.WriteString(policy.String())
 		} else {
-			commaSeparated += policy.String() + ","
+			commaSeparated.WriteString(policy.String() + ",")
 		}
 	}
-	return commaSeparated
+	return commaSeparated.String()
 }
 
 func TestInstallRelease_HookOutputLogsOnFailure(t *testing.T) {
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index 7ac892cec..364e96183 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -1024,15 +1024,15 @@ func TestRenderRecursionLimit(t *testing.T) {
 	times := 4000
 	phrase := "All work and no play makes Jack a dull boy"
 	printFunc := `{{define "overlook"}}{{printf "` + phrase + `\n"}}{{end}}`
-	var repeatedIncl string
+	var repeatedIncl strings.Builder
 	for i := 0; i < times; i++ {
-		repeatedIncl += `{{include "overlook" . }}`
+		repeatedIncl.WriteString(`{{include "overlook" . }}`)
 	}
 
 	d := &chart.Chart{
 		Metadata: &chart.Metadata{Name: "overlook"},
 		Templates: []*common.File{
-			{Name: "templates/quote", Data: []byte(repeatedIncl)},
+			{Name: "templates/quote", Data: []byte(repeatedIncl.String())},
 			{Name: "templates/_function", Data: []byte(printFunc)},
 		},
 	}
diff --git a/pkg/strvals/literal_parser_test.go b/pkg/strvals/literal_parser_test.go
index 4e74423d6..6a76458f5 100644
--- a/pkg/strvals/literal_parser_test.go
+++ b/pkg/strvals/literal_parser_test.go
@@ -17,6 +17,7 @@ package strvals
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"sigs.k8s.io/yaml"
@@ -416,14 +417,14 @@ func TestParseLiteralInto(t *testing.T) {
 }
 
 func TestParseLiteralNestedLevels(t *testing.T) {
-	var keyMultipleNestedLevels string
+	var keyMultipleNestedLevels strings.Builder
 
 	for i := 1; i <= MaxNestedNameLevel+2; i++ {
 		tmpStr := fmt.Sprintf("name%d", i)
 		if i <= MaxNestedNameLevel+1 {
 			tmpStr = tmpStr + "."
 		}
-		keyMultipleNestedLevels += tmpStr
+		keyMultipleNestedLevels.WriteString(tmpStr)
 	}
 
 	tests := []struct {
@@ -439,7 +440,7 @@ func TestParseLiteralNestedLevels(t *testing.T) {
 			"",
 		},
 		{
-			str:    keyMultipleNestedLevels + "=value",
+			str:    keyMultipleNestedLevels.String() + "=value",
 			err:    true,
 			errStr: fmt.Sprintf("value name nested level is greater than maximum supported nested level of %d", MaxNestedNameLevel),
 		},
diff --git a/pkg/strvals/parser_test.go b/pkg/strvals/parser_test.go
index a0c67b791..73403fc52 100644
--- a/pkg/strvals/parser_test.go
+++ b/pkg/strvals/parser_test.go
@@ -17,6 +17,7 @@ package strvals
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"sigs.k8s.io/yaml"
@@ -757,13 +758,13 @@ func TestToYAML(t *testing.T) {
 }
 
 func TestParseSetNestedLevels(t *testing.T) {
-	var keyMultipleNestedLevels string
+	var keyMultipleNestedLevels strings.Builder
 	for i := 1; i <= MaxNestedNameLevel+2; i++ {
 		tmpStr := fmt.Sprintf("name%d", i)
 		if i <= MaxNestedNameLevel+1 {
 			tmpStr = tmpStr + "."
 		}
-		keyMultipleNestedLevels += tmpStr
+		keyMultipleNestedLevels.WriteString(tmpStr)
 	}
 	tests := []struct {
 		str    string
@@ -778,7 +779,7 @@ func TestParseSetNestedLevels(t *testing.T) {
 			"",
 		},
 		{
-			str: keyMultipleNestedLevels + "=value",
+			str: keyMultipleNestedLevels.String() + "=value",
 			err: true,
 			errStr: fmt.Sprintf("value name nested level is greater than maximum supported nested level of %d",
 				MaxNestedNameLevel),

From 3e1dd9a5dcaa8e75edd7dbab6803d753068b852c Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Mon, 15 Sep 2025 12:28:09 -0600
Subject: [PATCH 210/211] chore: remove pkg/time which is no longer needed

Signed-off-by: Terry Howe <terrylhowe@gmail.com>
---
 pkg/action/action.go                          |   2 +-
 pkg/action/action_test.go                     |   2 +-
 pkg/action/get_metadata_test.go               |  19 ++-
 pkg/action/hooks.go                           |   7 +-
 pkg/action/install_test.go                    |  13 +-
 pkg/action/rollback.go                        |   3 +-
 pkg/action/uninstall.go                       |   3 +-
 pkg/action/upgrade_test.go                    |   3 +-
 pkg/cmd/flags_test.go                         |   4 +-
 pkg/cmd/helpers_test.go                       |   2 +-
 pkg/cmd/history.go                            |  13 +-
 pkg/cmd/list_test.go                          |   2 +-
 pkg/cmd/status_test.go                        |   7 +-
 .../output/status-with-resources.json         |   2 +-
 pkg/cmd/testdata/output/status.json           |   2 +-
 pkg/pusher/ocipusher.go                       |   3 +-
 pkg/registry/util.go                          |   3 +-
 pkg/registry/util_test.go                     |  11 +-
 pkg/release/v1/hook.go                        |   6 +-
 pkg/release/v1/info.go                        |  10 +-
 pkg/release/v1/mock.go                        |   2 +-
 pkg/release/v1/util/sorter_test.go            |   3 +-
 pkg/time/ctime/ctime.go                       |  29 ----
 pkg/time/ctime/ctime_linux.go                 |  30 ----
 pkg/time/ctime/ctime_other.go                 |  27 ----
 pkg/time/time.go                              |  92 -----------
 pkg/time/time_test.go                         | 153 ------------------
 27 files changed, 55 insertions(+), 398 deletions(-)
 delete mode 100644 pkg/time/ctime/ctime.go
 delete mode 100644 pkg/time/ctime/ctime_linux.go
 delete mode 100644 pkg/time/ctime/ctime_other.go
 delete mode 100644 pkg/time/time.go
 delete mode 100644 pkg/time/time_test.go

diff --git a/pkg/action/action.go b/pkg/action/action.go
index bcf6ca8ef..1aa9f9d19 100644
--- a/pkg/action/action.go
+++ b/pkg/action/action.go
@@ -30,6 +30,7 @@ import (
 	"strings"
 	"sync"
 	"text/template"
+	"time"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
@@ -50,7 +51,6 @@ import (
 	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
-	"helm.sh/helm/v4/pkg/time"
 )
 
 // Timestamper is a function capable of producing a timestamp.Timestamper.
diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index b65e40024..78ca01089 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -24,6 +24,7 @@ import (
 	"log/slog"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -38,7 +39,6 @@ import (
 	release "helm.sh/helm/v4/pkg/release/v1"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
-	"helm.sh/helm/v4/pkg/time"
 )
 
 var verbose = flag.Bool("test.log", false, "enable test logging (debug by default)")
diff --git a/pkg/action/get_metadata_test.go b/pkg/action/get_metadata_test.go
index ca612fed7..7962a2133 100644
--- a/pkg/action/get_metadata_test.go
+++ b/pkg/action/get_metadata_test.go
@@ -28,7 +28,6 @@ import (
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 func TestNewGetMetadata(t *testing.T) {
@@ -45,7 +44,7 @@ func TestGetMetadata_Run_BasicMetadata(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	rel := &release.Release{
 		Name: releaseName,
@@ -86,7 +85,7 @@ func TestGetMetadata_Run_WithDependencies(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	dependencies := []*chart.Dependency{
 		{
@@ -138,7 +137,7 @@ func TestGetMetadata_Run_WithDependenciesAliases(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	dependencies := []*chart.Dependency{
 		{
@@ -194,7 +193,7 @@ func TestGetMetadata_Run_WithMixedDependencies(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	dependencies := []*chart.Dependency{
 		{
@@ -268,7 +267,7 @@ func TestGetMetadata_Run_WithAnnotations(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	annotations := map[string]string{
 		"helm.sh/hook":        "pre-install",
@@ -313,13 +312,13 @@ func TestGetMetadata_Run_SpecificVersion(t *testing.T) {
 	client.Version = 2
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	rel1 := &release.Release{
 		Name: releaseName,
 		Info: &release.Info{
 			Status:       release.StatusSuperseded,
-			LastDeployed: helmtime.Time{Time: deployedTime.Time.Add(-time.Hour)},
+			LastDeployed: deployedTime.Add(-time.Hour),
 		},
 		Chart: &chart.Chart{
 			Metadata: &chart.Metadata{
@@ -384,7 +383,7 @@ func TestGetMetadata_Run_DifferentStatuses(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			releaseName := "test-release-" + tc.name
-			deployedTime := helmtime.Now()
+			deployedTime := time.Now()
 
 			rel := &release.Release{
 				Name: releaseName,
@@ -440,7 +439,7 @@ func TestGetMetadata_Run_EmptyAppVersion(t *testing.T) {
 	client := NewGetMetadata(cfg)
 
 	releaseName := "test-release"
-	deployedTime := helmtime.Now()
+	deployedTime := time.Now()
 
 	rel := &release.Release{
 		Name: releaseName,
diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go
index 458a6342c..4808bc054 100644
--- a/pkg/action/hooks.go
+++ b/pkg/action/hooks.go
@@ -29,7 +29,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 // execHook executes all of the hooks for the given hook event.
@@ -62,7 +61,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 
 		// Record the time at which the hook was applied to the cluster
 		h.LastRun = release.HookExecution{
-			StartedAt: helmtime.Now(),
+			StartedAt: time.Now(),
 			Phase:     release.HookPhaseRunning,
 		}
 		cfg.recordRelease(rl)
@@ -76,7 +75,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 		if _, err := cfg.KubeClient.Create(
 			resources,
 			kube.ClientCreateOptionServerSideApply(serverSideApply, false)); err != nil {
-			h.LastRun.CompletedAt = helmtime.Now()
+			h.LastRun.CompletedAt = time.Now()
 			h.LastRun.Phase = release.HookPhaseFailed
 			return fmt.Errorf("warning: Hook %s %s failed: %w", hook, h.Path, err)
 		}
@@ -88,7 +87,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent,
 		// Watch hook resources until they have completed
 		err = waiter.WatchUntilReady(resources, timeout)
 		// Note the time of success/failure
-		h.LastRun.CompletedAt = helmtime.Now()
+		h.LastRun.CompletedAt = time.Now()
 		// Mark hook as succeeded or failed
 		if err != nil {
 			h.LastRun.Phase = release.HookPhaseFailed
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index b2b1508be..9031372d7 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -49,7 +49,6 @@ import (
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
 	"helm.sh/helm/v4/pkg/storage/driver"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 type nameTemplateTestCase struct {
@@ -856,32 +855,32 @@ func TestNameAndChartGenerateName(t *testing.T) {
 		{
 			"local filepath",
 			"./chart",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 		{
 			"dot filepath",
 			".",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 		{
 			"empty filepath",
 			"",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 		{
 			"packaged chart",
 			"chart.tgz",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 		{
 			"packaged chart with .tar.gz extension",
 			"chart.tar.gz",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 		{
 			"packaged chart with local extension",
 			"./chart.tgz",
-			fmt.Sprintf("chart-%d", helmtime.Now().Unix()),
+			fmt.Sprintf("chart-%d", time.Now().Unix()),
 		},
 	}
 
diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go
index adaf22615..f56052988 100644
--- a/pkg/action/rollback.go
+++ b/pkg/action/rollback.go
@@ -26,7 +26,6 @@ import (
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 // Rollback is the action for rolling back to a given release.
@@ -158,7 +157,7 @@ func (r *Rollback) prepareRollback(name string) (*release.Release, *release.Rele
 		Config:    previousRelease.Config,
 		Info: &release.Info{
 			FirstDeployed: currentRelease.Info.FirstDeployed,
-			LastDeployed:  helmtime.Now(),
+			LastDeployed:  time.Now(),
 			Status:        release.StatusPendingRollback,
 			Notes:         previousRelease.Info.Notes,
 			// Because we lose the reference to previous version elsewhere, we set the
diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go
index 866be5d54..057c2118f 100644
--- a/pkg/action/uninstall.go
+++ b/pkg/action/uninstall.go
@@ -30,7 +30,6 @@ import (
 	release "helm.sh/helm/v4/pkg/release/v1"
 	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
 	"helm.sh/helm/v4/pkg/storage/driver"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 // Uninstall is the action for uninstalling releases.
@@ -110,7 +109,7 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error)
 
 	slog.Debug("uninstall: deleting release", "name", name)
 	rel.Info.Status = release.StatusUninstalling
-	rel.Info.Deleted = helmtime.Now()
+	rel.Info.Deleted = time.Now()
 	rel.Info.Description = "Deletion in progress (or silently failed)"
 	res := &release.UninstallReleaseResponse{Release: rel}
 
diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go
index d31804b87..0a436534f 100644
--- a/pkg/action/upgrade_test.go
+++ b/pkg/action/upgrade_test.go
@@ -34,7 +34,6 @@ import (
 
 	kubefake "helm.sh/helm/v4/pkg/kube/fake"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 func upgradeAction(t *testing.T) *Upgrade {
@@ -260,7 +259,7 @@ func TestUpgradeRelease_ReuseValues(t *testing.T) {
 			withValues(chartDefaultValues),
 			withMetadataDependency(dependency),
 		)
-		now := helmtime.Now()
+		now := time.Now()
 		existingValues := map[string]interface{}{
 			"subchart": map[string]interface{}{
 				"enabled": false,
diff --git a/pkg/cmd/flags_test.go b/pkg/cmd/flags_test.go
index dce748a6b..8d79716f0 100644
--- a/pkg/cmd/flags_test.go
+++ b/pkg/cmd/flags_test.go
@@ -19,19 +19,19 @@ package cmd
 import (
 	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
 	"helm.sh/helm/v4/pkg/action"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 func outputFlagCompletionTest(t *testing.T, cmdName string) {
 	t.Helper()
 	releasesMockWithStatus := func(info *release.Info, hooks ...*release.Hook) []*release.Release {
-		info.LastDeployed = helmtime.Unix(1452902400, 0).UTC()
+		info.LastDeployed = time.Unix(1452902400, 0).UTC()
 		return []*release.Release{{
 			Name:      "athos",
 			Namespace: "default",
diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go
index 55e3a842f..96bf6434b 100644
--- a/pkg/cmd/helpers_test.go
+++ b/pkg/cmd/helpers_test.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"strings"
 	"testing"
+	"time"
 
 	shellwords "github.com/mattn/go-shellwords"
 	"github.com/spf13/cobra"
@@ -34,7 +35,6 @@ import (
 	release "helm.sh/helm/v4/pkg/release/v1"
 	"helm.sh/helm/v4/pkg/storage"
 	"helm.sh/helm/v4/pkg/storage/driver"
-	"helm.sh/helm/v4/pkg/time"
 )
 
 func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() }
diff --git a/pkg/cmd/history.go b/pkg/cmd/history.go
index 9f029268c..f4dde95e4 100644
--- a/pkg/cmd/history.go
+++ b/pkg/cmd/history.go
@@ -31,7 +31,6 @@ import (
 	"helm.sh/helm/v4/pkg/cmd/require"
 	release "helm.sh/helm/v4/pkg/release/v1"
 	releaseutil "helm.sh/helm/v4/pkg/release/v1/util"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 var historyHelp = `
@@ -84,12 +83,12 @@ func newHistoryCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 }
 
 type releaseInfo struct {
-	Revision    int           `json:"revision"`
-	Updated     helmtime.Time `json:"updated"`
-	Status      string        `json:"status"`
-	Chart       string        `json:"chart"`
-	AppVersion  string        `json:"app_version"`
-	Description string        `json:"description"`
+	Revision    int       `json:"revision"`
+	Updated     time.Time `json:"updated,omitzero"`
+	Status      string    `json:"status"`
+	Chart       string    `json:"chart"`
+	AppVersion  string    `json:"app_version"`
+	Description string    `json:"description"`
 }
 
 type releaseHistory []releaseInfo
diff --git a/pkg/cmd/list_test.go b/pkg/cmd/list_test.go
index 82b25a768..22a948fff 100644
--- a/pkg/cmd/list_test.go
+++ b/pkg/cmd/list_test.go
@@ -18,10 +18,10 @@ package cmd
 
 import (
 	"testing"
+	"time"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	"helm.sh/helm/v4/pkg/time"
 )
 
 func TestListCmd(t *testing.T) {
diff --git a/pkg/cmd/status_test.go b/pkg/cmd/status_test.go
index cb4e23c59..8c251b76b 100644
--- a/pkg/cmd/status_test.go
+++ b/pkg/cmd/status_test.go
@@ -22,12 +22,11 @@ import (
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	release "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 func TestStatusCmd(t *testing.T) {
 	releasesMockWithStatus := func(info *release.Info, hooks ...*release.Hook) []*release.Release {
-		info.LastDeployed = helmtime.Unix(1452902400, 0).UTC()
+		info.LastDeployed = time.Unix(1452902400, 0).UTC()
 		return []*release.Release{{
 			Name:      "flummoxed-chickadee",
 			Namespace: "default",
@@ -130,8 +129,8 @@ func TestStatusCmd(t *testing.T) {
 	runTestCmd(t, tests)
 }
 
-func mustParseTime(t string) helmtime.Time {
-	res, _ := helmtime.Parse(time.RFC3339, t)
+func mustParseTime(t string) time.Time {
+	res, _ := time.Parse(time.RFC3339, t)
 	return res
 }
 
diff --git a/pkg/cmd/testdata/output/status-with-resources.json b/pkg/cmd/testdata/output/status-with-resources.json
index 275e0cfc6..af512bfd1 100644
--- a/pkg/cmd/testdata/output/status-with-resources.json
+++ b/pkg/cmd/testdata/output/status-with-resources.json
@@ -1 +1 @@
-{"name":"flummoxed-chickadee","info":{"first_deployed":"","last_deployed":"2016-01-16T00:00:00Z","deleted":"","status":"deployed"},"namespace":"default"}
+{"name":"flummoxed-chickadee","info":{"last_deployed":"2016-01-16T00:00:00Z","status":"deployed"},"namespace":"default"}
diff --git a/pkg/cmd/testdata/output/status.json b/pkg/cmd/testdata/output/status.json
index 4b499c935..4727dd100 100644
--- a/pkg/cmd/testdata/output/status.json
+++ b/pkg/cmd/testdata/output/status.json
@@ -1 +1 @@
-{"name":"flummoxed-chickadee","info":{"first_deployed":"","last_deployed":"2016-01-16T00:00:00Z","deleted":"","status":"deployed","notes":"release notes"},"namespace":"default"}
+{"name":"flummoxed-chickadee","info":{"last_deployed":"2016-01-16T00:00:00Z","status":"deployed","notes":"release notes"},"namespace":"default"}
diff --git a/pkg/pusher/ocipusher.go b/pkg/pusher/ocipusher.go
index 699d27caf..25682969b 100644
--- a/pkg/pusher/ocipusher.go
+++ b/pkg/pusher/ocipusher.go
@@ -29,7 +29,6 @@ import (
 	"helm.sh/helm/v4/internal/tlsutil"
 	"helm.sh/helm/v4/pkg/chart/v2/loader"
 	"helm.sh/helm/v4/pkg/registry"
-	"helm.sh/helm/v4/pkg/time/ctime"
 )
 
 // OCIPusher is the default OCI backend handler
@@ -91,7 +90,7 @@ func (pusher *OCIPusher) push(chartRef, href string) error {
 		meta.Metadata.Version)
 
 	// The time the chart was "created" is semantically the time the chart archive file was last written(modified)
-	chartArchiveFileCreatedTime := ctime.Modified(stat)
+	chartArchiveFileCreatedTime := stat.ModTime()
 	pushOpts = append(pushOpts, registry.PushOptCreationTime(chartArchiveFileCreatedTime.Format(time.RFC3339)))
 
 	_, err = client.Push(chartBytes, ref, pushOpts...)
diff --git a/pkg/registry/util.go b/pkg/registry/util.go
index b31ab63fe..6071c66c3 100644
--- a/pkg/registry/util.go
+++ b/pkg/registry/util.go
@@ -28,7 +28,6 @@ import (
 	"helm.sh/helm/v4/internal/tlsutil"
 	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"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -157,7 +156,7 @@ func generateChartOCIAnnotations(meta *chart.Metadata, creationTime string) map[
 	chartOCIAnnotations = addToMap(chartOCIAnnotations, ocispec.AnnotationURL, meta.Home)
 
 	if len(creationTime) == 0 {
-		creationTime = helmtime.Now().UTC().Format(time.RFC3339)
+		creationTime = time.Now().UTC().Format(time.RFC3339)
 	}
 
 	chartOCIAnnotations = addToMap(chartOCIAnnotations, ocispec.AnnotationCreated, creationTime)
diff --git a/pkg/registry/util_test.go b/pkg/registry/util_test.go
index c8ce4e4a4..a67bc853a 100644
--- a/pkg/registry/util_test.go
+++ b/pkg/registry/util_test.go
@@ -24,12 +24,11 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 func TestGenerateOCIChartAnnotations(t *testing.T) {
 
-	nowString := helmtime.Now().Format(time.RFC3339)
+	nowString := time.Now().Format(time.RFC3339)
 
 	tests := []struct {
 		name   string
@@ -160,7 +159,7 @@ func TestGenerateOCIChartAnnotations(t *testing.T) {
 
 func TestGenerateOCIAnnotations(t *testing.T) {
 
-	nowString := helmtime.Now().Format(time.RFC3339)
+	nowString := time.Now().Format(time.RFC3339)
 
 	tests := []struct {
 		name   string
@@ -234,7 +233,7 @@ func TestGenerateOCIAnnotations(t *testing.T) {
 
 func TestGenerateOCICreatedAnnotations(t *testing.T) {
 
-	nowTime := helmtime.Now()
+	nowTime := time.Now()
 	nowTimeString := nowTime.Format(time.RFC3339)
 
 	chart := &chart.Metadata{
@@ -250,7 +249,7 @@ func TestGenerateOCICreatedAnnotations(t *testing.T) {
 	}
 
 	// Verify value of created artifact in RFC3339 format
-	if _, err := helmtime.Parse(time.RFC3339, result[ocispec.AnnotationCreated]); err != nil {
+	if _, err := time.Parse(time.RFC3339, result[ocispec.AnnotationCreated]); err != nil {
 		t.Errorf("%s annotation with value '%s' not in RFC3339 format", ocispec.AnnotationCreated, result[ocispec.AnnotationCreated])
 	}
 
@@ -262,7 +261,7 @@ func TestGenerateOCICreatedAnnotations(t *testing.T) {
 		t.Errorf("%s annotation not created", ocispec.AnnotationCreated)
 	}
 
-	if createdTimeAnnotation, err := helmtime.Parse(time.RFC3339, result[ocispec.AnnotationCreated]); err != nil {
+	if createdTimeAnnotation, err := time.Parse(time.RFC3339, result[ocispec.AnnotationCreated]); err != nil {
 		t.Errorf("%s annotation with value '%s' not in RFC3339 format", ocispec.AnnotationCreated, result[ocispec.AnnotationCreated])
 
 		// Verify creation annotation after time test began
diff --git a/pkg/release/v1/hook.go b/pkg/release/v1/hook.go
index 1ef5c1eb8..b7d3c3992 100644
--- a/pkg/release/v1/hook.go
+++ b/pkg/release/v1/hook.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"helm.sh/helm/v4/pkg/time"
+	"time"
 )
 
 // HookEvent specifies the hook event
@@ -97,9 +97,9 @@ type Hook struct {
 // A HookExecution records the result for the last execution of a hook for a given release.
 type HookExecution struct {
 	// StartedAt indicates the date/time this hook was started
-	StartedAt time.Time `json:"started_at,omitempty"`
+	StartedAt time.Time `json:"started_at,omitzero"`
 	// CompletedAt indicates the date/time this hook was completed.
-	CompletedAt time.Time `json:"completed_at,omitempty"`
+	CompletedAt time.Time `json:"completed_at,omitzero"`
 	// Phase indicates whether the hook completed successfully
 	Phase HookPhase `json:"phase"`
 }
diff --git a/pkg/release/v1/info.go b/pkg/release/v1/info.go
index ff98ab63e..cef7e9960 100644
--- a/pkg/release/v1/info.go
+++ b/pkg/release/v1/info.go
@@ -16,19 +16,19 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime"
+	"time"
 
-	"helm.sh/helm/v4/pkg/time"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // Info describes release information.
 type Info struct {
 	// FirstDeployed is when the release was first deployed.
-	FirstDeployed time.Time `json:"first_deployed,omitempty"`
+	FirstDeployed time.Time `json:"first_deployed,omitzero"`
 	// LastDeployed is when the release was last deployed.
-	LastDeployed time.Time `json:"last_deployed,omitempty"`
+	LastDeployed time.Time `json:"last_deployed,omitzero"`
 	// Deleted tracks when this object was deleted.
-	Deleted time.Time `json:"deleted"`
+	Deleted time.Time `json:"deleted,omitzero"`
 	// Description is human-friendly "log entry" about this release.
 	Description string `json:"description,omitempty"`
 	// Status is the current state of the release
diff --git a/pkg/release/v1/mock.go b/pkg/release/v1/mock.go
index c3a6594cc..818cd777e 100644
--- a/pkg/release/v1/mock.go
+++ b/pkg/release/v1/mock.go
@@ -19,10 +19,10 @@ package v1
 import (
 	"fmt"
 	"math/rand"
+	"time"
 
 	"helm.sh/helm/v4/pkg/chart/common"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
-	"helm.sh/helm/v4/pkg/time"
 )
 
 // MockHookTemplate is the hook template used for all mock release objects.
diff --git a/pkg/release/v1/util/sorter_test.go b/pkg/release/v1/util/sorter_test.go
index 4628a5192..0889ddb94 100644
--- a/pkg/release/v1/util/sorter_test.go
+++ b/pkg/release/v1/util/sorter_test.go
@@ -21,7 +21,6 @@ import (
 	"time"
 
 	rspb "helm.sh/helm/v4/pkg/release/v1"
-	helmtime "helm.sh/helm/v4/pkg/time"
 )
 
 // note: this test data is shared with filter_test.go.
@@ -34,7 +33,7 @@ var releases = []*rspb.Release{
 }
 
 func tsRelease(name string, vers int, dur time.Duration, status rspb.Status) *rspb.Release {
-	info := &rspb.Info{Status: status, LastDeployed: helmtime.Now().Add(dur)}
+	info := &rspb.Info{Status: status, LastDeployed: time.Now().Add(dur)}
 	return &rspb.Release{
 		Name:    name,
 		Version: vers,
diff --git a/pkg/time/ctime/ctime.go b/pkg/time/ctime/ctime.go
deleted file mode 100644
index 63a41c0bf..000000000
--- a/pkg/time/ctime/ctime.go
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-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 ctime
-
-import (
-	"os"
-	"time"
-)
-
-func Created(fi os.FileInfo) time.Time {
-	return modified(fi)
-}
-
-func Modified(fi os.FileInfo) time.Time {
-	return modified(fi)
-}
diff --git a/pkg/time/ctime/ctime_linux.go b/pkg/time/ctime/ctime_linux.go
deleted file mode 100644
index d8a6ea1a1..000000000
--- a/pkg/time/ctime/ctime_linux.go
+++ /dev/null
@@ -1,30 +0,0 @@
-//go:build linux
-
-/*
-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 ctime
-
-import (
-	"os"
-	"syscall"
-	"time"
-)
-
-func modified(fi os.FileInfo) time.Time {
-	st := fi.Sys().(*syscall.Stat_t)
-	//nolint
-	return time.Unix(int64(st.Mtim.Sec), int64(st.Mtim.Nsec))
-}
diff --git a/pkg/time/ctime/ctime_other.go b/pkg/time/ctime/ctime_other.go
deleted file mode 100644
index 12afc6df2..000000000
--- a/pkg/time/ctime/ctime_other.go
+++ /dev/null
@@ -1,27 +0,0 @@
-//go:build !linux
-
-/*
-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 ctime
-
-import (
-	"os"
-	"time"
-)
-
-func modified(fi os.FileInfo) time.Time {
-	return fi.ModTime()
-}
diff --git a/pkg/time/time.go b/pkg/time/time.go
deleted file mode 100644
index 16973b455..000000000
--- a/pkg/time/time.go
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-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 time contains a wrapper for time.Time in the standard library and
-// associated methods. This package mainly exists to work around an issue in Go
-// where the serializer doesn't omit an empty value for time:
-// https://github.com/golang/go/issues/11939. As such, this can be removed if a
-// proposal is ever accepted for Go
-package time
-
-import (
-	"bytes"
-	"time"
-)
-
-// emptyString contains an empty JSON string value to be used as output
-var emptyString = `""`
-
-// Time is a convenience wrapper around stdlib time, but with different
-// marshalling and unmarshalling for zero values
-type Time struct {
-	time.Time
-}
-
-// Now returns the current time. It is a convenience wrapper around time.Now()
-func Now() Time {
-	return Time{time.Now()}
-}
-
-func (t Time) MarshalJSON() ([]byte, error) {
-	if t.IsZero() {
-		return []byte(emptyString), nil
-	}
-
-	return t.Time.MarshalJSON()
-}
-
-func (t *Time) UnmarshalJSON(b []byte) error {
-	if bytes.Equal(b, []byte("null")) {
-		return nil
-	}
-	// If it is empty, we don't have to set anything since time.Time is not a
-	// pointer and will be set to the zero value
-	if bytes.Equal([]byte(emptyString), b) {
-		return nil
-	}
-
-	return t.Time.UnmarshalJSON(b)
-}
-
-func Parse(layout, value string) (Time, error) {
-	t, err := time.Parse(layout, value)
-	return Time{Time: t}, err
-}
-
-func ParseInLocation(layout, value string, loc *time.Location) (Time, error) {
-	t, err := time.ParseInLocation(layout, value, loc)
-	return Time{Time: t}, err
-}
-
-func Date(year int, month time.Month, day, hour, minute, second, nanoSecond int, loc *time.Location) Time {
-	return Time{Time: time.Date(year, month, day, hour, minute, second, nanoSecond, loc)}
-}
-
-func Unix(sec int64, nsec int64) Time { return Time{Time: time.Unix(sec, nsec)} }
-
-func (t Time) Add(d time.Duration) Time { return Time{Time: t.Time.Add(d)} }
-func (t Time) AddDate(years int, months int, days int) Time {
-	return Time{Time: t.Time.AddDate(years, months, days)}
-}
-func (t Time) After(u Time) bool             { return t.Time.After(u.Time) }
-func (t Time) Before(u Time) bool            { return t.Time.Before(u.Time) }
-func (t Time) Equal(u Time) bool             { return t.Time.Equal(u.Time) }
-func (t Time) In(loc *time.Location) Time    { return Time{Time: t.Time.In(loc)} }
-func (t Time) Local() Time                   { return Time{Time: t.Time.Local()} }
-func (t Time) Round(d time.Duration) Time    { return Time{Time: t.Time.Round(d)} }
-func (t Time) Sub(u Time) time.Duration      { return t.Time.Sub(u.Time) }
-func (t Time) Truncate(d time.Duration) Time { return Time{Time: t.Time.Truncate(d)} }
-func (t Time) UTC() Time                     { return Time{Time: t.Time.UTC()} }
diff --git a/pkg/time/time_test.go b/pkg/time/time_test.go
deleted file mode 100644
index 342ca4a10..000000000
--- a/pkg/time/time_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-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 time
-
-import (
-	"encoding/json"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var (
-	timeParseString = `"1977-09-02T22:04:05Z"`
-	timeString      = "1977-09-02 22:04:05 +0000 UTC"
-)
-
-func givenTime(t *testing.T) Time {
-	t.Helper()
-	result, err := Parse(time.RFC3339, "1977-09-02T22:04:05Z")
-	require.NoError(t, err)
-	return result
-}
-
-func TestDate(t *testing.T) {
-	testingTime := givenTime(t)
-	got := Date(1977, 9, 2, 22, 04, 05, 0, time.UTC)
-	assert.Equal(t, timeString, got.String())
-	assert.True(t, testingTime.Equal(got))
-	assert.True(t, got.Equal(testingTime))
-}
-
-func TestNow(t *testing.T) {
-	testingTime := givenTime(t)
-	got := Now()
-	assert.True(t, testingTime.Before(got))
-	assert.True(t, got.After(testingTime))
-}
-
-func TestTime_Add(t *testing.T) {
-	testingTime := givenTime(t)
-	got := testingTime.Add(time.Hour)
-	assert.Equal(t, timeString, testingTime.String())
-	assert.Equal(t, "1977-09-02 23:04:05 +0000 UTC", got.String())
-}
-
-func TestTime_AddDate(t *testing.T) {
-	testingTime := givenTime(t)
-	got := testingTime.AddDate(1, 1, 1)
-	assert.Equal(t, "1978-10-03 22:04:05 +0000 UTC", got.String())
-}
-
-func TestTime_In(t *testing.T) {
-	testingTime := givenTime(t)
-	edt, err := time.LoadLocation("America/New_York")
-	assert.NoError(t, err)
-	got := testingTime.In(edt)
-	assert.Equal(t, "America/New_York", got.Location().String())
-}
-
-func TestTime_MarshalJSONNonZero(t *testing.T) {
-	testingTime := givenTime(t)
-	res, err := json.Marshal(testingTime)
-	assert.NoError(t, err)
-	assert.Equal(t, timeParseString, string(res))
-}
-
-func TestTime_MarshalJSONZeroValue(t *testing.T) {
-	res, err := json.Marshal(Time{})
-	assert.NoError(t, err)
-	assert.Equal(t, `""`, string(res))
-}
-
-func TestTime_Round(t *testing.T) {
-	testingTime := givenTime(t)
-	got := testingTime.Round(time.Hour)
-	assert.Equal(t, timeString, testingTime.String())
-	assert.Equal(t, "1977-09-02 22:00:00 +0000 UTC", got.String())
-}
-
-func TestTime_Sub(t *testing.T) {
-	testingTime := givenTime(t)
-	before, err := Parse(time.RFC3339, "1977-09-01T22:04:05Z")
-	require.NoError(t, err)
-	got := testingTime.Sub(before)
-	assert.Equal(t, "24h0m0s", got.String())
-}
-
-func TestTime_Truncate(t *testing.T) {
-	testingTime := givenTime(t)
-	got := testingTime.Truncate(time.Hour)
-	assert.Equal(t, timeString, testingTime.String())
-	assert.Equal(t, "1977-09-02 22:00:00 +0000 UTC", got.String())
-}
-
-func TestTime_UTC(t *testing.T) {
-	edtTime, err := Parse(time.RFC3339, "1977-09-03T05:04:05+07:00")
-	require.NoError(t, err)
-	got := edtTime.UTC()
-	assert.Equal(t, timeString, got.String())
-}
-
-func TestTime_UnmarshalJSONNonZeroValue(t *testing.T) {
-	testingTime := givenTime(t)
-	var myTime Time
-	err := json.Unmarshal([]byte(timeParseString), &myTime)
-	assert.NoError(t, err)
-	assert.True(t, testingTime.Equal(myTime))
-}
-
-func TestTime_UnmarshalJSONEmptyString(t *testing.T) {
-	var myTime Time
-	err := json.Unmarshal([]byte(emptyString), &myTime)
-	assert.NoError(t, err)
-	assert.True(t, myTime.IsZero())
-}
-
-func TestTime_UnmarshalJSONNullString(t *testing.T) {
-	var myTime Time
-	err := json.Unmarshal([]byte("null"), &myTime)
-	assert.NoError(t, err)
-	assert.True(t, myTime.IsZero())
-}
-
-func TestTime_UnmarshalJSONZeroValue(t *testing.T) {
-	// This test ensures that we can unmarshal any time value that was output
-	// with the current go default value of "0001-01-01T00:00:00Z"
-	var myTime Time
-	err := json.Unmarshal([]byte(`"0001-01-01T00:00:00Z"`), &myTime)
-	assert.NoError(t, err)
-	assert.True(t, myTime.IsZero())
-}
-
-func TestUnix(t *testing.T) {
-	got := Unix(242085845, 0)
-	assert.Equal(t, int64(242085845), got.Unix())
-	assert.Equal(t, timeString, got.UTC().String())
-}

From 8dc7c57f504603fa6e8c3359f48cf76f40663821 Mon Sep 17 00:00:00 2001
From: Matt Farina <matt.farina@suse.com>
Date: Wed, 17 Sep 2025 15:19:02 -0400
Subject: [PATCH 211/211] Update the action interfaces for chart apiversions

This change is about handling the interfaces to public functions for
different chart apiVersions. The internals are still focused on v2.
This enables v3 to be layered in layer.

Signed-off-by: Matt Farina <matt.farina@suse.com>
---
 internal/chart/v3/loader/archive.go           | 166 +--------------
 internal/chart/v3/loader/directory.go         |   9 +-
 internal/chart/v3/loader/load.go              |  15 +-
 internal/chart/v3/loader/load_test.go         |   7 +-
 internal/chart/v3/util/expand.go              |   4 +-
 pkg/action/install.go                         |  36 +++-
 pkg/action/install_test.go                    |   3 +-
 pkg/action/package.go                         |  35 +++-
 pkg/action/upgrade.go                         |  23 ++-
 pkg/chart/common.go                           |  24 +++
 pkg/chart/dependency.go                       |  56 +++++
 pkg/chart/interfaces.go                       |   8 +
 pkg/chart/loader/archive/archive.go           | 195 ++++++++++++++++++
 .../chart/loader/archive}/archive_test.go     |   2 +-
 pkg/chart/loader/load.go                      | 163 +++++++++++++++
 pkg/chart/v2/loader/archive.go                | 166 +--------------
 pkg/chart/v2/loader/archive_test.go           |  92 ---------
 pkg/chart/v2/loader/directory.go              |   9 +-
 pkg/chart/v2/loader/load.go                   |  15 +-
 pkg/chart/v2/loader/load_test.go              |  11 +-
 pkg/chart/v2/util/expand.go                   |   4 +-
 pkg/cmd/install.go                            |  23 ++-
 pkg/cmd/upgrade.go                            |  12 +-
 23 files changed, 590 insertions(+), 488 deletions(-)
 create mode 100644 pkg/chart/dependency.go
 create mode 100644 pkg/chart/loader/archive/archive.go
 rename {internal/chart/v3/loader => pkg/chart/loader/archive}/archive_test.go (99%)
 create mode 100644 pkg/chart/loader/load.go
 delete mode 100644 pkg/chart/v2/loader/archive_test.go

diff --git a/internal/chart/v3/loader/archive.go b/internal/chart/v3/loader/archive.go
index 311959d56..358c2ce4d 100644
--- a/internal/chart/v3/loader/archive.go
+++ b/internal/chart/v3/loader/archive.go
@@ -17,32 +17,16 @@ limitations under the License.
 package loader
 
 import (
-	"archive/tar"
-	"bytes"
 	"compress/gzip"
 	"errors"
 	"fmt"
 	"io"
-	"net/http"
 	"os"
-	"path"
-	"regexp"
-	"strings"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 )
 
-// MaxDecompressedChartSize is the maximum size of a chart archive that will be
-// decompressed. This is the decompressed size of all the files.
-// The default value is 100 MiB.
-var MaxDecompressedChartSize int64 = 100 * 1024 * 1024 // Default 100 MiB
-
-// MaxDecompressedFileSize is the size of the largest file that Helm will attempt to load.
-// The size of the file is the decompressed version of it when it is stored in an archive.
-var MaxDecompressedFileSize int64 = 5 * 1024 * 1024 // Default 5 MiB
-
-var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)
-
 // FileLoader loads a chart from a file
 type FileLoader string
 
@@ -65,7 +49,7 @@ func LoadFile(name string) (*chart.Chart, error) {
 	}
 	defer raw.Close()
 
-	err = ensureArchive(name, raw)
+	err = archive.EnsureArchive(name, raw)
 	if err != nil {
 		return nil, err
 	}
@@ -79,153 +63,9 @@ func LoadFile(name string) (*chart.Chart, error) {
 	return c, err
 }
 
-// ensureArchive's job is to return an informative error if the file does not appear to be a gzipped archive.
-//
-// Sometimes users will provide a values.yaml for an argument where a chart is expected. One common occurrence
-// of this is invoking `helm template values.yaml mychart` which would otherwise produce a confusing error
-// if we didn't check for this.
-func ensureArchive(name string, raw *os.File) error {
-	defer raw.Seek(0, 0) // reset read offset to allow archive loading to proceed.
-
-	// Check the file format to give us a chance to provide the user with more actionable feedback.
-	buffer := make([]byte, 512)
-	_, err := raw.Read(buffer)
-	if err != nil && err != io.EOF {
-		return fmt.Errorf("file '%s' cannot be read: %s", name, err)
-	}
-
-	// Helm may identify achieve of the application/x-gzip as application/vnd.ms-fontobject.
-	// Fix for: https://github.com/helm/helm/issues/12261
-	if contentType := http.DetectContentType(buffer); contentType != "application/x-gzip" && !isGZipApplication(buffer) {
-		// TODO: Is there a way to reliably test if a file content is YAML? ghodss/yaml accepts a wide
-		//       variety of content (Makefile, .zshrc) as valid YAML without errors.
-
-		// Wrong content type. Let's check if it's yaml and give an extra hint?
-		if strings.HasSuffix(name, ".yml") || strings.HasSuffix(name, ".yaml") {
-			return fmt.Errorf("file '%s' seems to be a YAML file, but expected a gzipped archive", name)
-		}
-		return fmt.Errorf("file '%s' does not appear to be a gzipped archive; got '%s'", name, contentType)
-	}
-	return nil
-}
-
-// isGZipApplication checks whether the archive is of the application/x-gzip type.
-func isGZipApplication(data []byte) bool {
-	sig := []byte("\x1F\x8B\x08")
-	return bytes.HasPrefix(data, sig)
-}
-
-// LoadArchiveFiles reads in files out of an archive into memory. This function
-// performs important path security checks and should always be used before
-// expanding a tarball
-func LoadArchiveFiles(in io.Reader) ([]*BufferedFile, error) {
-	unzipped, err := gzip.NewReader(in)
-	if err != nil {
-		return nil, err
-	}
-	defer unzipped.Close()
-
-	files := []*BufferedFile{}
-	tr := tar.NewReader(unzipped)
-	remainingSize := MaxDecompressedChartSize
-	for {
-		b := bytes.NewBuffer(nil)
-		hd, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		if hd.FileInfo().IsDir() {
-			// Use this instead of hd.Typeflag because we don't have to do any
-			// inference chasing.
-			continue
-		}
-
-		switch hd.Typeflag {
-		// We don't want to process these extension header files.
-		case tar.TypeXGlobalHeader, tar.TypeXHeader:
-			continue
-		}
-
-		// Archive could contain \ if generated on Windows
-		delimiter := "/"
-		if strings.ContainsRune(hd.Name, '\\') {
-			delimiter = "\\"
-		}
-
-		parts := strings.Split(hd.Name, delimiter)
-		n := strings.Join(parts[1:], delimiter)
-
-		// Normalize the path to the / delimiter
-		n = strings.ReplaceAll(n, delimiter, "/")
-
-		if path.IsAbs(n) {
-			return nil, errors.New("chart illegally contains absolute paths")
-		}
-
-		n = path.Clean(n)
-		if n == "." {
-			// In this case, the original path was relative when it should have been absolute.
-			return nil, fmt.Errorf("chart illegally contains content outside the base directory: %q", hd.Name)
-		}
-		if strings.HasPrefix(n, "..") {
-			return nil, errors.New("chart illegally references parent directory")
-		}
-
-		// In some particularly arcane acts of path creativity, it is possible to intermix
-		// UNIX and Windows style paths in such a way that you produce a result of the form
-		// c:/foo even after all the built-in absolute path checks. So we explicitly check
-		// for this condition.
-		if drivePathPattern.MatchString(n) {
-			return nil, errors.New("chart contains illegally named files")
-		}
-
-		if parts[0] == "Chart.yaml" {
-			return nil, errors.New("chart yaml not in base directory")
-		}
-
-		if hd.Size > remainingSize {
-			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
-		}
-
-		if hd.Size > MaxDecompressedFileSize {
-			return nil, fmt.Errorf("decompressed chart file %q is larger than the maximum file size %d", hd.Name, MaxDecompressedFileSize)
-		}
-
-		limitedReader := io.LimitReader(tr, remainingSize)
-
-		bytesWritten, err := io.Copy(b, limitedReader)
-		if err != nil {
-			return nil, err
-		}
-
-		remainingSize -= bytesWritten
-		// When the bytesWritten are less than the file size it means the limit reader ended
-		// copying early. Here we report that error. This is important if the last file extracted
-		// is the one that goes over the limit. It assumes the Size stored in the tar header
-		// is correct, something many applications do.
-		if bytesWritten < hd.Size || remainingSize <= 0 {
-			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
-		}
-
-		data := bytes.TrimPrefix(b.Bytes(), utf8bom)
-
-		files = append(files, &BufferedFile{Name: n, Data: data})
-		b.Reset()
-	}
-
-	if len(files) == 0 {
-		return nil, errors.New("no files in chart archive")
-	}
-	return files, nil
-}
-
 // LoadArchive loads from a reader containing a compressed tar archive.
 func LoadArchive(in io.Reader) (*chart.Chart, error) {
-	files, err := LoadArchiveFiles(in)
+	files, err := archive.LoadArchiveFiles(in)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/chart/v3/loader/directory.go b/internal/chart/v3/loader/directory.go
index 947051604..8cb7323dc 100644
--- a/internal/chart/v3/loader/directory.go
+++ b/internal/chart/v3/loader/directory.go
@@ -25,6 +25,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/internal/sympath"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	"helm.sh/helm/v4/pkg/ignore"
 )
 
@@ -61,7 +62,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 	}
 	rules.AddDefaults()
 
-	files := []*BufferedFile{}
+	files := []*archive.BufferedFile{}
 	topdir += string(filepath.Separator)
 
 	walk := func(name string, fi os.FileInfo, err error) error {
@@ -99,8 +100,8 @@ func LoadDir(dir string) (*chart.Chart, error) {
 			return fmt.Errorf("cannot load irregular file %s as it has file mode type bits set", name)
 		}
 
-		if fi.Size() > MaxDecompressedFileSize {
-			return fmt.Errorf("chart file %q is larger than the maximum file size %d", fi.Name(), MaxDecompressedFileSize)
+		if fi.Size() > archive.MaxDecompressedFileSize {
+			return fmt.Errorf("chart file %q is larger than the maximum file size %d", fi.Name(), archive.MaxDecompressedFileSize)
 		}
 
 		data, err := os.ReadFile(name)
@@ -110,7 +111,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 
 		data = bytes.TrimPrefix(data, utf8bom)
 
-		files = append(files, &BufferedFile{Name: n, Data: data})
+		files = append(files, &archive.BufferedFile{Name: n, Data: data})
 		return nil
 	}
 	if err = sympath.Walk(topdir, walk); err != nil {
diff --git a/internal/chart/v3/loader/load.go b/internal/chart/v3/loader/load.go
index 2959fc71d..b1b4bba8f 100644
--- a/internal/chart/v3/loader/load.go
+++ b/internal/chart/v3/loader/load.go
@@ -32,6 +32,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 )
 
 // ChartLoader loads a chart.
@@ -66,16 +67,10 @@ func Load(name string) (*chart.Chart, error) {
 	return l.Load()
 }
 
-// BufferedFile represents an archive file buffered for later processing.
-type BufferedFile struct {
-	Name string
-	Data []byte
-}
-
 // LoadFiles loads from in-memory files.
-func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
+func LoadFiles(files []*archive.BufferedFile) (*chart.Chart, error) {
 	c := new(chart.Chart)
-	subcharts := make(map[string][]*BufferedFile)
+	subcharts := make(map[string][]*archive.BufferedFile)
 
 	// do not rely on assumed ordering of files in the chart and crash
 	// if Chart.yaml was not coming early enough to initialize metadata
@@ -125,7 +120,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 
 			fname := strings.TrimPrefix(f.Name, "charts/")
 			cname := strings.SplitN(fname, "/", 2)[0]
-			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
+			subcharts[cname] = append(subcharts[cname], &archive.BufferedFile{Name: fname, Data: f.Data})
 		default:
 			c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 		}
@@ -155,7 +150,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 		default:
 			// We have to trim the prefix off of every file, and ignore any file
 			// that is in charts/, but isn't actually a chart.
-			buff := make([]*BufferedFile, 0, len(files))
+			buff := make([]*archive.BufferedFile, 0, len(files))
 			for _, f := range files {
 				parts := strings.SplitN(f.Name, "/", 2)
 				if len(parts) < 2 {
diff --git a/internal/chart/v3/loader/load_test.go b/internal/chart/v3/loader/load_test.go
index 1d8ca836a..9f41429cc 100644
--- a/internal/chart/v3/loader/load_test.go
+++ b/internal/chart/v3/loader/load_test.go
@@ -32,6 +32,7 @@ import (
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
 	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 )
 
 func TestLoadDir(t *testing.T) {
@@ -183,7 +184,7 @@ func TestLoadFile(t *testing.T) {
 }
 
 func TestLoadFiles(t *testing.T) {
-	goodFiles := []*BufferedFile{
+	goodFiles := []*archive.BufferedFile{
 		{
 			Name: "Chart.yaml",
 			Data: []byte(`apiVersion: v3
@@ -248,7 +249,7 @@ icon: https://example.com/64x64.png
 		t.Errorf("Expected number of templates == 2, got %d", len(c.Templates))
 	}
 
-	if _, err = LoadFiles([]*BufferedFile{}); err == nil {
+	if _, err = LoadFiles([]*archive.BufferedFile{}); err == nil {
 		t.Fatal("Expected err to be non-nil")
 	}
 	if err.Error() != "Chart.yaml file is missing" {
@@ -259,7 +260,7 @@ icon: https://example.com/64x64.png
 // Test the order of file loading. The Chart.yaml file needs to come first for
 // later comparison checks. See https://github.com/helm/helm/pull/8948
 func TestLoadFilesOrder(t *testing.T) {
-	goodFiles := []*BufferedFile{
+	goodFiles := []*archive.BufferedFile{
 		{
 			Name: "requirements.yaml",
 			Data: []byte("dependencies:"),
diff --git a/internal/chart/v3/util/expand.go b/internal/chart/v3/util/expand.go
index 6cbbeabf2..1a10fce3c 100644
--- a/internal/chart/v3/util/expand.go
+++ b/internal/chart/v3/util/expand.go
@@ -27,12 +27,12 @@ import (
 	"sigs.k8s.io/yaml"
 
 	chart "helm.sh/helm/v4/internal/chart/v3"
-	"helm.sh/helm/v4/internal/chart/v3/loader"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 )
 
 // Expand uncompresses and extracts a chart into the specified directory.
 func Expand(dir string, r io.Reader) error {
-	files, err := loader.LoadArchiveFiles(r)
+	files, err := archive.LoadArchiveFiles(r)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/action/install.go b/pkg/action/install.go
index 5ae12904d..c6d4f723c 100644
--- a/pkg/action/install.go
+++ b/pkg/action/install.go
@@ -42,6 +42,7 @@ import (
 	"k8s.io/cli-runtime/pkg/resource"
 	"sigs.k8s.io/yaml"
 
+	ci "helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/chart/common/util"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
@@ -243,7 +244,7 @@ func (i *Install) installCRDs(crds []chart.CRD) error {
 //
 // If DryRun is set to true, this will prepare the release, but not install it
 
-func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.Release, error) {
+func (i *Install) Run(chrt ci.Charter, vals map[string]interface{}) (*release.Release, error) {
 	ctx := context.Background()
 	return i.RunWithContext(ctx, chrt, vals)
 }
@@ -252,7 +253,17 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
 //
 // When the task is cancelled through ctx, the function returns and the install
 // proceeds in the background.
-func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals map[string]interface{}) (*release.Release, error) {
+func (i *Install) RunWithContext(ctx context.Context, ch ci.Charter, vals map[string]interface{}) (*release.Release, error) {
+	var chrt *chart.Chart
+	switch c := ch.(type) {
+	case *chart.Chart:
+		chrt = c
+	case chart.Chart:
+		chrt = &c
+	default:
+		return nil, errors.New("invalid chart apiVersion")
+	}
+
 	// Check reachability of cluster unless in client-only mode (e.g. `helm template` without `--validate`)
 	if !i.ClientOnly {
 		if err := i.cfg.KubeClient.IsReachable(); err != nil {
@@ -761,17 +772,30 @@ func TemplateName(nameTemplate string) (string, error) {
 }
 
 // CheckDependencies checks the dependencies for a chart.
-func CheckDependencies(ch *chart.Chart, reqs []*chart.Dependency) error {
+func CheckDependencies(ch ci.Charter, reqs []ci.Dependency) error {
+	ac, err := ci.NewAccessor(ch)
+	if err != nil {
+		return err
+	}
+
 	var missing []string
 
 OUTER:
 	for _, r := range reqs {
-		for _, d := range ch.Dependencies() {
-			if d.Name() == r.Name {
+		rac, err := ci.NewDependencyAccessor(r)
+		if err != nil {
+			return err
+		}
+		for _, d := range ac.Dependencies() {
+			dac, err := ci.NewAccessor(d)
+			if err != nil {
+				return err
+			}
+			if dac.Name() == rac.Name() {
 				continue OUTER
 			}
 		}
-		missing = append(missing, r.Name)
+		missing = append(missing, rac.Name())
 	}
 
 	if len(missing) > 0 {
diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go
index b2b1508be..e90857a3f 100644
--- a/pkg/action/install_test.go
+++ b/pkg/action/install_test.go
@@ -1004,7 +1004,8 @@ func TestInstallRun_UnreachableKubeClient(t *testing.T) {
 	instAction := NewInstall(config)
 	instAction.ClientOnly = false
 	ctx, done := context.WithCancel(t.Context())
-	res, err := instAction.RunWithContext(ctx, nil, nil)
+	chrt := buildChart()
+	res, err := instAction.RunWithContext(ctx, chrt, nil)
 
 	done()
 	assert.Nil(t, res)
diff --git a/pkg/action/package.go b/pkg/action/package.go
index 6e762b507..92a9a8cb6 100644
--- a/pkg/action/package.go
+++ b/pkg/action/package.go
@@ -28,7 +28,9 @@ import (
 	"golang.org/x/term"
 	"sigs.k8s.io/yaml"
 
-	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	ci "helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/loader"
+	chart "helm.sh/helm/v4/pkg/chart/v2"
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/provenance"
 )
@@ -69,7 +71,21 @@ func NewPackage() *Package {
 
 // Run executes 'helm package' against the given chart and returns the path to the packaged chart.
 func (p *Package) Run(path string, _ map[string]interface{}) (string, error) {
-	ch, err := loader.LoadDir(path)
+	chrt, err := loader.LoadDir(path)
+	if err != nil {
+		return "", err
+	}
+	var ch *chart.Chart
+	switch c := chrt.(type) {
+	case *chart.Chart:
+		ch = c
+	case chart.Chart:
+		ch = &c
+	default:
+		return "", errors.New("invalid chart apiVersion")
+	}
+
+	ac, err := ci.NewAccessor(ch)
 	if err != nil {
 		return "", err
 	}
@@ -87,7 +103,7 @@ func (p *Package) Run(path string, _ map[string]interface{}) (string, error) {
 		ch.Metadata.AppVersion = p.AppVersion
 	}
 
-	if reqs := ch.Metadata.Dependencies; reqs != nil {
+	if reqs := ac.MetaDependencies(); reqs != nil {
 		if err := CheckDependencies(ch, reqs); err != nil {
 			return "", err
 		}
@@ -146,13 +162,22 @@ func (p *Package) Clearsign(filename string) error {
 	}
 
 	// Load the chart archive to extract metadata
-	chart, err := loader.LoadFile(filename)
+	chrt, err := loader.LoadFile(filename)
 	if err != nil {
 		return fmt.Errorf("failed to load chart for signing: %w", err)
 	}
+	var ch *chart.Chart
+	switch c := chrt.(type) {
+	case *chart.Chart:
+		ch = c
+	case chart.Chart:
+		ch = &c
+	default:
+		return errors.New("invalid chart apiVersion")
+	}
 
 	// Marshal chart metadata to YAML bytes
-	metadataBytes, err := yaml.Marshal(chart.Metadata)
+	metadataBytes, err := yaml.Marshal(ch.Metadata)
 	if err != nil {
 		return fmt.Errorf("failed to marshal chart metadata: %w", err)
 	}
diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go
index 3688adf0e..3c84570b2 100644
--- a/pkg/action/upgrade.go
+++ b/pkg/action/upgrade.go
@@ -28,9 +28,10 @@ import (
 
 	"k8s.io/cli-runtime/pkg/resource"
 
+	"helm.sh/helm/v4/pkg/chart"
 	"helm.sh/helm/v4/pkg/chart/common"
 	"helm.sh/helm/v4/pkg/chart/common/util"
-	chart "helm.sh/helm/v4/pkg/chart/v2"
+	chartv2 "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/postrenderer"
@@ -151,17 +152,27 @@ func (u *Upgrade) SetRegistryClient(client *registry.Client) {
 }
 
 // Run executes the upgrade on the given release.
-func (u *Upgrade) Run(name string, chart *chart.Chart, vals map[string]interface{}) (*release.Release, error) {
+func (u *Upgrade) Run(name string, chart chart.Charter, vals map[string]interface{}) (*release.Release, error) {
 	ctx := context.Background()
 	return u.RunWithContext(ctx, name, chart, vals)
 }
 
 // RunWithContext executes the upgrade on the given release with context.
-func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart.Chart, vals map[string]interface{}) (*release.Release, error) {
+func (u *Upgrade) RunWithContext(ctx context.Context, name string, ch chart.Charter, vals map[string]interface{}) (*release.Release, error) {
 	if err := u.cfg.KubeClient.IsReachable(); err != nil {
 		return nil, err
 	}
 
+	var chrt *chartv2.Chart
+	switch c := ch.(type) {
+	case *chartv2.Chart:
+		chrt = c
+	case chartv2.Chart:
+		chrt = &c
+	default:
+		return nil, errors.New("invalid chart apiVersion")
+	}
+
 	// Make sure wait is set if RollbackOnFailure. This makes it so
 	// the user doesn't have to specify both
 	if u.WaitStrategy == kube.HookOnlyStrategy && u.RollbackOnFailure {
@@ -173,7 +184,7 @@ func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart.
 	}
 
 	slog.Debug("preparing upgrade", "name", name)
-	currentRelease, upgradedRelease, serverSideApply, err := u.prepareUpgrade(name, chart, vals)
+	currentRelease, upgradedRelease, serverSideApply, err := u.prepareUpgrade(name, chrt, vals)
 	if err != nil {
 		return nil, err
 	}
@@ -206,7 +217,7 @@ func (u *Upgrade) isDryRun() bool {
 }
 
 // prepareUpgrade builds an upgraded release for an upgrade operation.
-func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[string]interface{}) (*release.Release, *release.Release, bool, error) {
+func (u *Upgrade) prepareUpgrade(name string, chart *chartv2.Chart, vals map[string]interface{}) (*release.Release, *release.Release, bool, error) {
 	if chart == nil {
 		return nil, nil, false, errMissingChart
 	}
@@ -578,7 +589,7 @@ func (u *Upgrade) failRelease(rel *release.Release, created kube.ResourceList, e
 //
 // This is skipped if the u.ResetValues flag is set, in which case the
 // request values are not altered.
-func (u *Upgrade) reuseValues(chart *chart.Chart, current *release.Release, newVals map[string]interface{}) (map[string]interface{}, error) {
+func (u *Upgrade) reuseValues(chart *chartv2.Chart, current *release.Release, newVals map[string]interface{}) (map[string]interface{}, error) {
 	if u.ResetValues {
 		// If ResetValues is set, we completely ignore current.Config.
 		slog.Debug("resetting values to the chart's original version")
diff --git a/pkg/chart/common.go b/pkg/chart/common.go
index 8b1dd58c3..8080f3dc8 100644
--- a/pkg/chart/common.go
+++ b/pkg/chart/common.go
@@ -93,6 +93,14 @@ func (r *v2Accessor) Dependencies() []Charter {
 	return deps
 }
 
+func (r *v2Accessor) MetaDependencies() []Dependency {
+	var deps = make([]Dependency, len(r.chrt.Metadata.Dependencies))
+	for i, c := range r.chrt.Metadata.Dependencies {
+		deps[i] = c
+	}
+	return deps
+}
+
 func (r *v2Accessor) Values() map[string]interface{} {
 	return r.chrt.Values
 }
@@ -101,6 +109,10 @@ func (r *v2Accessor) Schema() []byte {
 	return r.chrt.Schema
 }
 
+func (r *v2Accessor) Deprecated() bool {
+	return r.chrt.Metadata.Deprecated
+}
+
 type v3Accessor struct {
 	chrt *v3chart.Chart
 }
@@ -150,6 +162,14 @@ func (r *v3Accessor) Dependencies() []Charter {
 	return deps
 }
 
+func (r *v3Accessor) MetaDependencies() []Dependency {
+	var deps = make([]Dependency, len(r.chrt.Dependencies()))
+	for i, c := range r.chrt.Metadata.Dependencies {
+		deps[i] = c
+	}
+	return deps
+}
+
 func (r *v3Accessor) Values() map[string]interface{} {
 	return r.chrt.Values
 }
@@ -158,6 +178,10 @@ func (r *v3Accessor) Schema() []byte {
 	return r.chrt.Schema
 }
 
+func (r *v3Accessor) Deprecated() bool {
+	return r.chrt.Metadata.Deprecated
+}
+
 func structToMap(obj interface{}) (map[string]interface{}, error) {
 	objValue := reflect.ValueOf(obj)
 
diff --git a/pkg/chart/dependency.go b/pkg/chart/dependency.go
new file mode 100644
index 000000000..9f7c90364
--- /dev/null
+++ b/pkg/chart/dependency.go
@@ -0,0 +1,56 @@
+/*
+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 chart
+
+import (
+	"errors"
+
+	v3chart "helm.sh/helm/v4/internal/chart/v3"
+	v2chart "helm.sh/helm/v4/pkg/chart/v2"
+)
+
+var NewDependencyAccessor func(dep Dependency) (DependencyAccessor, error) = NewDefaultDependencyAccessor //nolint:revive
+
+func NewDefaultDependencyAccessor(dep Dependency) (DependencyAccessor, error) {
+	switch v := dep.(type) {
+	case v2chart.Dependency:
+		return &v2DependencyAccessor{&v}, nil
+	case *v2chart.Dependency:
+		return &v2DependencyAccessor{v}, nil
+	case v3chart.Dependency:
+		return &v3DependencyAccessor{&v}, nil
+	case *v3chart.Dependency:
+		return &v3DependencyAccessor{v}, nil
+	default:
+		return nil, errors.New("unsupported chart dependency type")
+	}
+}
+
+type v2DependencyAccessor struct {
+	dep *v2chart.Dependency
+}
+
+func (r *v2DependencyAccessor) Name() string {
+	return r.dep.Name
+}
+
+type v3DependencyAccessor struct {
+	dep *v3chart.Dependency
+}
+
+func (r *v3DependencyAccessor) Name() string {
+	return r.dep.Name
+}
diff --git a/pkg/chart/interfaces.go b/pkg/chart/interfaces.go
index e87dd2c08..f9c61c35c 100644
--- a/pkg/chart/interfaces.go
+++ b/pkg/chart/interfaces.go
@@ -21,6 +21,8 @@ import (
 
 type Charter interface{}
 
+type Dependency interface{}
+
 type Accessor interface {
 	Name() string
 	IsRoot() bool
@@ -30,6 +32,12 @@ type Accessor interface {
 	ChartFullPath() string
 	IsLibraryChart() bool
 	Dependencies() []Charter
+	MetaDependencies() []Dependency
 	Values() map[string]interface{}
 	Schema() []byte
+	Deprecated() bool
+}
+
+type DependencyAccessor interface {
+	Name() string
 }
diff --git a/pkg/chart/loader/archive/archive.go b/pkg/chart/loader/archive/archive.go
new file mode 100644
index 000000000..4d4ca4391
--- /dev/null
+++ b/pkg/chart/loader/archive/archive.go
@@ -0,0 +1,195 @@
+/*
+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.
+*/
+
+// archive provides utility functions for working with Helm chart archive files
+package archive
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path"
+	"regexp"
+	"strings"
+)
+
+// MaxDecompressedChartSize is the maximum size of a chart archive that will be
+// decompressed. This is the decompressed size of all the files.
+// The default value is 100 MiB.
+var MaxDecompressedChartSize int64 = 100 * 1024 * 1024 // Default 100 MiB
+
+// MaxDecompressedFileSize is the size of the largest file that Helm will attempt to load.
+// The size of the file is the decompressed version of it when it is stored in an archive.
+var MaxDecompressedFileSize int64 = 5 * 1024 * 1024 // Default 5 MiB
+
+var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)
+
+var utf8bom = []byte{0xEF, 0xBB, 0xBF}
+
+// BufferedFile represents an archive file buffered for later processing.
+type BufferedFile struct {
+	Name string
+	Data []byte
+}
+
+// LoadArchiveFiles reads in files out of an archive into memory. This function
+// performs important path security checks and should always be used before
+// expanding a tarball
+func LoadArchiveFiles(in io.Reader) ([]*BufferedFile, error) {
+	unzipped, err := gzip.NewReader(in)
+	if err != nil {
+		return nil, err
+	}
+	defer unzipped.Close()
+
+	files := []*BufferedFile{}
+	tr := tar.NewReader(unzipped)
+	remainingSize := MaxDecompressedChartSize
+	for {
+		b := bytes.NewBuffer(nil)
+		hd, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		if hd.FileInfo().IsDir() {
+			// Use this instead of hd.Typeflag because we don't have to do any
+			// inference chasing.
+			continue
+		}
+
+		switch hd.Typeflag {
+		// We don't want to process these extension header files.
+		case tar.TypeXGlobalHeader, tar.TypeXHeader:
+			continue
+		}
+
+		// Archive could contain \ if generated on Windows
+		delimiter := "/"
+		if strings.ContainsRune(hd.Name, '\\') {
+			delimiter = "\\"
+		}
+
+		parts := strings.Split(hd.Name, delimiter)
+		n := strings.Join(parts[1:], delimiter)
+
+		// Normalize the path to the / delimiter
+		n = strings.ReplaceAll(n, delimiter, "/")
+
+		if path.IsAbs(n) {
+			return nil, errors.New("chart illegally contains absolute paths")
+		}
+
+		n = path.Clean(n)
+		if n == "." {
+			// In this case, the original path was relative when it should have been absolute.
+			return nil, fmt.Errorf("chart illegally contains content outside the base directory: %q", hd.Name)
+		}
+		if strings.HasPrefix(n, "..") {
+			return nil, errors.New("chart illegally references parent directory")
+		}
+
+		// In some particularly arcane acts of path creativity, it is possible to intermix
+		// UNIX and Windows style paths in such a way that you produce a result of the form
+		// c:/foo even after all the built-in absolute path checks. So we explicitly check
+		// for this condition.
+		if drivePathPattern.MatchString(n) {
+			return nil, errors.New("chart contains illegally named files")
+		}
+
+		if parts[0] == "Chart.yaml" {
+			return nil, errors.New("chart yaml not in base directory")
+		}
+
+		if hd.Size > remainingSize {
+			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
+		}
+
+		if hd.Size > MaxDecompressedFileSize {
+			return nil, fmt.Errorf("decompressed chart file %q is larger than the maximum file size %d", hd.Name, MaxDecompressedFileSize)
+		}
+
+		limitedReader := io.LimitReader(tr, remainingSize)
+
+		bytesWritten, err := io.Copy(b, limitedReader)
+		if err != nil {
+			return nil, err
+		}
+
+		remainingSize -= bytesWritten
+		// When the bytesWritten are less than the file size it means the limit reader ended
+		// copying early. Here we report that error. This is important if the last file extracted
+		// is the one that goes over the limit. It assumes the Size stored in the tar header
+		// is correct, something many applications do.
+		if bytesWritten < hd.Size || remainingSize <= 0 {
+			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
+		}
+
+		data := bytes.TrimPrefix(b.Bytes(), utf8bom)
+
+		files = append(files, &BufferedFile{Name: n, Data: data})
+		b.Reset()
+	}
+
+	if len(files) == 0 {
+		return nil, errors.New("no files in chart archive")
+	}
+	return files, nil
+}
+
+// ensureArchive's job is to return an informative error if the file does not appear to be a gzipped archive.
+//
+// Sometimes users will provide a values.yaml for an argument where a chart is expected. One common occurrence
+// of this is invoking `helm template values.yaml mychart` which would otherwise produce a confusing error
+// if we didn't check for this.
+func EnsureArchive(name string, raw *os.File) error {
+	defer raw.Seek(0, 0) // reset read offset to allow archive loading to proceed.
+
+	// Check the file format to give us a chance to provide the user with more actionable feedback.
+	buffer := make([]byte, 512)
+	_, err := raw.Read(buffer)
+	if err != nil && err != io.EOF {
+		return fmt.Errorf("file '%s' cannot be read: %s", name, err)
+	}
+
+	// Helm may identify achieve of the application/x-gzip as application/vnd.ms-fontobject.
+	// Fix for: https://github.com/helm/helm/issues/12261
+	if contentType := http.DetectContentType(buffer); contentType != "application/x-gzip" && !isGZipApplication(buffer) {
+		// TODO: Is there a way to reliably test if a file content is YAML? ghodss/yaml accepts a wide
+		//       variety of content (Makefile, .zshrc) as valid YAML without errors.
+
+		// Wrong content type. Let's check if it's yaml and give an extra hint?
+		if strings.HasSuffix(name, ".yml") || strings.HasSuffix(name, ".yaml") {
+			return fmt.Errorf("file '%s' seems to be a YAML file, but expected a gzipped archive", name)
+		}
+		return fmt.Errorf("file '%s' does not appear to be a gzipped archive; got '%s'", name, contentType)
+	}
+	return nil
+}
+
+// isGZipApplication checks whether the archive is of the application/x-gzip type.
+func isGZipApplication(data []byte) bool {
+	sig := []byte("\x1F\x8B\x08")
+	return bytes.HasPrefix(data, sig)
+}
diff --git a/internal/chart/v3/loader/archive_test.go b/pkg/chart/loader/archive/archive_test.go
similarity index 99%
rename from internal/chart/v3/loader/archive_test.go
rename to pkg/chart/loader/archive/archive_test.go
index d16c47563..2fe09e9b2 100644
--- a/internal/chart/v3/loader/archive_test.go
+++ b/pkg/chart/loader/archive/archive_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package loader
+package archive
 
 import (
 	"archive/tar"
diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go
new file mode 100644
index 000000000..7a5ddbca9
--- /dev/null
+++ b/pkg/chart/loader/load.go
@@ -0,0 +1,163 @@
+/*
+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 loader
+
+import (
+	"compress/gzip"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"sigs.k8s.io/yaml"
+
+	c3 "helm.sh/helm/v4/internal/chart/v3"
+	c3load "helm.sh/helm/v4/internal/chart/v3/loader"
+	"helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
+	c2 "helm.sh/helm/v4/pkg/chart/v2"
+	c2load "helm.sh/helm/v4/pkg/chart/v2/loader"
+)
+
+// ChartLoader loads a chart.
+type ChartLoader interface {
+	Load() (chart.Charter, error)
+}
+
+// Loader returns a new ChartLoader appropriate for the given chart name
+func Loader(name string) (ChartLoader, error) {
+	fi, err := os.Stat(name)
+	if err != nil {
+		return nil, err
+	}
+	if fi.IsDir() {
+		return DirLoader(name), nil
+	}
+	return FileLoader(name), nil
+}
+
+// Load takes a string name, tries to resolve it to a file or directory, and then loads it.
+//
+// This is the preferred way to load a chart. It will discover the chart encoding
+// and hand off to the appropriate chart reader.
+//
+// If a .helmignore file is present, the directory loader will skip loading any files
+// matching it. But .helmignore is not evaluated when reading out of an archive.
+func Load(name string) (chart.Charter, error) {
+	l, err := Loader(name)
+	if err != nil {
+		return nil, err
+	}
+	return l.Load()
+}
+
+// DirLoader loads a chart from a directory
+type DirLoader string
+
+// Load loads the chart
+func (l DirLoader) Load() (chart.Charter, error) {
+	return LoadDir(string(l))
+}
+
+func LoadDir(dir string) (chart.Charter, error) {
+	topdir, err := filepath.Abs(dir)
+	if err != nil {
+		return nil, err
+	}
+
+	name := filepath.Join(topdir, "Chart.yaml")
+	data, err := os.ReadFile(name)
+	if err != nil {
+		return nil, fmt.Errorf("unable to detect chart at %s: %w", name, err)
+	}
+
+	c := new(chartBase)
+	err = yaml.Unmarshal(data, c)
+	if err != nil {
+		return nil, fmt.Errorf("cannot load Chart.yaml: %w", err)
+	}
+
+	switch c.APIVersion {
+	case c2.APIVersionV1, c2.APIVersionV2, "":
+		return c2load.Load(dir)
+	case c3.APIVersionV3:
+		return c3load.Load(dir)
+	default:
+		return nil, errors.New("unsupported chart version")
+	}
+
+}
+
+// FileLoader loads a chart from a file
+type FileLoader string
+
+// Load loads a chart
+func (l FileLoader) Load() (chart.Charter, error) {
+	return LoadFile(string(l))
+}
+
+func LoadFile(name string) (chart.Charter, error) {
+	if fi, err := os.Stat(name); err != nil {
+		return nil, err
+	} else if fi.IsDir() {
+		return nil, errors.New("cannot load a directory")
+	}
+
+	raw, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	defer raw.Close()
+
+	err = archive.EnsureArchive(name, raw)
+	if err != nil {
+		return nil, err
+	}
+
+	files, err := archive.LoadArchiveFiles(raw)
+	if err != nil {
+		if err == gzip.ErrHeader {
+			return nil, fmt.Errorf("file '%s' does not appear to be a valid chart file (details: %s)", name, err)
+		}
+		return nil, errors.New("unable to load chart archive")
+	}
+
+	for _, f := range files {
+		if f.Name == "Chart.yaml" {
+			c := new(chartBase)
+			if err := yaml.Unmarshal(f.Data, c); err != nil {
+				return c, fmt.Errorf("cannot load Chart.yaml: %w", err)
+			}
+			switch c.APIVersion {
+			case c2.APIVersionV1, c2.APIVersionV2, "":
+				return c2load.Load(name)
+			case c3.APIVersionV3:
+				return c3load.Load(name)
+			default:
+				return nil, errors.New("unsupported chart version")
+			}
+		}
+	}
+
+	return nil, errors.New("unable to detect chart version, no Chart.yaml found")
+}
+
+// chartBase is used to detect the API Version for the chart to run it through the
+// loader for that type.
+type chartBase struct {
+	APIVersion string `json:"apiVersion,omitempty"`
+}
diff --git a/pkg/chart/v2/loader/archive.go b/pkg/chart/v2/loader/archive.go
index b9f370f56..f6ed0e84f 100644
--- a/pkg/chart/v2/loader/archive.go
+++ b/pkg/chart/v2/loader/archive.go
@@ -17,32 +17,16 @@ limitations under the License.
 package loader
 
 import (
-	"archive/tar"
-	"bytes"
 	"compress/gzip"
 	"errors"
 	"fmt"
 	"io"
-	"net/http"
 	"os"
-	"path"
-	"regexp"
-	"strings"
 
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
-// MaxDecompressedChartSize is the maximum size of a chart archive that will be
-// decompressed. This is the decompressed size of all the files.
-// The default value is 100 MiB.
-var MaxDecompressedChartSize int64 = 100 * 1024 * 1024 // Default 100 MiB
-
-// MaxDecompressedFileSize is the size of the largest file that Helm will attempt to load.
-// The size of the file is the decompressed version of it when it is stored in an archive.
-var MaxDecompressedFileSize int64 = 5 * 1024 * 1024 // Default 5 MiB
-
-var drivePathPattern = regexp.MustCompile(`^[a-zA-Z]:/`)
-
 // FileLoader loads a chart from a file
 type FileLoader string
 
@@ -65,7 +49,7 @@ func LoadFile(name string) (*chart.Chart, error) {
 	}
 	defer raw.Close()
 
-	err = ensureArchive(name, raw)
+	err = archive.EnsureArchive(name, raw)
 	if err != nil {
 		return nil, err
 	}
@@ -79,153 +63,9 @@ func LoadFile(name string) (*chart.Chart, error) {
 	return c, err
 }
 
-// ensureArchive's job is to return an informative error if the file does not appear to be a gzipped archive.
-//
-// Sometimes users will provide a values.yaml for an argument where a chart is expected. One common occurrence
-// of this is invoking `helm template values.yaml mychart` which would otherwise produce a confusing error
-// if we didn't check for this.
-func ensureArchive(name string, raw *os.File) error {
-	defer raw.Seek(0, 0) // reset read offset to allow archive loading to proceed.
-
-	// Check the file format to give us a chance to provide the user with more actionable feedback.
-	buffer := make([]byte, 512)
-	_, err := raw.Read(buffer)
-	if err != nil && err != io.EOF {
-		return fmt.Errorf("file '%s' cannot be read: %s", name, err)
-	}
-
-	// Helm may identify achieve of the application/x-gzip as application/vnd.ms-fontobject.
-	// Fix for: https://github.com/helm/helm/issues/12261
-	if contentType := http.DetectContentType(buffer); contentType != "application/x-gzip" && !isGZipApplication(buffer) {
-		// TODO: Is there a way to reliably test if a file content is YAML? ghodss/yaml accepts a wide
-		//       variety of content (Makefile, .zshrc) as valid YAML without errors.
-
-		// Wrong content type. Let's check if it's yaml and give an extra hint?
-		if strings.HasSuffix(name, ".yml") || strings.HasSuffix(name, ".yaml") {
-			return fmt.Errorf("file '%s' seems to be a YAML file, but expected a gzipped archive", name)
-		}
-		return fmt.Errorf("file '%s' does not appear to be a gzipped archive; got '%s'", name, contentType)
-	}
-	return nil
-}
-
-// isGZipApplication checks whether the archive is of the application/x-gzip type.
-func isGZipApplication(data []byte) bool {
-	sig := []byte("\x1F\x8B\x08")
-	return bytes.HasPrefix(data, sig)
-}
-
-// LoadArchiveFiles reads in files out of an archive into memory. This function
-// performs important path security checks and should always be used before
-// expanding a tarball
-func LoadArchiveFiles(in io.Reader) ([]*BufferedFile, error) {
-	unzipped, err := gzip.NewReader(in)
-	if err != nil {
-		return nil, err
-	}
-	defer unzipped.Close()
-
-	files := []*BufferedFile{}
-	tr := tar.NewReader(unzipped)
-	remainingSize := MaxDecompressedChartSize
-	for {
-		b := bytes.NewBuffer(nil)
-		hd, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		if hd.FileInfo().IsDir() {
-			// Use this instead of hd.Typeflag because we don't have to do any
-			// inference chasing.
-			continue
-		}
-
-		switch hd.Typeflag {
-		// We don't want to process these extension header files.
-		case tar.TypeXGlobalHeader, tar.TypeXHeader:
-			continue
-		}
-
-		// Archive could contain \ if generated on Windows
-		delimiter := "/"
-		if strings.ContainsRune(hd.Name, '\\') {
-			delimiter = "\\"
-		}
-
-		parts := strings.Split(hd.Name, delimiter)
-		n := strings.Join(parts[1:], delimiter)
-
-		// Normalize the path to the / delimiter
-		n = strings.ReplaceAll(n, delimiter, "/")
-
-		if path.IsAbs(n) {
-			return nil, errors.New("chart illegally contains absolute paths")
-		}
-
-		n = path.Clean(n)
-		if n == "." {
-			// In this case, the original path was relative when it should have been absolute.
-			return nil, fmt.Errorf("chart illegally contains content outside the base directory: %q", hd.Name)
-		}
-		if strings.HasPrefix(n, "..") {
-			return nil, errors.New("chart illegally references parent directory")
-		}
-
-		// In some particularly arcane acts of path creativity, it is possible to intermix
-		// UNIX and Windows style paths in such a way that you produce a result of the form
-		// c:/foo even after all the built-in absolute path checks. So we explicitly check
-		// for this condition.
-		if drivePathPattern.MatchString(n) {
-			return nil, errors.New("chart contains illegally named files")
-		}
-
-		if parts[0] == "Chart.yaml" {
-			return nil, errors.New("chart yaml not in base directory")
-		}
-
-		if hd.Size > remainingSize {
-			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
-		}
-
-		if hd.Size > MaxDecompressedFileSize {
-			return nil, fmt.Errorf("decompressed chart file %q is larger than the maximum file size %d", hd.Name, MaxDecompressedFileSize)
-		}
-
-		limitedReader := io.LimitReader(tr, remainingSize)
-
-		bytesWritten, err := io.Copy(b, limitedReader)
-		if err != nil {
-			return nil, err
-		}
-
-		remainingSize -= bytesWritten
-		// When the bytesWritten are less than the file size it means the limit reader ended
-		// copying early. Here we report that error. This is important if the last file extracted
-		// is the one that goes over the limit. It assumes the Size stored in the tar header
-		// is correct, something many applications do.
-		if bytesWritten < hd.Size || remainingSize <= 0 {
-			return nil, fmt.Errorf("decompressed chart is larger than the maximum size %d", MaxDecompressedChartSize)
-		}
-
-		data := bytes.TrimPrefix(b.Bytes(), utf8bom)
-
-		files = append(files, &BufferedFile{Name: n, Data: data})
-		b.Reset()
-	}
-
-	if len(files) == 0 {
-		return nil, errors.New("no files in chart archive")
-	}
-	return files, nil
-}
-
 // LoadArchive loads from a reader containing a compressed tar archive.
 func LoadArchive(in io.Reader) (*chart.Chart, error) {
-	files, err := LoadArchiveFiles(in)
+	files, err := archive.LoadArchiveFiles(in)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/chart/v2/loader/archive_test.go b/pkg/chart/v2/loader/archive_test.go
deleted file mode 100644
index d16c47563..000000000
--- a/pkg/chart/v2/loader/archive_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-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 loader
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"testing"
-)
-
-func TestLoadArchiveFiles(t *testing.T) {
-	tcs := []struct {
-		name     string
-		generate func(w *tar.Writer)
-		check    func(t *testing.T, files []*BufferedFile, err error)
-	}{
-		{
-			name:     "empty input should return no files",
-			generate: func(_ *tar.Writer) {},
-			check: func(t *testing.T, _ []*BufferedFile, err error) {
-				t.Helper()
-				if err.Error() != "no files in chart archive" {
-					t.Fatalf(`expected "no files in chart archive", got [%#v]`, err)
-				}
-			},
-		},
-		{
-			name: "should ignore files with XGlobalHeader type",
-			generate: func(w *tar.Writer) {
-				// simulate the presence of a `pax_global_header` file like you would get when
-				// processing a GitHub release archive.
-				err := w.WriteHeader(&tar.Header{
-					Typeflag: tar.TypeXGlobalHeader,
-					Name:     "pax_global_header",
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				// we need to have at least one file, otherwise we'll get the "no files in chart archive" error
-				err = w.WriteHeader(&tar.Header{
-					Typeflag: tar.TypeReg,
-					Name:     "dir/empty",
-				})
-				if err != nil {
-					t.Fatal(err)
-				}
-			},
-			check: func(t *testing.T, files []*BufferedFile, err error) {
-				t.Helper()
-				if err != nil {
-					t.Fatalf(`got unwanted error [%#v] for tar file with pax_global_header content`, err)
-				}
-
-				if len(files) != 1 {
-					t.Fatalf(`expected to get one file but got [%v]`, files)
-				}
-			},
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			buf := &bytes.Buffer{}
-			gzw := gzip.NewWriter(buf)
-			tw := tar.NewWriter(gzw)
-
-			tc.generate(tw)
-
-			_ = tw.Close()
-			_ = gzw.Close()
-
-			files, err := LoadArchiveFiles(buf)
-			tc.check(t, files, err)
-		})
-	}
-}
diff --git a/pkg/chart/v2/loader/directory.go b/pkg/chart/v2/loader/directory.go
index 4f72925dc..c6f31560c 100644
--- a/pkg/chart/v2/loader/directory.go
+++ b/pkg/chart/v2/loader/directory.go
@@ -24,6 +24,7 @@ import (
 	"strings"
 
 	"helm.sh/helm/v4/internal/sympath"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 	"helm.sh/helm/v4/pkg/ignore"
 )
@@ -61,7 +62,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 	}
 	rules.AddDefaults()
 
-	files := []*BufferedFile{}
+	files := []*archive.BufferedFile{}
 	topdir += string(filepath.Separator)
 
 	walk := func(name string, fi os.FileInfo, err error) error {
@@ -99,8 +100,8 @@ func LoadDir(dir string) (*chart.Chart, error) {
 			return fmt.Errorf("cannot load irregular file %s as it has file mode type bits set", name)
 		}
 
-		if fi.Size() > MaxDecompressedFileSize {
-			return fmt.Errorf("chart file %q is larger than the maximum file size %d", fi.Name(), MaxDecompressedFileSize)
+		if fi.Size() > archive.MaxDecompressedFileSize {
+			return fmt.Errorf("chart file %q is larger than the maximum file size %d", fi.Name(), archive.MaxDecompressedFileSize)
 		}
 
 		data, err := os.ReadFile(name)
@@ -110,7 +111,7 @@ func LoadDir(dir string) (*chart.Chart, error) {
 
 		data = bytes.TrimPrefix(data, utf8bom)
 
-		files = append(files, &BufferedFile{Name: n, Data: data})
+		files = append(files, &archive.BufferedFile{Name: n, Data: data})
 		return nil
 	}
 	if err = sympath.Walk(topdir, walk); err != nil {
diff --git a/pkg/chart/v2/loader/load.go b/pkg/chart/v2/loader/load.go
index 0c025e183..028d59e82 100644
--- a/pkg/chart/v2/loader/load.go
+++ b/pkg/chart/v2/loader/load.go
@@ -32,6 +32,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -67,16 +68,10 @@ func Load(name string) (*chart.Chart, error) {
 	return l.Load()
 }
 
-// BufferedFile represents an archive file buffered for later processing.
-type BufferedFile struct {
-	Name string
-	Data []byte
-}
-
 // LoadFiles loads from in-memory files.
-func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
+func LoadFiles(files []*archive.BufferedFile) (*chart.Chart, error) {
 	c := new(chart.Chart)
-	subcharts := make(map[string][]*BufferedFile)
+	subcharts := make(map[string][]*archive.BufferedFile)
 
 	// do not rely on assumed ordering of files in the chart and crash
 	// if Chart.yaml was not coming early enough to initialize metadata
@@ -157,7 +152,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 
 			fname := strings.TrimPrefix(f.Name, "charts/")
 			cname := strings.SplitN(fname, "/", 2)[0]
-			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
+			subcharts[cname] = append(subcharts[cname], &archive.BufferedFile{Name: fname, Data: f.Data})
 		default:
 			c.Files = append(c.Files, &common.File{Name: f.Name, Data: f.Data})
 		}
@@ -187,7 +182,7 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 		default:
 			// We have to trim the prefix off of every file, and ignore any file
 			// that is in charts/, but isn't actually a chart.
-			buff := make([]*BufferedFile, 0, len(files))
+			buff := make([]*archive.BufferedFile, 0, len(files))
 			for _, f := range files {
 				parts := strings.SplitN(f.Name, "/", 2)
 				if len(parts) < 2 {
diff --git a/pkg/chart/v2/loader/load_test.go b/pkg/chart/v2/loader/load_test.go
index c4ae646f6..7eca5f402 100644
--- a/pkg/chart/v2/loader/load_test.go
+++ b/pkg/chart/v2/loader/load_test.go
@@ -31,6 +31,7 @@ import (
 	"time"
 
 	"helm.sh/helm/v4/pkg/chart/common"
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	chart "helm.sh/helm/v4/pkg/chart/v2"
 )
 
@@ -211,12 +212,12 @@ func TestLoadFile(t *testing.T) {
 func TestLoadFiles_BadCases(t *testing.T) {
 	for _, tt := range []struct {
 		name          string
-		bufferedFiles []*BufferedFile
+		bufferedFiles []*archive.BufferedFile
 		expectError   string
 	}{
 		{
 			name: "These files contain only requirements.lock",
-			bufferedFiles: []*BufferedFile{
+			bufferedFiles: []*archive.BufferedFile{
 				{
 					Name: "requirements.lock",
 					Data: []byte(""),
@@ -235,7 +236,7 @@ func TestLoadFiles_BadCases(t *testing.T) {
 }
 
 func TestLoadFiles(t *testing.T) {
-	goodFiles := []*BufferedFile{
+	goodFiles := []*archive.BufferedFile{
 		{
 			Name: "Chart.yaml",
 			Data: []byte(`apiVersion: v1
@@ -300,7 +301,7 @@ icon: https://example.com/64x64.png
 		t.Errorf("Expected number of templates == 2, got %d", len(c.Templates))
 	}
 
-	if _, err = LoadFiles([]*BufferedFile{}); err == nil {
+	if _, err = LoadFiles([]*archive.BufferedFile{}); err == nil {
 		t.Fatal("Expected err to be non-nil")
 	}
 	if err.Error() != "Chart.yaml file is missing" {
@@ -311,7 +312,7 @@ icon: https://example.com/64x64.png
 // Test the order of file loading. The Chart.yaml file needs to come first for
 // later comparison checks. See https://github.com/helm/helm/pull/8948
 func TestLoadFilesOrder(t *testing.T) {
-	goodFiles := []*BufferedFile{
+	goodFiles := []*archive.BufferedFile{
 		{
 			Name: "requirements.yaml",
 			Data: []byte("dependencies:"),
diff --git a/pkg/chart/v2/util/expand.go b/pkg/chart/v2/util/expand.go
index 9d08571ed..077dfbf38 100644
--- a/pkg/chart/v2/util/expand.go
+++ b/pkg/chart/v2/util/expand.go
@@ -26,13 +26,13 @@ import (
 	securejoin "github.com/cyphar/filepath-securejoin"
 	"sigs.k8s.io/yaml"
 
+	"helm.sh/helm/v4/pkg/chart/loader/archive"
 	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.
 func Expand(dir string, r io.Reader) error {
-	files, err := loader.LoadArchiveFiles(r)
+	files, err := archive.LoadArchiveFiles(r)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index c4e121c1f..4f30bd7df 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -33,8 +33,8 @@ import (
 	"github.com/spf13/pflag"
 
 	"helm.sh/helm/v4/pkg/action"
-	chart "helm.sh/helm/v4/pkg/chart/v2"
-	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	"helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/loader"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/cmd/require"
@@ -270,15 +270,20 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 		return nil, err
 	}
 
-	if err := checkIfInstallable(chartRequested); err != nil {
+	ac, err := chart.NewAccessor(chartRequested)
+	if err != nil {
 		return nil, err
 	}
 
-	if chartRequested.Metadata.Deprecated {
+	if err := checkIfInstallable(ac); err != nil {
+		return nil, err
+	}
+
+	if ac.Deprecated() {
 		slog.Warn("this chart is deprecated")
 	}
 
-	if req := chartRequested.Metadata.Dependencies; req != nil {
+	if req := ac.MetaDependencies(); req != nil {
 		// If CheckDependencies returns an error, we have unfulfilled dependencies.
 		// As of Helm 2.4.0, this is treated as a stopping condition:
 		// https://github.com/helm/helm/issues/2209
@@ -337,12 +342,14 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
 // checkIfInstallable validates if a chart can be installed
 //
 // Application chart type is only installable
-func checkIfInstallable(ch *chart.Chart) error {
-	switch ch.Metadata.Type {
+func checkIfInstallable(ch chart.Accessor) error {
+	meta := ch.MetadataAsMap()
+
+	switch meta["Type"] {
 	case "", "application":
 		return nil
 	}
-	return fmt.Errorf("%s charts are not installable", ch.Metadata.Type)
+	return fmt.Errorf("%s charts are not installable", meta["Type"])
 }
 
 // Provide dynamic auto-completion for the install and template commands
diff --git a/pkg/cmd/upgrade.go b/pkg/cmd/upgrade.go
index c8fbf8bd3..fcc4f9294 100644
--- a/pkg/cmd/upgrade.go
+++ b/pkg/cmd/upgrade.go
@@ -30,7 +30,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"helm.sh/helm/v4/pkg/action"
-	"helm.sh/helm/v4/pkg/chart/v2/loader"
+	ci "helm.sh/helm/v4/pkg/chart"
+	"helm.sh/helm/v4/pkg/chart/loader"
 	"helm.sh/helm/v4/pkg/cli/output"
 	"helm.sh/helm/v4/pkg/cli/values"
 	"helm.sh/helm/v4/pkg/cmd/require"
@@ -198,7 +199,12 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			if req := ch.Metadata.Dependencies; req != nil {
+
+			ac, err := ci.NewAccessor(ch)
+			if err != nil {
+				return err
+			}
+			if req := ac.MetaDependencies(); req != nil {
 				if err := action.CheckDependencies(ch, req); err != nil {
 					err = fmt.Errorf("an error occurred while checking for chart dependencies. You may need to run `helm dependency build` to fetch missing dependencies: %w", err)
 					if client.DependencyUpdate {
@@ -226,7 +232,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 				}
 			}
 
-			if ch.Metadata.Deprecated {
+			if ac.Deprecated() {
 				slog.Warn("this chart is deprecated")
 			}