kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-07-16 17:33:14 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
api/internal/builtins/HelmChartInflationGenerator.go
View File

@@ -367,9 +367,9 @@ func (p *HelmChartInflationGeneratorPlugin) markHelmGeneratedResources(rm resmap
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 *HelmChartInflationGeneratorPlugin) checkHelmVersion() error {
stdout, err := p.runHelmCommand([]string{"version", "-c", "--short"})
stdout, err := p.runHelmCommand([]string{"version", "--short"})
if err != nil {
return err
}
@@ -385,8 +385,8 @@ func (p *HelmChartInflationGeneratorPlugin) 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
}

5
api/internal/builtins/PatchTransformer.go
View File

@@ -89,7 +89,10 @@ func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error {
if p.smPatches != nil {
return p.transformStrategicMerge(m)
}
return p.transformJson6902(m)
if p.jsonPatches != nil {
return p.transformJson6902(m)
}
return nil
}
// transformStrategicMerge applies each loaded strategic merge patch

2
api/internal/loader/fileloader_test.go
View File

@@ -686,5 +686,5 @@ func TestLoaderHTTPMalformedURL(t *testing.T) {
RestrictionRootOnly, MakeFakeFs([]testData{}), filesys.Separator)
_, err := l1.Load(malformedURL)
require.Error(err)
require.Equal("HTTP Error: status code 500 (Internal Server Error)", err.Error())
require.Equal("HTTP Error: status code 400 (Bad Request)", err.Error())
}