Lock helm version to v3

MacroPower · Jan 3, 2025 · cfb318d · cfb318d
1 parent b6d9613
commit cfb318d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 20 deletions.
diff --git a/modules/helm/README.md b/modules/helm/README.md
@@ -19,7 +19,6 @@ Helm chart resource.
 | name                          | type | description                                                                                                                                        | default value |
 | ----------------------------- | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
 | **chart** `required`          | str  | The Helm chart name.                                                                                                                               |               |
-| **helmVersion**               | str  | HelmVersion is the version of Helm to use. One of: [v2, v3].                                                                                       | "v3"          |
 | **namespace**                 | str  | Namespace is an optional namespace to template with.                                                                                               |               |
 | **passCredentials**           | bool | Set to `True` to pass credentials to all domains (Helm's `--pass-credentials`).                                                                    | False         |
 | **project**                   | str  | Project is a reference to the project this chart's releases belong to,<br />e.g. the Argo AppProject. This is used to segregate Helm chart caches. |               |

diff --git a/modules/helm/main.k b/modules/helm/main.k
@@ -21,8 +21,6 @@ schema ChartBase:
         The Helm release name to use. If omitted it will use the chart name.
     namespace: str, optional.
         Namespace is an optional namespace to template with.
-    helmVersion: str, default is "v3", optional.
-        HelmVersion is the version of Helm to use. One of: [v2, v3].
     skipCRDs: bool, default is False, optional.
         Set to `True` to skip the custom resource definition installation step
         (Helm's `--skip-crds`).
@@ -36,17 +34,13 @@ schema ChartBase:
     targetRevision: str
     releaseName?: str
     namespace?: str
-    helmVersion?: str = "v3"
     skipCRDs?: bool = False
     passCredentials?: bool = False
     schemaValidator?: "KCL" | "HELM"
 
     check:
         not regex.match(repoURL, r"^oci://"), \
           "Invalid repoURL: ${repoURL}. OCI registries must not include a scheme (e.g. `oci://`)"
-        any x in ["v2", "v3"] {
-            x == helmVersion
-        }, "Invalid helmVersion: ${helmVersion}. Must be one of: [v2, v3]"
 
 schema Chart(ChartBase):
     """Helm chart resource.
@@ -126,7 +120,6 @@ template = lambda chart: Chart -> [{str:}] {
         target_revision=_chart.targetRevision,
         release_name=_chart.releaseName,
         namespace=_chart.namespace,
-        helm_version=_chart.helmVersion,
         skip_crds=_chart.skipCRDs,
         skip_schema_validation=_skipSchemaValidation,
         pass_credentials=_chart.passCredentials,

diff --git a/modules/helm/main_test.k b/modules/helm/main_test.k
@@ -3,7 +3,6 @@ test_Chart = lambda {
         chart = "test-https"
         repoURL = "https://example.com"
         targetRevision = "0.1.0"
-        helmVersion = "v3"
     }
 
     oci = Chart {
@@ -12,13 +11,6 @@ test_Chart = lambda {
         targetRevision = "0.1.0"
     }
 
-    helmV2 = Chart {
-        chart = "test-helm-v2"
-        repoURL = "https://example.com"
-        targetRevision = "0.1.0"
-        helmVersion = "v2"
-    }
-
     patchRenderer = Chart {
         chart = "test-oci"
         repoURL = "example.com"

diff --git a/pkg/helm/chart.go b/pkg/helm/chart.go
@@ -23,7 +23,6 @@ type TemplateOpts struct {
 	RepoURL              string
 	ReleaseName          string
 	Namespace            string
-	HelmVersion          string
 	ValuesObject         map[string]any
 	Repositories         []argohelm.HelmRepository
 	Credentials          Creds
@@ -86,7 +85,7 @@ func (c *Chart) template() ([]byte, error) {
 	// isLocal controls helm temp dirs, does not seem to impact pull/template behavior.
 	isLocal := false
 
-	ha, err := argohelm.NewHelmApp(chartPath, c.TemplateOpts.Repositories, isLocal, c.TemplateOpts.HelmVersion,
+	ha, err := argohelm.NewHelmApp(chartPath, c.TemplateOpts.Repositories, isLocal, "v3",
 		c.TemplateOpts.Proxy, c.TemplateOpts.NoProxy, c.TemplateOpts.PassCredentials)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing helm app object: %w", err)

diff --git a/pkg/plugin/helm/plugin.go b/pkg/plugin/helm/plugin.go
@@ -26,7 +26,6 @@ var Plugin = plugin.Plugin{
 					"repo_url":               "str",
 					"release_name":           "str",
 					"namespace":              "str",
-					"helm_version":           "str",
 					"skip_crds":              "bool",
 					"skip_schema_validation": "bool",
 					"pass_credentials":       "bool",
@@ -59,7 +58,6 @@ var Plugin = plugin.Plugin{
 					RepoURL:              repoURL,
 					ReleaseName:          safeArgs.StrKwArg("release_name", chartName),
 					Namespace:            namespace,
-					HelmVersion:          safeArgs.StrKwArg("helm_version", "v3"),
 					SkipCRDs:             safeArgs.BoolKwArg("skip_crds", false),
 					SkipSchemaValidation: safeArgs.BoolKwArg("skip_schema_validation", true),
 					PassCredentials:      safeArgs.BoolKwArg("pass_credentials", false),