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

fix error text

migrate tests from Helm V3 to V4

run Helm tests for multiple Helm versions

fix lint issues

Update Makefile-tools.mk

Co-authored-by: Niklas Wagner <[email protected]>

Author: 2 people

Makefile-tools.mk

@@ -19,6 +19,7 @@ install-out-of-tree-tools: \
 	$(MYGOBIN)/goimports \
 	$(MYGOBIN)/golangci-lint \
 	$(MYGOBIN)/helmV3 \
+	$(MYGOBIN)/helmV4 \
 	$(MYGOBIN)/mdrip \
 	$(MYGOBIN)/stringer
 
@@ -27,6 +28,7 @@ uninstall-out-of-tree-tools:
 	rm -f $(MYGOBIN)/goimports
 	rm -f $(MYGOBIN)/golangci-lint
 	rm -f $(MYGOBIN)/helmV3
+	rm -f $(MYGOBIN)/helmV4
 	rm -f $(MYGOBIN)/mdrip
 	rm -f $(MYGOBIN)/stringer
 
@@ -82,16 +84,30 @@ $(MYGOBIN)/gh:
 $(MYGOBIN)/kubeval:
 	cd $(REPO_ROOT)/hack && go install github.com/instrumenta/kubeval
 
-# Helm V3 differs from helm V2; downloading it to provide coverage for the
-# chart inflator plugin under helm v3.
+# Helm V3; downloading it to provide coverage for the
+# chart inflator plugin under helm v3
 .PHONY: $(MYGOBIN)/helmV3
 $(MYGOBIN)/helmV3:
 	( \
 		set -e; \
 		d=$(shell mktemp -d); cd $$d; \
-		tgzFile=helm-v3.10.2-$(GOOS)-$(GOARCH).tar.gz; \
+		tgzFile=helm-v3.19.2-$(GOOS)-$(GOARCH).tar.gz; \
 		wget https://get.helm.sh/$$tgzFile; \
 		tar -xvzf $$tgzFile; \
 		mv $(GOOS)-$(GOARCH)/helm $(MYGOBIN)/helmV3; \
 		rm -rf $$d \
 	)
+
+# Helm V4; downloading it to provide coverage for the
+# chart inflator plugin under helm v4.
+.PHONY: $(MYGOBIN)/helmV4
+$(MYGOBIN)/helmV4:
+	( \
+		set -e; \
+		d=$(shell mktemp -d); cd $$d; \
+		tgzFile=helm-v4.0.0-$(GOOS)-$(GOARCH).tar.gz; \
+		wget https://get.helm.sh/$$tgzFile; \
+		tar -xvzf $$tgzFile; \
+		mv $(GOOS)-$(GOARCH)/helm $(MYGOBIN)/helmV4; \
+		rm -rf $$d \
+	)

api/internal/builtins/HelmChartInflationGenerator.go

@@ -30,7 +30,7 @@ func EnabledPluginConfig(b BuiltinPluginLoadingOptions) (pc *PluginConfig) {
 	pc = MakePluginConfig(PluginRestrictionsNone, b)
 	pc.HelmConfig.Enabled = true
 	// If this command is not on PATH, tests needing it should skip.
-	pc.HelmConfig.Command = "helmV3"
+	pc.HelmConfig.Command = "helmV4"
 	return
 }
 

api/types/pluginconfig.go

@@ -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
 }