Merge pull request #5164 from kubernetes-sigs/revert-4999-fix-same-chart-multiple-versions

Revert "Fix using same helm chart with different versions"

Author: k8s-ci-robot

api/internal/builtins/HelmChartInflationGenerator.go

@@ -97,12 +97,7 @@ func (p *plugin) validateArgs() (err error) {
 	// be under the loader root (unless root restrictions are
 	// disabled).
 	if p.ValuesFile == "" {
-		// If the version is specified, use the versioned values file.
-		if p.Version != "" {
-			p.ValuesFile = filepath.Join(p.ChartHome, fmt.Sprintf("%s-%s", p.Name, p.Version), p.Name, "values.yaml")
-		} else {
-			p.ValuesFile = filepath.Join(p.ChartHome, p.Name, "values.yaml")
-		}
+		p.ValuesFile = filepath.Join(p.ChartHome, p.Name, "values.yaml")
 	}
 	for i, file := range p.AdditionalValuesFiles {
 		// use Load() to enforce root restrictions
@@ -143,17 +138,10 @@ func (p *plugin) errIfIllegalValuesMerge() error {
 }
 
 func (p *plugin) absChartHome() string {
-	var chartHome string
 	if filepath.IsAbs(p.ChartHome) {
-		chartHome = p.ChartHome
-	} else {
-		chartHome = filepath.Join(p.h.Loader().Root(), p.ChartHome)
-	}
-
-	if p.Version != "" {
-		return filepath.Join(chartHome, fmt.Sprintf("%s-%s", p.Name, p.Version))
+		return p.ChartHome
 	}
-	return chartHome
+	return filepath.Join(p.h.Loader().Root(), p.ChartHome)
 }
 
 func (p *plugin) runHelmCommand(

plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go

@@ -9,7 +9,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
@@ -580,139 +579,3 @@ valuesInline:
 `)
 	th.AssertActualEqualsExpected(rm, "")
 }
-
-func TestHelmChartInflationGeneratorWithSameChartMultipleVersions(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
-		PrepBuiltin("HelmChartInflationGenerator")
-	defer th.Reset()
-	if err := th.ErrIfNoHelm(); err != nil {
-		t.Skip("skipping: " + err.Error())
-	}
-
-	tests := []struct {
-		name        string
-		chartName   string
-		repo        string
-		version     string
-		releaseName string
-	}{
-		{
-			name:        "terraform chart with no version grabs latest",
-			chartName:   "terraform",
-			repo:        "https://helm.releases.hashicorp.com",
-			version:     "",
-			releaseName: "terraform-latest",
-		},
-		{
-			name:        "terraform chart with version 1.1.1",
-			chartName:   "terraform",
-			repo:        "https://helm.releases.hashicorp.com",
-			version:     "1.1.1",
-			releaseName: "terraform-1.1.1",
-		},
-		{
-			name:        "terraform chart with version 1.1.1 again",
-			chartName:   "terraform",
-			repo:        "https://helm.releases.hashicorp.com",
-			version:     "1.1.1",
-			releaseName: "terraform-1.1.1-1",
-		},
-		{
-			name:        "terraform chart with version 1.1.2",
-			chartName:   "terraform",
-			repo:        "https://helm.releases.hashicorp.com",
-			version:     "1.1.2",
-			releaseName: "terraform-1.1.2",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			config := fmt.Sprintf(`
-apiVersion: builtin
-kind: HelmChartInflationGenerator
-metadata:
- name: %s
-name: %s
-version: %s
-repo: %s
-releaseName: %s
-`, tt.chartName, tt.chartName, tt.version, tt.repo, tt.releaseName)
-
-			rm := th.LoadAndRunGenerator(config)
-			assert.True(t, len(rm.Resources()) > 0)
-
-			var chartDir string
-			if tt.version != "" {
-				chartDir = fmt.Sprintf("charts/%s-%s/%s", tt.chartName, tt.version, tt.chartName)
-			} else {
-				chartDir = fmt.Sprintf("charts/%s", tt.chartName)
-			}
-
-			d, err := th.GetFSys().ReadFile(filepath.Join(th.GetRoot(), chartDir, "Chart.yaml"))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			assert.Contains(t, string(d), fmt.Sprintf("name: %s", tt.chartName))
-			if tt.version != "" {
-				assert.Contains(t, string(d), fmt.Sprintf("version: %s", tt.version))
-			}
-		})
-	}
-}
-
-// Test that verifies +1 instances of same chart with different versions
-// https://github.com/kubernetes-sigs/kustomize/issues/4813
-func TestHelmChartInflationGeneratorWithMultipleInstancesSameChartDifferentVersions(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
-		PrepBuiltin("HelmChartInflationGenerator")
-	defer th.Reset()
-	if err := th.ErrIfNoHelm(); err != nil {
-		t.Skip("skipping: " + err.Error())
-	}
-
-	podinfo1 := th.LoadAndRunGenerator(`
-apiVersion: builtin
-kind: HelmChartInflationGenerator
-metadata:
- name: podinfo
-name: podinfo
-version: 6.2.1
-repo: https://stefanprodan.github.io/podinfo
-releaseName: podinfo1
-`)
-
-	podinfo2 := th.LoadAndRunGenerator(`
-apiVersion: builtin
-kind: HelmChartInflationGenerator
-metadata:
- name: podinfo
-name: podinfo
-version: 6.1.8
-repo: https://stefanprodan.github.io/podinfo
-releaseName: podinfo2
-`)
-
-	podinfo1Img, err := podinfo1.Resources()[1].GetFieldValue("spec.template.spec.containers.0.image")
-	assert.NoError(t, err)
-	assert.Equal(t, "ghcr.io/stefanprodan/podinfo:6.2.1", podinfo1Img)
-
-	podinfo2Img, err := podinfo2.Resources()[1].GetFieldValue("spec.template.spec.containers.0.image")
-	assert.NoError(t, err)
-	assert.Equal(t, "ghcr.io/stefanprodan/podinfo:6.1.8", podinfo2Img)
-
-	podinfo1ChartsDir := filepath.Join(th.GetRoot(), "charts/podinfo-6.2.1/podinfo")
-	assert.True(t, th.GetFSys().Exists(podinfo1ChartsDir))
-
-	podinfo2ChartsDir := filepath.Join(th.GetRoot(), "charts/podinfo-6.1.8/podinfo")
-	assert.True(t, th.GetFSys().Exists(podinfo2ChartsDir))
-
-	podinfo1ChartContents, err := th.GetFSys().ReadFile(filepath.Join(podinfo1ChartsDir, "Chart.yaml"))
-	assert.NoError(t, err)
-	assert.Contains(t, string(podinfo1ChartContents), "version: 6.2.1")
-
-	podinfo2ChartContents, err := th.GetFSys().ReadFile(filepath.Join(podinfo2ChartsDir, "Chart.yaml"))
-	assert.NoError(t, err)
-	assert.Contains(t, string(podinfo2ChartContents), "version: 6.1.8")
-}