From 07d58b5c1c8b8c0c35f6993f4bb3250dcd3d0737 Mon Sep 17 00:00:00 2001 From: George Jenkins Date: Sat, 4 Jan 2025 17:31:38 -0800 Subject: [PATCH] refactor: Move chartutil release code to releaseutil Signed-off-by: George Jenkins --- cmd/helm/helm_test.go | 4 +- cmd/helm/lint.go | 4 +- cmd/helm/status.go | 4 +- cmd/helm/template.go | 5 +- pkg/action/action.go | 25 ++-- pkg/action/action_test.go | 4 +- pkg/action/get_values.go | 6 +- pkg/action/history.go | 4 +- pkg/action/install.go | 15 ++- pkg/action/install_test.go | 4 +- pkg/action/lint.go | 5 +- pkg/action/release_testing.go | 4 +- pkg/action/rollback.go | 4 +- pkg/action/uninstall.go | 3 +- pkg/action/upgrade.go | 15 ++- pkg/engine/engine.go | 20 ++-- pkg/engine/engine_test.go | 110 +++++++++--------- pkg/lint/lint.go | 6 +- pkg/lint/rules/deprecations.go | 5 +- pkg/lint/rules/template.go | 16 +-- pkg/lint/rules/values.go | 10 +- .../capabilities.go | 2 +- .../capabilities_test.go | 2 +- pkg/{chartutil => releaseutil}/coalesce.go | 2 +- .../coalesce_test.go | 2 +- pkg/{chartutil => releaseutil}/compatible.go | 2 +- .../compatible_test.go | 2 +- .../dependencies.go | 2 +- .../dependencies_test.go | 2 +- pkg/releaseutil/errors.go | 35 ++++++ pkg/releaseutil/errors_test.go | 37 ++++++ pkg/{chartutil => releaseutil}/jsonschema.go | 2 +- .../jsonschema_test.go | 2 +- pkg/releaseutil/manifest_sorter.go | 3 +- .../testdata/coleridge.yaml | 0 .../dependent-chart-alias/.helmignore | 0 .../testdata/dependent-chart-alias/Chart.lock | 0 .../testdata/dependent-chart-alias/Chart.yaml | 0 .../dependent-chart-alias/INSTALL.txt | 0 .../testdata/dependent-chart-alias/LICENSE | 0 .../testdata/dependent-chart-alias/README.md | 0 .../dependent-chart-alias/charts/_ignore_me | 0 .../charts/alpine/Chart.yaml | 0 .../charts/alpine/README.md | 0 .../charts/alpine/charts/mast1/Chart.yaml | 0 .../charts/alpine/charts/mast1/values.yaml | 0 .../charts/alpine/charts/mast2-0.1.0.tgz | Bin .../charts/alpine/templates/alpine-pod.yaml | 0 .../charts/alpine/values.yaml | 0 .../charts/mariner-4.3.2.tgz | Bin .../dependent-chart-alias/docs/README.md | 0 .../testdata/dependent-chart-alias/icon.svg | 0 .../dependent-chart-alias/ignore/me.txt | 0 .../templates/template.tpl | 0 .../dependent-chart-alias/values.yaml | 0 .../dependent-chart-helmignore/.helmignore | 0 .../dependent-chart-helmignore/Chart.yaml | 0 .../charts/.ignore_me | 0 .../charts/_ignore_me | 0 .../charts/alpine/Chart.yaml | 0 .../charts/alpine/README.md | 0 .../charts/alpine/charts/mast1/Chart.yaml | 0 .../charts/alpine/charts/mast1/values.yaml | 0 .../charts/alpine/charts/mast2-0.1.0.tgz | Bin .../charts/alpine/templates/alpine-pod.yaml | 0 .../charts/alpine/values.yaml | 0 .../templates/template.tpl | 0 .../dependent-chart-helmignore/values.yaml | 0 .../.helmignore | 0 .../Chart.yaml | 0 .../INSTALL.txt | 0 .../LICENSE | 0 .../README.md | 0 .../charts/_ignore_me | 0 .../charts/alpine/Chart.yaml | 0 .../charts/alpine/README.md | 0 .../charts/alpine/charts/mast1/Chart.yaml | 0 .../charts/alpine/charts/mast1/values.yaml | 0 .../charts/alpine/charts/mast2-0.1.0.tgz | Bin .../charts/alpine/templates/alpine-pod.yaml | 0 .../charts/alpine/values.yaml | 0 .../charts/mariner-4.3.2.tgz | Bin .../docs/README.md | 0 .../icon.svg | 0 .../ignore/me.txt | 0 .../templates/template.tpl | 0 .../values.yaml | 0 .../.helmignore | 0 .../Chart.yaml | 0 .../INSTALL.txt | 0 .../LICENSE | 0 .../README.md | 0 .../charts/_ignore_me | 0 .../charts/alpine/Chart.yaml | 0 .../charts/alpine/README.md | 0 .../charts/alpine/charts/mast1/Chart.yaml | 0 .../charts/alpine/charts/mast1/values.yaml | 0 .../charts/alpine/charts/mast2-0.1.0.tgz | Bin .../charts/alpine/templates/alpine-pod.yaml | 0 .../charts/alpine/values.yaml | 0 .../charts/mariner-4.3.2.tgz | Bin .../docs/README.md | 0 .../icon.svg | 0 .../ignore/me.txt | 0 .../templates/template.tpl | 0 .../values.yaml | 0 .../.helmignore | 0 .../Chart.yaml | 0 .../INSTALL.txt | 0 .../LICENSE | 0 .../README.md | 0 .../charts/_ignore_me | 0 .../charts/alpine/Chart.yaml | 0 .../charts/alpine/README.md | 0 .../charts/alpine/charts/mast1/Chart.yaml | 0 .../charts/alpine/charts/mast1/values.yaml | 0 .../charts/alpine/charts/mast2-0.1.0.tgz | Bin .../charts/alpine/templates/alpine-pod.yaml | 0 .../charts/alpine/values.yaml | 0 .../charts/mariner-4.3.2.tgz | Bin .../docs/README.md | 0 .../icon.svg | 0 .../ignore/me.txt | 0 .../templates/template.tpl | 0 .../values.yaml | 0 pkg/releaseutil/testdata/frobnitz/.helmignore | 1 + pkg/releaseutil/testdata/frobnitz/Chart.lock | 8 ++ pkg/releaseutil/testdata/frobnitz/Chart.yaml | 27 +++++ pkg/releaseutil/testdata/frobnitz/INSTALL.txt | 1 + pkg/releaseutil/testdata/frobnitz/LICENSE | 1 + pkg/releaseutil/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/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 ++ .../testdata/frobnitz/docs/README.md | 1 + pkg/releaseutil/testdata/frobnitz/icon.svg | 8 ++ .../testdata/frobnitz/ignore/me.txt} | 0 .../testdata/frobnitz/templates/template.tpl | 1 + pkg/releaseutil/testdata/frobnitz/values.yaml | 6 + .../parent-chart/Chart.lock | 0 .../parent-chart/Chart.yaml | 0 .../parent-chart/charts/dev-v0.1.0.tgz | Bin .../parent-chart/charts/prod-v0.1.0.tgz | Bin .../parent-chart/envs/dev/Chart.yaml | 0 .../parent-chart/envs/dev/values.yaml | 0 .../parent-chart/envs/prod/Chart.yaml | 0 .../parent-chart/envs/prod/values.yaml | 0 .../parent-chart/templates/autoscaler.yaml | 0 .../parent-chart/values.yaml | 0 .../testdata/joonix/Chart.yaml | 0 .../testdata/joonix/charts/.gitkeep | 0 .../testdata/subpop/Chart.yaml | 0 .../testdata/subpop/README.md | 0 .../subpop/charts/subchart1/Chart.yaml | 0 .../subchart1/charts/subchartA/Chart.yaml | 0 .../charts/subchartA/templates/service.yaml | 0 .../subchart1/charts/subchartA/values.yaml | 0 .../subchart1/charts/subchartB/Chart.yaml | 0 .../charts/subchartB/templates/service.yaml | 0 .../subchart1/charts/subchartB/values.yaml | 0 .../subpop/charts/subchart1/crds/crdA.yaml | 0 .../charts/subchart1/templates/NOTES.txt | 0 .../charts/subchart1/templates/service.yaml | 0 .../subchart1/templates/subdir/role.yaml | 0 .../templates/subdir/rolebinding.yaml | 0 .../templates/subdir/serviceaccount.yaml | 0 .../subpop/charts/subchart1/values.yaml | 0 .../subpop/charts/subchart2/Chart.yaml | 0 .../subchart2/charts/subchartB/Chart.yaml | 0 .../charts/subchartB/templates/service.yaml | 0 .../subchart2/charts/subchartB/values.yaml | 0 .../subchart2/charts/subchartC/Chart.yaml | 0 .../charts/subchartC/templates/service.yaml | 0 .../subchart2/charts/subchartC/values.yaml | 0 .../charts/subchart2/templates/service.yaml | 0 .../subpop/charts/subchart2/values.yaml | 0 .../testdata/subpop/noreqs/Chart.yaml | 0 .../subpop/noreqs/templates/service.yaml | 0 .../testdata/subpop/noreqs/values.yaml | 0 .../testdata/subpop/values.yaml | 0 .../testdata/test-values-invalid.schema.json | 0 .../testdata/test-values-negative.yaml | 0 .../testdata/test-values.schema.json | 0 .../testdata/test-values.yaml | 0 .../three-level-dependent-chart/README.md | 0 .../umbrella/Chart.yaml | 0 .../umbrella/charts/app1/Chart.yaml | 0 .../charts/app1/charts/library/Chart.yaml | 0 .../charts/library/templates/service.yaml | 0 .../charts/app1/charts/library/values.yaml | 0 .../charts/app1/templates/service.yaml | 0 .../umbrella/charts/app1/values.yaml | 0 .../umbrella/charts/app2/Chart.yaml | 0 .../charts/app2/charts/library/Chart.yaml | 0 .../charts/library/templates/service.yaml | 0 .../charts/app2/charts/library/values.yaml | 0 .../charts/app2/templates/service.yaml | 0 .../umbrella/charts/app2/values.yaml | 0 .../umbrella/charts/app3/Chart.yaml | 0 .../charts/app3/charts/library/Chart.yaml | 0 .../charts/library/templates/service.yaml | 0 .../charts/app3/charts/library/values.yaml | 0 .../charts/app3/templates/service.yaml | 0 .../umbrella/charts/app3/values.yaml | 0 .../umbrella/charts/app4/Chart.yaml | 0 .../charts/app4/charts/library/Chart.yaml | 0 .../charts/library/templates/service.yaml | 0 .../charts/app4/charts/library/values.yaml | 0 .../charts/app4/templates/service.yaml | 0 .../umbrella/charts/app4/values.yaml | 0 .../umbrella/values.yaml | 0 .../validate_name.go | 2 +- .../validate_name_test.go | 2 +- pkg/{chartutil => releaseutil}/values.go | 2 +- pkg/{chartutil => releaseutil}/values_test.go | 2 +- 225 files changed, 351 insertions(+), 156 deletions(-) rename pkg/{chartutil => releaseutil}/capabilities.go (99%) rename pkg/{chartutil => releaseutil}/capabilities_test.go (99%) rename pkg/{chartutil => releaseutil}/coalesce.go (99%) rename pkg/{chartutil => releaseutil}/coalesce_test.go (99%) rename pkg/{chartutil => releaseutil}/compatible.go (97%) rename pkg/{chartutil => releaseutil}/compatible_test.go (98%) rename pkg/{chartutil => releaseutil}/dependencies.go (99%) rename pkg/{chartutil => releaseutil}/dependencies_test.go (99%) create mode 100644 pkg/releaseutil/errors.go create mode 100644 pkg/releaseutil/errors_test.go rename pkg/{chartutil => releaseutil}/jsonschema.go (99%) rename pkg/{chartutil => releaseutil}/jsonschema_test.go (99%) rename pkg/{chartutil => releaseutil}/testdata/coleridge.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/.helmignore (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/Chart.lock (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/INSTALL.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/LICENSE (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/_ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/alpine/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/docs/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/icon.svg (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/ignore/me.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/templates/template.tpl (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-alias/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/.helmignore (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/.ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/_ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/charts/alpine/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/templates/template.tpl (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-helmignore/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/.helmignore (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/LICENSE (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/docs/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/icon.svg (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-no-requirements-yaml/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl (100%) rename pkg/{chartutil => releaseutil}/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml (100%) create mode 100644 pkg/releaseutil/testdata/frobnitz/.helmignore create mode 100644 pkg/releaseutil/testdata/frobnitz/Chart.lock create mode 100644 pkg/releaseutil/testdata/frobnitz/Chart.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/INSTALL.txt create mode 100644 pkg/releaseutil/testdata/frobnitz/LICENSE create mode 100644 pkg/releaseutil/testdata/frobnitz/README.md create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/_ignore_me create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/Chart.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/README.md create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/alpine/values.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/mariner/Chart.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl create mode 100644 pkg/releaseutil/testdata/frobnitz/charts/mariner/values.yaml create mode 100644 pkg/releaseutil/testdata/frobnitz/docs/README.md create mode 100644 pkg/releaseutil/testdata/frobnitz/icon.svg rename pkg/{chartutil/testdata/joonix/charts/.gitkeep => releaseutil/testdata/frobnitz/ignore/me.txt} (100%) create mode 100644 pkg/releaseutil/testdata/frobnitz/templates/template.tpl create mode 100644 pkg/releaseutil/testdata/frobnitz/values.yaml rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/joonix/Chart.yaml (100%) create mode 100644 pkg/releaseutil/testdata/joonix/charts/.gitkeep rename pkg/{chartutil => releaseutil}/testdata/subpop/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/crds/crdA.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/templates/NOTES.txt (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/templates/subdir/role.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/charts/subchart2/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/noreqs/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/noreqs/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/noreqs/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/subpop/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/test-values-invalid.schema.json (100%) rename pkg/{chartutil => releaseutil}/testdata/test-values-negative.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/test-values.schema.json (100%) rename pkg/{chartutil => releaseutil}/testdata/test-values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/README.md (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml (100%) rename pkg/{chartutil => releaseutil}/testdata/three-level-dependent-chart/umbrella/values.yaml (100%) rename pkg/{chartutil => releaseutil}/validate_name.go (99%) rename pkg/{chartutil => releaseutil}/validate_name_test.go (99%) rename pkg/{chartutil => releaseutil}/values.go (99%) rename pkg/{chartutil => releaseutil}/values_test.go (99%) diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go index a20928b37..b33173116 100644 --- a/cmd/helm/helm_test.go +++ b/cmd/helm/helm_test.go @@ -30,10 +30,10 @@ import ( "helm.sh/helm/v4/internal/test" "helm.sh/helm/v4/pkg/action" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/cli" kubefake "helm.sh/helm/v4/pkg/kube/fake" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" "helm.sh/helm/v4/pkg/storage" "helm.sh/helm/v4/pkg/storage/driver" "helm.sh/helm/v4/pkg/time" @@ -93,7 +93,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: releaseutil.DefaultCapabilities, Log: func(_ string, _ ...interface{}) {}, } diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go index 9a3f7a2fc..a4c142818 100644 --- a/cmd/helm/lint.go +++ b/cmd/helm/lint.go @@ -27,10 +27,10 @@ import ( "github.com/spf13/cobra" "helm.sh/helm/v4/pkg/action" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/cli/values" "helm.sh/helm/v4/pkg/getter" "helm.sh/helm/v4/pkg/lint/support" + "helm.sh/helm/v4/pkg/releaseutil" ) var longLintHelp = ` @@ -58,7 +58,7 @@ func newLintCmd(out io.Writer) *cobra.Command { } if kubeVersion != "" { - parsedKubeVersion, err := chartutil.ParseKubeVersion(kubeVersion) + parsedKubeVersion, err := releaseutil.ParseKubeVersion(kubeVersion) if err != nil { return fmt.Errorf("invalid kube version '%s': %s", kubeVersion, err) } diff --git a/cmd/helm/status.go b/cmd/helm/status.go index c56ff1f29..fc46bfad1 100644 --- a/cmd/helm/status.go +++ b/cmd/helm/status.go @@ -30,9 +30,9 @@ import ( "helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/pkg/action" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/cli/output" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" ) // NOTE: Keep the list of statuses up-to-date with pkg/release/status.go. @@ -194,7 +194,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 := releaseutil.CoalesceValues(s.release.Chart, s.release.Config) if err != nil { return err } diff --git a/cmd/helm/template.go b/cmd/helm/template.go index 8cd91df32..4ce6cbeeb 100644 --- a/cmd/helm/template.go +++ b/cmd/helm/template.go @@ -34,7 +34,6 @@ import ( "helm.sh/helm/v4/cmd/helm/require" "helm.sh/helm/v4/pkg/action" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/cli/values" "helm.sh/helm/v4/pkg/releaseutil" ) @@ -67,7 +66,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 := releaseutil.ParseKubeVersion(kubeVersion) if err != nil { return fmt.Errorf("invalid kube version '%s': %s", kubeVersion, err) } @@ -91,7 +90,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 = releaseutil.VersionSet(extraAPIs) client.IncludeCRDs = includeCrds rel, err := runInstall(args, client, valueOpts, out) diff --git a/pkg/action/action.go b/pkg/action/action.go index 8418a4c27..c88987081 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -33,7 +33,6 @@ import ( "k8s.io/client-go/rest" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/engine" "helm.sh/helm/v4/pkg/kube" "helm.sh/helm/v4/pkg/postrender" @@ -92,7 +91,7 @@ type Configuration struct { RegistryClient *registry.Client // Capabilities describes the capabilities of the Kubernetes cluster. - Capabilities *chartutil.Capabilities + Capabilities *releaseutil.Capabilities Log func(string, ...interface{}) } @@ -103,7 +102,7 @@ type Configuration struct { // 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 releaseutil.Values, releaseName, outputDir string, subNotes, useReleaseName, includeCrds bool, pr postrender.PostRenderer, interactWithRemote, enableDNS, hideSecret bool) ([]*release.Hook, *bytes.Buffer, string, error) { hs := []*release.Hook{} b := bytes.NewBuffer(nil) @@ -113,7 +112,7 @@ func (cfg *Configuration) renderResources(ch *chart.Chart, values chartutil.Valu } if ch.Metadata.KubeVersion != "" { - if !chartutil.IsCompatibleRange(ch.Metadata.KubeVersion, caps.KubeVersion.String()) { + if !releaseutil.IsCompatibleRange(ch.Metadata.KubeVersion, caps.KubeVersion.String()) { return hs, b, "", errors.Errorf("chart requires kubeVersion: %s which is incompatible with Kubernetes %s", ch.Metadata.KubeVersion, caps.KubeVersion.String()) } } @@ -243,7 +242,7 @@ type RESTClientGetter interface { type DebugLog func(format string, v ...interface{}) // capabilities builds a Capabilities from discovery information. -func (cfg *Configuration) getCapabilities() (*chartutil.Capabilities, error) { +func (cfg *Configuration) getCapabilities() (*releaseutil.Capabilities, error) { if cfg.Capabilities != nil { return cfg.Capabilities, nil } @@ -272,14 +271,14 @@ func (cfg *Configuration) getCapabilities() (*chartutil.Capabilities, error) { } } - cfg.Capabilities = &chartutil.Capabilities{ + cfg.Capabilities = &releaseutil.Capabilities{ APIVersions: apiVersions, - KubeVersion: chartutil.KubeVersion{ + KubeVersion: releaseutil.KubeVersion{ Version: kubeVersion.GitVersion, Major: kubeVersion.Major, Minor: kubeVersion.Minor, }, - HelmVersion: chartutil.DefaultCapabilities.HelmVersion, + HelmVersion: releaseutil.DefaultCapabilities.HelmVersion, } return cfg.Capabilities, nil } @@ -303,7 +302,7 @@ func (cfg *Configuration) Now() time.Time { } func (cfg *Configuration) releaseContent(name string, version int) (*release.Release, error) { - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, errors.Errorf("releaseContent: Release name is invalid: %s", name) } @@ -315,10 +314,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) (releaseutil.VersionSet, error) { groups, resources, err := client.ServerGroupsAndResources() if err != nil && !discovery.IsGroupDiscoveryFailedError(err) { - return chartutil.DefaultVersionSet, errors.Wrap(err, "could not get apiVersions from Kubernetes") + return releaseutil.DefaultVersionSet, errors.Wrap(err, "could not get apiVersions from Kubernetes") } // FIXME: The Kubernetes test fixture for cli appears to always return nil @@ -326,7 +325,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 releaseutil.DefaultVersionSet, nil } versionMap := make(map[string]interface{}) @@ -359,7 +358,7 @@ func GetVersionSet(client discovery.ServerResourcesInterface) (chartutil.Version versions = append(versions, k) } - return chartutil.VersionSet(versions), nil + return releaseutil.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 71ea83789..57cc689ec 100644 --- a/pkg/action/action_test.go +++ b/pkg/action/action_test.go @@ -25,10 +25,10 @@ import ( fakeclientset "k8s.io/client-go/kubernetes/fake" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" kubefake "helm.sh/helm/v4/pkg/kube/fake" "helm.sh/helm/v4/pkg/registry" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" "helm.sh/helm/v4/pkg/storage" "helm.sh/helm/v4/pkg/storage/driver" "helm.sh/helm/v4/pkg/time" @@ -47,7 +47,7 @@ func actionConfigFixture(t *testing.T) *Configuration { return &Configuration{ Releases: storage.Init(driver.NewMemory()), KubeClient: &kubefake.FailingKubeClient{PrintingKubeClient: kubefake.PrintingKubeClient{Out: io.Discard}}, - Capabilities: chartutil.DefaultCapabilities, + Capabilities: releaseutil.DefaultCapabilities, RegistryClient: registryClient, Log: func(format string, v ...interface{}) { t.Helper() diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go index aa399f76c..633cc5642 100644 --- a/pkg/action/get_values.go +++ b/pkg/action/get_values.go @@ -16,9 +16,7 @@ limitations under the License. package action -import ( - "helm.sh/helm/v4/pkg/chartutil" -) +import "helm.sh/helm/v4/pkg/releaseutil" // 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 := releaseutil.CoalesceValues(rel.Chart, rel.Config) if err != nil { return nil, err } diff --git a/pkg/action/history.go b/pkg/action/history.go index 5f514a14a..32fdf1163 100644 --- a/pkg/action/history.go +++ b/pkg/action/history.go @@ -19,8 +19,8 @@ package action import ( "github.com/pkg/errors" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" ) // History is the action for checking the release's ledger. @@ -49,7 +49,7 @@ func (h *History) Run(name string) ([]*release.Release, error) { return nil, err } - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, errors.Errorf("release name is invalid: %s", name) } diff --git a/pkg/action/install.go b/pkg/action/install.go index ef3f0fdc7..c6b33aa07 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -40,7 +40,6 @@ import ( "sigs.k8s.io/yaml" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/cli" "helm.sh/helm/v4/pkg/downloader" "helm.sh/helm/v4/pkg/getter" @@ -101,8 +100,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 *releaseutil.KubeVersion + APIVersions releaseutil.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 @@ -249,7 +248,7 @@ func (i *Install) RunWithContext(ctx context.Context, chrt *chart.Chart, vals ma return nil, errors.Wrap(err, "release name check failed") } - if err := chartutil.ProcessDependencies(chrt, vals); err != nil { + if err := releaseutil.ProcessDependencies(chrt, vals); err != nil { i.cfg.Log(fmt.Sprintf("ERROR: Processing chart dependencies failed: %v", err)) return nil, errors.Wrap(err, "chart dependencies processing failed") } @@ -273,7 +272,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 = releaseutil.DefaultCapabilities.Copy() if i.KubeVersion != nil { i.cfg.Capabilities.KubeVersion = *i.KubeVersion } @@ -298,14 +297,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 := releaseutil.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 := releaseutil.ToRenderValuesWithSchemaValidation(chrt, vals, options, caps, i.SkipSchemaValidation) if err != nil { return nil, err } @@ -530,7 +529,7 @@ func (i *Install) failRelease(rel *release.Release, err error) (*release.Release func (i *Install) availableName() error { start := i.ReleaseName - if err := chartutil.ValidateReleaseName(start); err != nil { + if err := releaseutil.ValidateReleaseName(start); err != nil { return errors.Wrapf(err, "release name %q", start) } // On dry run, bail here diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index 9f738f0bc..20dcda49d 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -33,9 +33,9 @@ import ( "helm.sh/helm/v4/internal/test" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" kubefake "helm.sh/helm/v4/pkg/kube/fake" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" "helm.sh/helm/v4/pkg/storage/driver" helmtime "helm.sh/helm/v4/pkg/time" ) @@ -132,7 +132,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, releaseutil.DefaultCapabilities) is.Equal(instAction.cfg.KubeClient, &kubefake.PrintingKubeClient{Out: io.Discard}) } diff --git a/pkg/action/lint.go b/pkg/action/lint.go index 06fc48612..cb7370b05 100644 --- a/pkg/action/lint.go +++ b/pkg/action/lint.go @@ -26,6 +26,7 @@ import ( "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/lint" "helm.sh/helm/v4/pkg/lint/support" + "helm.sh/helm/v4/pkg/releaseutil" ) // Lint is the action for checking that the semantics of a chart are well-formed. @@ -37,7 +38,7 @@ type Lint struct { WithSubcharts bool Quiet bool SkipSchemaValidation bool - KubeVersion *chartutil.KubeVersion + KubeVersion *releaseutil.KubeVersion } // LintResult is the result of Lint @@ -87,7 +88,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 *releaseutil.KubeVersion, skipSchemaValidation bool) (support.Linter, error) { var chartPath string linter := support.Linter{} diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go index 2539a7f65..b44442b62 100644 --- a/pkg/action/release_testing.go +++ b/pkg/action/release_testing.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" v1 "k8s.io/api/core/v1" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" ) const ( @@ -61,7 +61,7 @@ func (r *ReleaseTesting) Run(name string) (*release.Release, error) { return nil, err } - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, errors.Errorf("releaseTest: Release name is invalid: %s", name) } diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go index 12dee35ce..d8fa04987 100644 --- a/pkg/action/rollback.go +++ b/pkg/action/rollback.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/release" + "helm.sh/helm/v4/pkg/releaseutil" helmtime "helm.sh/helm/v4/pkg/time" ) @@ -92,7 +92,7 @@ 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) { - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, nil, errors.Errorf("prepareRollback: Release name is invalid: %s", name) } diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go index dda7d6978..1d57363b1 100644 --- a/pkg/action/uninstall.go +++ b/pkg/action/uninstall.go @@ -24,7 +24,6 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/kube" "helm.sh/helm/v4/pkg/release" "helm.sh/helm/v4/pkg/releaseutil" @@ -69,7 +68,7 @@ func (u *Uninstall) Run(name string) (*release.UninstallReleaseResponse, error) return &release.UninstallReleaseResponse{Release: r}, nil } - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, errors.Errorf("uninstall: Release name is invalid: %s", name) } diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go index f3e9a33bc..bb33236ab 100644 --- a/pkg/action/upgrade.go +++ b/pkg/action/upgrade.go @@ -29,7 +29,6 @@ import ( "k8s.io/cli-runtime/pkg/resource" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/kube" "helm.sh/helm/v4/pkg/postrender" "helm.sh/helm/v4/pkg/registry" @@ -157,7 +156,7 @@ func (u *Upgrade) RunWithContext(ctx context.Context, name string, chart *chart. // the user doesn't have to specify both u.Wait = u.Wait || u.Atomic - if err := chartutil.ValidateReleaseName(name); err != nil { + if err := releaseutil.ValidateReleaseName(name); err != nil { return nil, errors.Errorf("release name is invalid: %s", name) } @@ -243,7 +242,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin return nil, nil, err } - if err := chartutil.ProcessDependencies(chart, vals); err != nil { + if err := releaseutil.ProcessDependencies(chart, vals); err != nil { return nil, nil, err } @@ -251,7 +250,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin // the release object. revision := lastRelease.Version + 1 - options := chartutil.ReleaseOptions{ + options := releaseutil.ReleaseOptions{ Name: name, Namespace: currentRelease.Namespace, Revision: revision, @@ -262,7 +261,7 @@ func (u *Upgrade) prepareUpgrade(name string, chart *chart.Chart, vals map[strin if err != nil { return nil, nil, err } - valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chart, vals, options, caps, u.SkipSchemaValidation) + valuesToRender, err := releaseutil.ToRenderValuesWithSchemaValidation(chart, vals, options, caps, u.SkipSchemaValidation) if err != nil { return nil, nil, err } @@ -561,12 +560,12 @@ func (u *Upgrade) reuseValues(chart *chart.Chart, current *release.Release, newV u.cfg.Log("reusing the old release's values") // We have to regenerate the old coalesced values: - oldVals, err := chartutil.CoalesceValues(current.Chart, current.Config) + oldVals, err := releaseutil.CoalesceValues(current.Chart, current.Config) if err != nil { return nil, errors.Wrap(err, "failed to rebuild old values") } - newVals = chartutil.CoalesceTables(newVals, current.Config) + newVals = releaseutil.CoalesceTables(newVals, current.Config) chart.Values = oldVals @@ -577,7 +576,7 @@ func (u *Upgrade) reuseValues(chart *chart.Chart, current *release.Release, newV if u.ResetThenReuseValues { u.cfg.Log("merging values from old release to new values") - newVals = chartutil.CoalesceTables(newVals, current.Config) + newVals = releaseutil.CoalesceTables(newVals, current.Config) return newVals, nil } diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 8f69505f6..323d86610 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/rest" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" + "helm.sh/helm/v4/pkg/releaseutil" ) // Engine is an implementation of the Helm rendering implementation for templates. @@ -73,21 +73,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 *chart.Chart, values releaseutil.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 *chart.Chart, values releaseutil.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 *chart.Chart, values releaseutil.Values, config *rest.Config) (map[string]string, error) { var clientProvider ClientProvider = clientProviderFromConfig{config} return Engine{ clientProvider: &clientProvider, @@ -98,7 +98,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 *chart.Chart, values releaseutil.Values, clientProvider ClientProvider) (map[string]string, error) { return Engine{ clientProvider: &clientProvider, }.Render(chrt, values) @@ -109,7 +109,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 releaseutil.Values // namespace prefix to the templates of the current chart basePath string } @@ -292,7 +292,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"] = releaseutil.Values{"Name": filename, "BasePath": tpls[filename].basePath} var buf strings.Builder if err := t.ExecuteTemplate(&buf, filename, vals); err != nil { return map[string]string{}, cleanupExecError(filename, err) @@ -371,7 +371,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 *chart.Chart, vals releaseutil.Values) map[string]renderable { templates := make(map[string]renderable) recAllTpls(c, templates, vals) return templates @@ -381,7 +381,7 @@ 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 *chart.Chart, templates map[string]renderable, vals releaseutil.Values) map[string]interface{} { subCharts := make(map[string]interface{}) chartMetaData := struct { chart.Metadata @@ -393,7 +393,7 @@ func recAllTpls(c *chart.Chart, templates map[string]renderable, vals chartutil. "Files": newFiles(c.Files), "Release": vals["Release"], "Capabilities": vals["Capabilities"], - "Values": make(chartutil.Values), + "Values": make(releaseutil.Values), "Subcharts": subCharts, } diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index f6a96bd6a..c2d3a9919 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/dynamic/fake" "helm.sh/helm/v4/pkg/chart" - "helm.sh/helm/v4/pkg/chartutil" + "helm.sh/helm/v4/pkg/releaseutil" ) func TestSortTemplates(t *testing.T) { @@ -112,7 +112,7 @@ func TestRender(t *testing.T) { }, } - v, err := chartutil.CoalesceValues(c, vals) + v, err := releaseutil.CoalesceValues(c, vals) if err != nil { t.Fatalf("Failed to coalesce values: %s", err) } @@ -163,7 +163,7 @@ func TestRenderRefsOrdering(t *testing.T) { } for i := 0; i < 100; i++ { - out, err := Render(parentChart, chartutil.Values{}) + out, err := Render(parentChart, releaseutil.Values{}) if err != nil { t.Fatalf("Failed to render templates: %s", err) } @@ -179,7 +179,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 := releaseutil.Values{"Name": "one", "Value": "two"} tpls := map[string]renderable{ "one": {tpl: `Hello {{title .Name}}`, vals: vals}, "two": {tpl: `Goodbye {{upper .Value}}`, vals: vals}, @@ -226,7 +226,7 @@ func TestRenderWithDNS(t *testing.T) { "Values": map[string]interface{}{}, } - v, err := chartutil.CoalesceValues(c, vals) + v, err := releaseutil.CoalesceValues(c, vals) if err != nil { t.Fatalf("Failed to coalesce values: %s", err) } @@ -363,7 +363,7 @@ func TestRenderWithClientProvider(t *testing.T) { "Values": map[string]interface{}{}, } - v, err := chartutil.CoalesceValues(c, vals) + v, err := releaseutil.CoalesceValues(c, vals) if err != nil { t.Fatalf("Failed to coalesce values: %s", err) } @@ -399,7 +399,7 @@ func TestRenderWithClientProvider_error(t *testing.T) { "Values": map[string]interface{}{}, } - v, err := chartutil.CoalesceValues(c, vals) + v, err := releaseutil.CoalesceValues(c, vals) if err != nil { t.Fatalf("Failed to coalesce values: %s", err) } @@ -446,7 +446,7 @@ func TestParallelRenderInternals(t *testing.T) { } func TestParseErrors(t *testing.T) { - vals := chartutil.Values{"Values": map[string]interface{}{}} + vals := releaseutil.Values{"Values": map[string]interface{}{}} tplsUndefinedFunction := map[string]renderable{ "undefined_function": {tpl: `{{foo}}`, vals: vals}, @@ -462,7 +462,7 @@ func TestParseErrors(t *testing.T) { } func TestExecErrors(t *testing.T) { - vals := chartutil.Values{"Values": map[string]interface{}{}} + vals := releaseutil.Values{"Values": map[string]interface{}{}} cases := []struct { name string tpls map[string]renderable @@ -526,7 +526,7 @@ linebreak`, } func TestFailErrors(t *testing.T) { - vals := chartutil.Values{"Values": map[string]interface{}{}} + vals := releaseutil.Values{"Values": map[string]interface{}{}} failtpl := `All your base are belong to us{{ fail "This is an error" }}` tplsFailed := map[string]renderable{ @@ -579,7 +579,7 @@ func TestAllTemplates(t *testing.T) { } dep1.AddDependency(dep2) - tpls := allTemplates(ch1, chartutil.Values{}) + tpls := allTemplates(ch1, releaseutil.Values{}) if len(tpls) != 5 { t.Errorf("Expected 5 charts, got %d", len(tpls)) } @@ -600,7 +600,7 @@ func TestChartValuesContainsIsRoot(t *testing.T) { } ch1.AddDependency(dep1) - out, err := Render(ch1, chartutil.Values{}) + out, err := Render(ch1, releaseutil.Values{}) if err != nil { t.Fatalf("failed to render templates: %s", err) } @@ -704,15 +704,15 @@ func TestRenderNestedValues(t *testing.T) { }, } - tmp, err := chartutil.CoalesceValues(outer, injValues) + tmp, err := releaseutil.CoalesceValues(outer, injValues) if err != nil { t.Fatalf("Failed to coalesce values: %s", err) } - inject := chartutil.Values{ + inject := releaseutil.Values{ "Values": tmp, "Chart": outer.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "dyin", }, } @@ -772,10 +772,10 @@ func TestRenderBuiltinValues(t *testing.T) { } outer.AddDependency(inner) - inject := chartutil.Values{ + inject := releaseutil.Values{ "Values": "", "Chart": outer.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "Aeneid", }, } @@ -819,10 +819,10 @@ func TestAlterFuncMap_include(t *testing.T) { }, } - v := chartutil.Values{ + v := releaseutil.Values{ "Values": "", "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "Mistah Kurtz", }, } @@ -853,13 +853,13 @@ func TestAlterFuncMap_require(t *testing.T) { }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.Values{ "who": "us", "bases": 2, }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "That 90s meme", }, } @@ -880,12 +880,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 := releaseutil.Values{ + "Values": releaseutil.Values{ "who": "us", }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "That 90s meme", }, } @@ -914,12 +914,12 @@ func TestAlterFuncMap_tpl(t *testing.T) { }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.Values{ "value": "myvalue", }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -943,12 +943,12 @@ func TestAlterFuncMap_tplfunc(t *testing.T) { }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.Values{ "value": "myvalue", }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -972,12 +972,12 @@ func TestAlterFuncMap_tplinclude(t *testing.T) { {Name: "templates/_partial", Data: []byte(`{{.Template.Name}}`)}, }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.Values{ "value": "myvalue", }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1003,10 +1003,10 @@ func TestRenderRecursionLimit(t *testing.T) { {Name: "templates/recursion", Data: []byte(`{{define "recursion"}}{{include "recursion" . }}{{end}}`)}, }, } - v := chartutil.Values{ + v := releaseutil.Values{ "Values": "", "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1062,13 +1062,13 @@ func TestRenderLoadTemplateForTplFromFile(t *testing.T) { }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.Values{ "filename": "test", "filename2": "test2", }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1093,9 +1093,9 @@ func TestRenderTplEmpty(t *testing.T) { {Name: "templates/only-defines", Data: []byte(`{{tpl "{{define \"not-invoked\"}}not-rendered{{end}}" .}}`)}, }, } - v := chartutil.Values{ + v := releaseutil.Values{ "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1129,10 +1129,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 := releaseutil.Values{ + "Values": releaseutil.Values{ + "dot": releaseutil.Values{ + "Template": releaseutil.Values{ "BasePath": "path/to/template", "Name": "name-of-template", "Field": "extra-field", @@ -1140,7 +1140,7 @@ func TestRenderTplTemplateNames(t *testing.T) { }, }, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1190,8 +1190,8 @@ func TestRenderTplRedefines(t *testing.T) { )}, }, } - v := chartutil.Values{ - "Values": chartutil.Values{ + v := releaseutil.Values{ + "Values": releaseutil.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" .}}`, @@ -1203,7 +1203,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": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1240,10 +1240,10 @@ func TestRenderTplMissingKey(t *testing.T) { )}, }, } - v := chartutil.Values{ - "Values": chartutil.Values{}, + v := releaseutil.Values{ + "Values": releaseutil.Values{}, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } @@ -1273,10 +1273,10 @@ func TestRenderTplMissingKeyString(t *testing.T) { )}, }, } - v := chartutil.Values{ - "Values": chartutil.Values{}, + v := releaseutil.Values{ + "Values": releaseutil.Values{}, "Chart": c.Metadata, - "Release": chartutil.Values{ + "Release": releaseutil.Values{ "Name": "TestRelease", }, } diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go index 70a49ee90..1d203bdb8 100644 --- a/pkg/lint/lint.go +++ b/pkg/lint/lint.go @@ -19,19 +19,19 @@ package lint // import "helm.sh/helm/v4/pkg/lint" import ( "path/filepath" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/lint/rules" "helm.sh/helm/v4/pkg/lint/support" + "helm.sh/helm/v4/pkg/releaseutil" ) type linterOptions struct { - KubeVersion *chartutil.KubeVersion + KubeVersion *releaseutil.KubeVersion SkipSchemaValidation bool } type LinterOption func(lo *linterOptions) -func WithKubeVersion(kubeVersion *chartutil.KubeVersion) LinterOption { +func WithKubeVersion(kubeVersion *releaseutil.KubeVersion) LinterOption { return func(lo *linterOptions) { lo.KubeVersion = kubeVersion } diff --git a/pkg/lint/rules/deprecations.go b/pkg/lint/rules/deprecations.go index 6eae06802..9f8f741a1 100644 --- a/pkg/lint/rules/deprecations.go +++ b/pkg/lint/rules/deprecations.go @@ -20,12 +20,11 @@ import ( "fmt" "strconv" + "helm.sh/helm/v4/pkg/releaseutil" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/endpoints/deprecation" kscheme "k8s.io/client-go/kubernetes/scheme" - - "helm.sh/helm/v4/pkg/chartutil" ) var ( @@ -47,7 +46,7 @@ func (e deprecatedAPIError) Error() string { return msg } -func validateNoDeprecations(resource *K8sYamlStruct, kubeVersion *chartutil.KubeVersion) error { +func validateNoDeprecations(resource *K8sYamlStruct, kubeVersion *releaseutil.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/pkg/lint/rules/template.go b/pkg/lint/rules/template.go index a50485a50..950a94283 100644 --- a/pkg/lint/rules/template.go +++ b/pkg/lint/rules/template.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "helm.sh/helm/v4/pkg/chart/loader" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/engine" "helm.sh/helm/v4/pkg/lint/support" + "helm.sh/helm/v4/pkg/releaseutil" ) var ( @@ -50,12 +50,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 *releaseutil.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 *releaseutil.KubeVersion, skipSchemaValidation bool) { fpath := "templates/" templatesPath := filepath.Join(linter.ChartDir, fpath) @@ -75,28 +75,28 @@ func TemplatesWithSkipSchemaValidation(linter *support.Linter, values map[string return } - options := chartutil.ReleaseOptions{ + options := releaseutil.ReleaseOptions{ Name: "test-release", Namespace: namespace, } - caps := chartutil.DefaultCapabilities.Copy() + caps := releaseutil.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 { + if err := releaseutil.ProcessDependencies(chart, values); err != nil { return } - cvals, err := chartutil.CoalesceValues(chart, values) + cvals, err := releaseutil.CoalesceValues(chart, values) if err != nil { return } - valuesToRender, err := chartutil.ToRenderValuesWithSchemaValidation(chart, cvals, options, caps, skipSchemaValidation) + valuesToRender, err := releaseutil.ToRenderValuesWithSchemaValidation(chart, cvals, options, caps, skipSchemaValidation) if err != nil { linter.RunLinterRule(support.ErrorSev, fpath, err) return diff --git a/pkg/lint/rules/values.go b/pkg/lint/rules/values.go index 82278522d..1b04e21de 100644 --- a/pkg/lint/rules/values.go +++ b/pkg/lint/rules/values.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/lint/support" + "helm.sh/helm/v4/pkg/releaseutil" ) // ValuesWithOverrides tests the values.yaml file. @@ -53,7 +53,7 @@ func validateValuesFileExistence(valuesPath string) error { } func validateValuesFile(valuesPath string, overrides map[string]interface{}) error { - values, err := chartutil.ReadValuesFile(valuesPath) + values, err := releaseutil.ReadValuesFile(valuesPath) if err != nil { return errors.Wrap(err, "unable to parse YAML") } @@ -63,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 := releaseutil.CoalesceTables(make(map[string]interface{}, len(overrides)), overrides) + coalescedValues = releaseutil.CoalesceTables(coalescedValues, values) ext := filepath.Ext(valuesPath) schemaPath := valuesPath[:len(valuesPath)-len(ext)] + ".schema.json" @@ -75,5 +75,5 @@ func validateValuesFile(valuesPath string, overrides map[string]interface{}) err if err != nil { return err } - return chartutil.ValidateAgainstSingleSchema(coalescedValues, schema) + return releaseutil.ValidateAgainstSingleSchema(coalescedValues, schema) } diff --git a/pkg/chartutil/capabilities.go b/pkg/releaseutil/capabilities.go similarity index 99% rename from pkg/chartutil/capabilities.go rename to pkg/releaseutil/capabilities.go index 6c1ebf24c..2f373084a 100644 --- a/pkg/chartutil/capabilities.go +++ b/pkg/releaseutil/capabilities.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "fmt" diff --git a/pkg/chartutil/capabilities_test.go b/pkg/releaseutil/capabilities_test.go similarity index 99% rename from pkg/chartutil/capabilities_test.go rename to pkg/releaseutil/capabilities_test.go index 502b0c7d5..bcc9898c8 100644 --- a/pkg/chartutil/capabilities_test.go +++ b/pkg/releaseutil/capabilities_test.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "testing" diff --git a/pkg/chartutil/coalesce.go b/pkg/releaseutil/coalesce.go similarity index 99% rename from pkg/chartutil/coalesce.go rename to pkg/releaseutil/coalesce.go index a46936cc6..dec5408c6 100644 --- a/pkg/chartutil/coalesce.go +++ b/pkg/releaseutil/coalesce.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "fmt" diff --git a/pkg/chartutil/coalesce_test.go b/pkg/releaseutil/coalesce_test.go similarity index 99% rename from pkg/chartutil/coalesce_test.go rename to pkg/releaseutil/coalesce_test.go index e207274d7..6f2effd42 100644 --- a/pkg/chartutil/coalesce_test.go +++ b/pkg/releaseutil/coalesce_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "encoding/json" diff --git a/pkg/chartutil/compatible.go b/pkg/releaseutil/compatible.go similarity index 97% rename from pkg/chartutil/compatible.go rename to pkg/releaseutil/compatible.go index f4656c913..7c862c76e 100644 --- a/pkg/chartutil/compatible.go +++ b/pkg/releaseutil/compatible.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import "github.com/Masterminds/semver/v3" diff --git a/pkg/chartutil/compatible_test.go b/pkg/releaseutil/compatible_test.go similarity index 98% rename from pkg/chartutil/compatible_test.go rename to pkg/releaseutil/compatible_test.go index df7be6161..14944a9c5 100644 --- a/pkg/chartutil/compatible_test.go +++ b/pkg/releaseutil/compatible_test.go @@ -15,7 +15,7 @@ limitations under the License. */ // Package version represents the current version of the project. -package chartutil +package releaseutil import "testing" diff --git a/pkg/chartutil/dependencies.go b/pkg/releaseutil/dependencies.go similarity index 99% rename from pkg/chartutil/dependencies.go rename to pkg/releaseutil/dependencies.go index f0ba166d9..975b3b94d 100644 --- a/pkg/chartutil/dependencies.go +++ b/pkg/releaseutil/dependencies.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "log" diff --git a/pkg/chartutil/dependencies_test.go b/pkg/releaseutil/dependencies_test.go similarity index 99% rename from pkg/chartutil/dependencies_test.go rename to pkg/releaseutil/dependencies_test.go index ac8e4d76e..0a6931625 100644 --- a/pkg/chartutil/dependencies_test.go +++ b/pkg/releaseutil/dependencies_test.go @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "encoding/json" diff --git a/pkg/releaseutil/errors.go b/pkg/releaseutil/errors.go new file mode 100644 index 000000000..4a4a87134 --- /dev/null +++ b/pkg/releaseutil/errors.go @@ -0,0 +1,35 @@ +/* +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 releaseutil + +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) } diff --git a/pkg/releaseutil/errors_test.go b/pkg/releaseutil/errors_test.go new file mode 100644 index 000000000..68661b584 --- /dev/null +++ b/pkg/releaseutil/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 releaseutil + +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/pkg/chartutil/jsonschema.go b/pkg/releaseutil/jsonschema.go similarity index 99% rename from pkg/chartutil/jsonschema.go rename to pkg/releaseutil/jsonschema.go index f1c8dcdf4..91f03c0ed 100644 --- a/pkg/chartutil/jsonschema.go +++ b/pkg/releaseutil/jsonschema.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "bytes" diff --git a/pkg/chartutil/jsonschema_test.go b/pkg/releaseutil/jsonschema_test.go similarity index 99% rename from pkg/chartutil/jsonschema_test.go rename to pkg/releaseutil/jsonschema_test.go index 098cf70db..2449bf6d7 100644 --- a/pkg/chartutil/jsonschema_test.go +++ b/pkg/releaseutil/jsonschema_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "os" diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go index b2db2ff9f..6ada32211 100644 --- a/pkg/releaseutil/manifest_sorter.go +++ b/pkg/releaseutil/manifest_sorter.go @@ -26,7 +26,6 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/v4/pkg/chartutil" "helm.sh/helm/v4/pkg/release" ) @@ -74,7 +73,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, _ VersionSet, ordering KindSortOrder) ([]*release.Hook, []Manifest, error) { result := &result{} var sortedFilePaths []string diff --git a/pkg/chartutil/testdata/coleridge.yaml b/pkg/releaseutil/testdata/coleridge.yaml similarity index 100% rename from pkg/chartutil/testdata/coleridge.yaml rename to pkg/releaseutil/testdata/coleridge.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/.helmignore b/pkg/releaseutil/testdata/dependent-chart-alias/.helmignore similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/.helmignore rename to pkg/releaseutil/testdata/dependent-chart-alias/.helmignore diff --git a/pkg/chartutil/testdata/dependent-chart-alias/Chart.lock b/pkg/releaseutil/testdata/dependent-chart-alias/Chart.lock similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/Chart.lock rename to pkg/releaseutil/testdata/dependent-chart-alias/Chart.lock diff --git a/pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/INSTALL.txt b/pkg/releaseutil/testdata/dependent-chart-alias/INSTALL.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/INSTALL.txt rename to pkg/releaseutil/testdata/dependent-chart-alias/INSTALL.txt diff --git a/pkg/chartutil/testdata/dependent-chart-alias/LICENSE b/pkg/releaseutil/testdata/dependent-chart-alias/LICENSE similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/LICENSE rename to pkg/releaseutil/testdata/dependent-chart-alias/LICENSE diff --git a/pkg/chartutil/testdata/dependent-chart-alias/README.md b/pkg/releaseutil/testdata/dependent-chart-alias/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/README.md rename to pkg/releaseutil/testdata/dependent-chart-alias/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/_ignore_me b/pkg/releaseutil/testdata/dependent-chart-alias/charts/_ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/_ignore_me rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/_ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/README.md b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/README.md rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast1/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/charts/mast2-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/templates/alpine-pod.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/values.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/alpine/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/alpine/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz b/pkg/releaseutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz rename to pkg/releaseutil/testdata/dependent-chart-alias/charts/mariner-4.3.2.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-alias/docs/README.md b/pkg/releaseutil/testdata/dependent-chart-alias/docs/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/docs/README.md rename to pkg/releaseutil/testdata/dependent-chart-alias/docs/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-alias/icon.svg b/pkg/releaseutil/testdata/dependent-chart-alias/icon.svg similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/icon.svg rename to pkg/releaseutil/testdata/dependent-chart-alias/icon.svg diff --git a/pkg/chartutil/testdata/dependent-chart-alias/ignore/me.txt b/pkg/releaseutil/testdata/dependent-chart-alias/ignore/me.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/ignore/me.txt rename to pkg/releaseutil/testdata/dependent-chart-alias/ignore/me.txt diff --git a/pkg/chartutil/testdata/dependent-chart-alias/templates/template.tpl b/pkg/releaseutil/testdata/dependent-chart-alias/templates/template.tpl similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/templates/template.tpl rename to pkg/releaseutil/testdata/dependent-chart-alias/templates/template.tpl diff --git a/pkg/chartutil/testdata/dependent-chart-alias/values.yaml b/pkg/releaseutil/testdata/dependent-chart-alias/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-alias/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-alias/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/.helmignore b/pkg/releaseutil/testdata/dependent-chart-helmignore/.helmignore similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/.helmignore rename to pkg/releaseutil/testdata/dependent-chart-helmignore/.helmignore diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/.ignore_me b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/.ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/.ignore_me rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/.ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/_ignore_me b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/_ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/_ignore_me rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/_ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/README.md b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/README.md rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast1/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/charts/mast2-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/templates/alpine-pod.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/charts/alpine/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/templates/template.tpl b/pkg/releaseutil/testdata/dependent-chart-helmignore/templates/template.tpl similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/templates/template.tpl rename to pkg/releaseutil/testdata/dependent-chart-helmignore/templates/template.tpl diff --git a/pkg/chartutil/testdata/dependent-chart-helmignore/values.yaml b/pkg/releaseutil/testdata/dependent-chart-helmignore/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-helmignore/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-helmignore/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/.helmignore b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/.helmignore similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/.helmignore rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/.helmignore diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/INSTALL.txt diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/LICENSE b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/LICENSE similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/LICENSE rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/LICENSE diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/README.md b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/README.md rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/_ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast1/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/templates/alpine-pod.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/alpine/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/charts/mariner-4.3.2.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/docs/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/icon.svg b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/icon.svg similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/icon.svg rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/icon.svg diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/ignore/me.txt diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/templates/template.tpl diff --git a/pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/values.yaml b/pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-no-requirements-yaml/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-no-requirements-yaml/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/.helmignore diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/INSTALL.txt diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/LICENSE diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/_ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast1/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/templates/alpine-pod.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/alpine/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/charts/mariner-4.3.2.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/docs/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/icon.svg diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/ignore/me.txt diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/templates/template.tpl diff --git a/pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-all-in-requirements-yaml/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/.helmignore diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/INSTALL.txt diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/LICENSE diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/_ignore_me diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/Chart.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast1/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/charts/mast2-0.1.0.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/templates/alpine-pod.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/alpine/values.yaml diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/charts/mariner-4.3.2.tgz diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/docs/README.md diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/icon.svg diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/ignore/me.txt diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/templates/template.tpl diff --git a/pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml b/pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml similarity index 100% rename from pkg/chartutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml rename to pkg/releaseutil/testdata/dependent-chart-with-mixed-requirements-yaml/values.yaml diff --git a/pkg/releaseutil/testdata/frobnitz/.helmignore b/pkg/releaseutil/testdata/frobnitz/.helmignore new file mode 100644 index 000000000..9973a57b8 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/.helmignore @@ -0,0 +1 @@ +ignore/ diff --git a/pkg/releaseutil/testdata/frobnitz/Chart.lock b/pkg/releaseutil/testdata/frobnitz/Chart.lock new file mode 100644 index 000000000..6fcc2ed9f --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/Chart.yaml b/pkg/releaseutil/testdata/frobnitz/Chart.yaml new file mode 100644 index 000000000..fcd4a4a37 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/Chart.yaml @@ -0,0 +1,27 @@ +apiVersion: v1 +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/pkg/releaseutil/testdata/frobnitz/INSTALL.txt b/pkg/releaseutil/testdata/frobnitz/INSTALL.txt new file mode 100644 index 000000000..2010438c2 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/INSTALL.txt @@ -0,0 +1 @@ +This is an install document. The client may display this. diff --git a/pkg/releaseutil/testdata/frobnitz/LICENSE b/pkg/releaseutil/testdata/frobnitz/LICENSE new file mode 100644 index 000000000..6121943b1 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/LICENSE @@ -0,0 +1 @@ +LICENSE placeholder. diff --git a/pkg/releaseutil/testdata/frobnitz/README.md b/pkg/releaseutil/testdata/frobnitz/README.md new file mode 100644 index 000000000..8cf4cc3d7 --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/charts/_ignore_me b/pkg/releaseutil/testdata/frobnitz/charts/_ignore_me new file mode 100644 index 000000000..2cecca682 --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/charts/alpine/Chart.yaml b/pkg/releaseutil/testdata/frobnitz/charts/alpine/Chart.yaml new file mode 100644 index 000000000..79e0d65db --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/alpine/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +name: alpine +description: Deploy a basic Alpine Linux pod +version: 0.1.0 +home: https://helm.sh/helm diff --git a/pkg/releaseutil/testdata/frobnitz/charts/alpine/README.md b/pkg/releaseutil/testdata/frobnitz/charts/alpine/README.md new file mode 100644 index 000000000..b30b949dd --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml b/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml new file mode 100644 index 000000000..1c9dd5fa4 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +name: mast1 +description: A Helm chart for Kubernetes +version: 0.1.0 +home: "" diff --git a/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml b/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast1/values.yaml new file mode 100644 index 000000000..42c39c262 --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz b/pkg/releaseutil/testdata/frobnitz/charts/alpine/charts/mast2-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..61cb62051110b55f3d08213dc81dcf0b1c2d8e53 GIT binary patch literal 252 zcmVDc zVQyr3R8em|NM&qo0PNJUs=_c72H?(liabH@pWIst-7YSIyL+rhEHrIN(t?QZE=F{y zgNRfS&$pa5Ly`mMk2OB%pV`*9knW7FlL-Joo@KED7*{C$d;N~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/pkg/releaseutil/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml b/pkg/releaseutil/testdata/frobnitz/charts/alpine/templates/alpine-pod.yaml new file mode 100644 index 000000000..5bbae10af --- /dev/null +++ b/pkg/releaseutil/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/pkg/releaseutil/testdata/frobnitz/charts/alpine/values.yaml b/pkg/releaseutil/testdata/frobnitz/charts/alpine/values.yaml new file mode 100644 index 000000000..6c2aab7ba --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/alpine/values.yaml @@ -0,0 +1,2 @@ +# The pod name +name: "my-alpine" diff --git a/pkg/releaseutil/testdata/frobnitz/charts/mariner/Chart.yaml b/pkg/releaseutil/testdata/frobnitz/charts/mariner/Chart.yaml new file mode 100644 index 000000000..92dc4b390 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/mariner/Chart.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +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/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml b/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml new file mode 100644 index 000000000..b5188fde0 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +name: albatross +description: A Helm chart for Kubernetes +version: 0.1.0 +home: "" diff --git a/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml b/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml new file mode 100644 index 000000000..3121cd7ce --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/mariner/charts/albatross/values.yaml @@ -0,0 +1,4 @@ +albatross: "true" + +global: + author: Coleridge diff --git a/pkg/releaseutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl b/pkg/releaseutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl new file mode 100644 index 000000000..29c11843a --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/mariner/templates/placeholder.tpl @@ -0,0 +1 @@ +# This is a placeholder. diff --git a/pkg/releaseutil/testdata/frobnitz/charts/mariner/values.yaml b/pkg/releaseutil/testdata/frobnitz/charts/mariner/values.yaml new file mode 100644 index 000000000..b0ccb0086 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/charts/mariner/values.yaml @@ -0,0 +1,7 @@ +# Default values for . +# This is a YAML-formatted file. https://github.com/toml-lang/toml +# Declare name/value pairs to be passed into your templates. +# name: "value" + +: + test: true diff --git a/pkg/releaseutil/testdata/frobnitz/docs/README.md b/pkg/releaseutil/testdata/frobnitz/docs/README.md new file mode 100644 index 000000000..d40747caf --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/docs/README.md @@ -0,0 +1 @@ +This is a placeholder for documentation. diff --git a/pkg/releaseutil/testdata/frobnitz/icon.svg b/pkg/releaseutil/testdata/frobnitz/icon.svg new file mode 100644 index 000000000..892130606 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/icon.svg @@ -0,0 +1,8 @@ + + + Example icon + + + diff --git a/pkg/chartutil/testdata/joonix/charts/.gitkeep b/pkg/releaseutil/testdata/frobnitz/ignore/me.txt similarity index 100% rename from pkg/chartutil/testdata/joonix/charts/.gitkeep rename to pkg/releaseutil/testdata/frobnitz/ignore/me.txt diff --git a/pkg/releaseutil/testdata/frobnitz/templates/template.tpl b/pkg/releaseutil/testdata/frobnitz/templates/template.tpl new file mode 100644 index 000000000..c651ee6a0 --- /dev/null +++ b/pkg/releaseutil/testdata/frobnitz/templates/template.tpl @@ -0,0 +1 @@ +Hello {{.Name | default "world"}} diff --git a/pkg/releaseutil/testdata/frobnitz/values.yaml b/pkg/releaseutil/testdata/frobnitz/values.yaml new file mode 100644 index 000000000..61f501258 --- /dev/null +++ b/pkg/releaseutil/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/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.lock diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/Chart.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/dev-v0.1.0.tgz diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/charts/prod-v0.1.0.tgz diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/Chart.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/dev/values.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/Chart.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/envs/prod/values.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/templates/autoscaler.yaml diff --git a/pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml b/pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml similarity index 100% rename from pkg/chartutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml rename to pkg/releaseutil/testdata/import-values-from-enabled-subchart/parent-chart/values.yaml diff --git a/pkg/chartutil/testdata/joonix/Chart.yaml b/pkg/releaseutil/testdata/joonix/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/joonix/Chart.yaml rename to pkg/releaseutil/testdata/joonix/Chart.yaml diff --git a/pkg/releaseutil/testdata/joonix/charts/.gitkeep b/pkg/releaseutil/testdata/joonix/charts/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/pkg/chartutil/testdata/subpop/Chart.yaml b/pkg/releaseutil/testdata/subpop/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/Chart.yaml rename to pkg/releaseutil/testdata/subpop/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/README.md b/pkg/releaseutil/testdata/subpop/README.md similarity index 100% rename from pkg/chartutil/testdata/subpop/README.md rename to pkg/releaseutil/testdata/subpop/README.md diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartA/values.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/charts/subchartB/values.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/crds/crdA.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/crds/crdA.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/crds/crdA.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/crds/crdA.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/NOTES.txt b/pkg/releaseutil/testdata/subpop/charts/subchart1/templates/NOTES.txt similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/NOTES.txt rename to pkg/releaseutil/testdata/subpop/charts/subchart1/templates/NOTES.txt diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/role.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/rolebinding.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/templates/subdir/serviceaccount.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart1/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart1/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart1/values.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartB/values.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/charts/subchartC/values.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/charts/subchart2/values.yaml b/pkg/releaseutil/testdata/subpop/charts/subchart2/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/charts/subchart2/values.yaml rename to pkg/releaseutil/testdata/subpop/charts/subchart2/values.yaml diff --git a/pkg/chartutil/testdata/subpop/noreqs/Chart.yaml b/pkg/releaseutil/testdata/subpop/noreqs/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/noreqs/Chart.yaml rename to pkg/releaseutil/testdata/subpop/noreqs/Chart.yaml diff --git a/pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml b/pkg/releaseutil/testdata/subpop/noreqs/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/noreqs/templates/service.yaml rename to pkg/releaseutil/testdata/subpop/noreqs/templates/service.yaml diff --git a/pkg/chartutil/testdata/subpop/noreqs/values.yaml b/pkg/releaseutil/testdata/subpop/noreqs/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/noreqs/values.yaml rename to pkg/releaseutil/testdata/subpop/noreqs/values.yaml diff --git a/pkg/chartutil/testdata/subpop/values.yaml b/pkg/releaseutil/testdata/subpop/values.yaml similarity index 100% rename from pkg/chartutil/testdata/subpop/values.yaml rename to pkg/releaseutil/testdata/subpop/values.yaml diff --git a/pkg/chartutil/testdata/test-values-invalid.schema.json b/pkg/releaseutil/testdata/test-values-invalid.schema.json similarity index 100% rename from pkg/chartutil/testdata/test-values-invalid.schema.json rename to pkg/releaseutil/testdata/test-values-invalid.schema.json diff --git a/pkg/chartutil/testdata/test-values-negative.yaml b/pkg/releaseutil/testdata/test-values-negative.yaml similarity index 100% rename from pkg/chartutil/testdata/test-values-negative.yaml rename to pkg/releaseutil/testdata/test-values-negative.yaml diff --git a/pkg/chartutil/testdata/test-values.schema.json b/pkg/releaseutil/testdata/test-values.schema.json similarity index 100% rename from pkg/chartutil/testdata/test-values.schema.json rename to pkg/releaseutil/testdata/test-values.schema.json diff --git a/pkg/chartutil/testdata/test-values.yaml b/pkg/releaseutil/testdata/test-values.yaml similarity index 100% rename from pkg/chartutil/testdata/test-values.yaml rename to pkg/releaseutil/testdata/test-values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/README.md b/pkg/releaseutil/testdata/three-level-dependent-chart/README.md similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/README.md rename to pkg/releaseutil/testdata/three-level-dependent-chart/README.md diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app2/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/charts/library/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app3/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/Chart.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/charts/library/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/templates/service.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/charts/app4/values.yaml diff --git a/pkg/chartutil/testdata/three-level-dependent-chart/umbrella/values.yaml b/pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/values.yaml similarity index 100% rename from pkg/chartutil/testdata/three-level-dependent-chart/umbrella/values.yaml rename to pkg/releaseutil/testdata/three-level-dependent-chart/umbrella/values.yaml diff --git a/pkg/chartutil/validate_name.go b/pkg/releaseutil/validate_name.go similarity index 99% rename from pkg/chartutil/validate_name.go rename to pkg/releaseutil/validate_name.go index 05c090cb6..aabf6b3c0 100644 --- a/pkg/chartutil/validate_name.go +++ b/pkg/releaseutil/validate_name.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "fmt" diff --git a/pkg/chartutil/validate_name_test.go b/pkg/releaseutil/validate_name_test.go similarity index 99% rename from pkg/chartutil/validate_name_test.go rename to pkg/releaseutil/validate_name_test.go index 09dec9fbb..9857c977b 100644 --- a/pkg/chartutil/validate_name_test.go +++ b/pkg/releaseutil/validate_name_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import "testing" diff --git a/pkg/chartutil/values.go b/pkg/releaseutil/values.go similarity index 99% rename from pkg/chartutil/values.go rename to pkg/releaseutil/values.go index 706c44d48..29cba48a5 100644 --- a/pkg/chartutil/values.go +++ b/pkg/releaseutil/values.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "encoding/json" diff --git a/pkg/chartutil/values_test.go b/pkg/releaseutil/values_test.go similarity index 99% rename from pkg/chartutil/values_test.go rename to pkg/releaseutil/values_test.go index 56167c8a1..61e926d06 100644 --- a/pkg/chartutil/values_test.go +++ b/pkg/releaseutil/values_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package chartutil +package releaseutil import ( "bytes"