fix: support helm v4 beside v3 and remove -c flag for helm version as it does nothing

features.
This commit is contained in:
hmilkovi
2025-11-15 23:21:35 +01:00
parent 77b3446b36
commit 54848c1049
12 changed files with 218 additions and 65 deletions

View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
// Helm chart inflation generator.
// Uses helm V3 to generate k8s YAML from a helm chart.
// Uses helm V3 or V4 to generate k8s YAML from a helm chart.
//go:generate pluginator
package main
@@ -375,9 +375,9 @@ func (p *plugin) markHelmGeneratedResources(rm resmap.ResMap) error {
return nil
}
// checkHelmVersion will return an error if the helm version is not V3
// checkHelmVersion will return an error if the helm version is not V3 or V4
func (p *plugin) checkHelmVersion() error {
stdout, err := p.runHelmCommand([]string{"version", "-c", "--short"})
stdout, err := p.runHelmCommand([]string{"version", "--short"})
if err != nil {
return err
}
@@ -393,8 +393,8 @@ func (p *plugin) checkHelmVersion() error {
v = v[1:]
}
majorVersion := strings.Split(v, ".")[0]
if majorVersion != "3" {
return fmt.Errorf("this plugin requires helm V3 but got v%s", v)
if majorVersion != "3" && majorVersion != "4" {
return fmt.Errorf("this plugin requires helm V3 or V4 but got v%s", v)
}
return nil
}